MCL/sf/mw/mmmw: comparison mmserv/tms/tmscallserver/src/tmsipcalluplinkds.cpp

equal deleted inserted replaced

-:ab526b8cacfb
+:60e492b28869
 // -----------------------------------------------------------------------------
 // TMSIPUplink::TMSIPUplink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSIPUplink::TMSIPUplink()
+TMSIPUplink::TMSIPUplink(TMSIPDevSoundObserver& observer) :
+TMSIPCallStreamBase(observer)
 {
 }
 // -----------------------------------------------------------------------------
 // TMSIPUplink::~TMSIPUplink
 // -----------------------------------------------------------------------------
 // TMSIPUplink::NewL
 // Symbian two-phase constructor
 // -----------------------------------------------------------------------------
 //
-TMSIPUplink* TMSIPUplink::NewL(const guint32 codecID,
+TMSIPUplink* TMSIPUplink::NewL(TMSIPDevSoundObserver& observer,
-const TMMFPrioritySettings priority)
+const guint32 codecID, const TMMFPrioritySettings priority)
 {
-TMSIPUplink* self = new (ELeave) TMSIPUplink();
+TMSIPUplink* self = new (ELeave) TMSIPUplink(observer);
 CleanupStack::PushL(self);
 self->ConstructL(codecID, priority);
 CleanupStack::Pop(self);
 return self;
 }
 //
 void TMSIPUplink::ConstructL(const guint32 codecID,
 const TMMFPrioritySettings priority)
 {
 TRACE_PRN_FN_ENT;
 iCodecID = codecID;
 iPriority = priority;
 // Client must set these before querying!
 iG711EncodeMode = TMS_G711_CODEC_MODE_ALAW;
 iILBCEncodeMode = TMS_ILBC_CODEC_MODE_20MS_FRAME;
 TRAPD(err, InitDevSoundL(EMMFStateRecording, priority));
 if (err != TMS_RESULT_SUCCESS)
 {
 User::Leave(err);
 }
 iMaxBufLen = ConfigureMedia(iCodecID);
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPUplink::Start
 TRAP(err, iDevSound->RecordInitL());
 TRACE_PRN_IF_ERR(err);
 if (err != TMS_RESULT_SUCCESS)
 {
-//TODO: Notify main thread
 iStatus = EReady;
-}
+iObserver.UplinkStarted(err);
-#ifdef _DEBUG
+}
-else
+}
-{
-iSamplesRecCount = 0;
-}
-#endif
-}
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPUplink::Stop
 if (iStatus == EStreaming && iDevSound)
 {
 iDevSound->Stop();
 iStatus = EReady;
 }
-else
-{
-//TODO: Notify main thread
-}
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPUplink::BufferToBeEmptied
 // From MDevSoundObserver
 // -----------------------------------------------------------------------------
 //
 void TMSIPUplink::BufferToBeEmptied(CMMFBuffer* aBuffer)
 {
-iDevSoundBufPtr = static_cast<CMMFDataBuffer*>(aBuffer);
+iDevSoundBufPtr = static_cast<CMMFDataBuffer*> (aBuffer);
 TDes8& data = iDevSoundBufPtr->Data();
 iBufLen = iDevSoundBufPtr->BufferSize();
 TRACE_PRN_N1(_L("TMS->UPL: BTBE->LEN [%d]"), iBufLen);
 // Adjust/create RChunk if necessary
 gint err = DoChunk(iBufLen, iMsgBuffer);
 else
 {
 status = TMS_RESULT_ILLEGAL_OPERATION;
 }
 }
 return status;
 }
 // -----------------------------------------------------------------------------
 // TMSIPUplink::SetIlbcCodecMode
 CIlbcEncoderIntfc::E30msFrame);
 TRACE_PRN_N(_L("TMS->UPL: SetIlbcCodecMode [30ms Frame]"));
 }
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 CG711EncoderIntfc::EEncULaw);
 TRACE_PRN_N(_L("TMS->UPL: SetG711CodecMode [uLaw]"));
 }
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 if (iSpeechEncoderConfig)
 {
 err = iSpeechEncoderConfig->GetSupportedBitrates(bitrates);
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 if (iSpeechEncoderConfig)
 {
 err = iSpeechEncoderConfig->SetBitrate(bitrate);
 TRACE_PRN_N1(_L("TMS->UPL: SetBitrate [%d]"), bitrate);
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 if (iSpeechEncoderConfig)
 {
 err = iSpeechEncoderConfig->GetBitrate(bitrate);
 TRACE_PRN_N1(_L("TMS->UPL: GetBitrate [%d]"), bitrate);
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 //
 void TMSIPUplink::InitializeComplete(TInt aError)
 {
 TRACE_PRN_FN_ENT;
-gint err = aError;
+gint status = aError;
-if (err == TMS_RESULT_SUCCESS && iDevSound)
+if (status == TMS_RESULT_SUCCESS && iDevSound)
 {
 TMMFCapabilities conf;
 conf = iDevSound->Config();
 conf.iRate = EMMFSampleRate8000Hz;
 conf.iChannels = EMMFMono;
-TRAP(err, iDevSound->SetConfigL(conf));
+TRAP(status, iDevSound->SetConfigL(conf));
-if (err == TMS_RESULT_SUCCESS)
+if (status == TMS_RESULT_SUCCESS)
 {
 // We are ready to stream even in case of CI setting failure
 iStatus = EReady;
 iMaxGain = iDevSound->MaxGain();
 }
-// Init Custom Interface API to the Encoder
+// Init Custom Interface API to the Encoder. Any return error can
-err = SetCodecCi();
+// be ignored as codec can still run in the default mode even if not
-if (err != TMS_RESULT_SUCCESS)
+// fully configured.
-{
+SetCodecCi();
-// DEBUG only
+}
-// Can ignore error - although encoder is not fully configured but
-// it can still run in the default mode.
+iObserver.UplinkInitCompleted(status);
-TRACE_PRN_IF_ERR(err);
+TRACE_PRN_IF_ERR(status);
-}
-}
-// TODO: Notify client
-TRACE_PRN_IF_ERR(err);
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPUplink::RecordError
 // From MDevSoundObserver
 // Recording error is send to the main thread.
 // The state of recorder is rolled back to EReady.
 // -----------------------------------------------------------------------------
 //
-void TMSIPUplink::RecordError(TInt /*aError*/)
+void TMSIPUplink::RecordError(TInt aError)
 {
-//TRACE_PRN_IF_ERR(aError);
-#ifdef _DEBUG
-iSamplesRecCount = 0;
-#endif
 iStatus = EReady;
+iObserver.UplinkStarted(aError);
-// TODO: Notify client
+TRACE_PRN_IF_ERR(aError);
 }
 // End of file

branch	RCL_3
changeset 17	60e492b28869
parent 11	3570217d8c21
child 19	095bea5f582e