FCL/sf/mw/mmmw: comparison mmserv/tms/tmscallserver/src/tmsipcalldownlinkds.cpp

equal deleted inserted replaced

-:ab526b8cacfb
+:60e492b28869
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::TMSIPDownlink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSIPDownlink::TMSIPDownlink()
+TMSIPDownlink::TMSIPDownlink(TMSIPDevSoundObserver& observer) :
+TMSIPCallStreamBase(observer)
 {
 }
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::~TMSIPDownlink
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::NewL
 // Symbian two-phase constructor
 // -----------------------------------------------------------------------------
 //
-TMSIPDownlink* TMSIPDownlink::NewL(const guint32 codecID,
+TMSIPDownlink* TMSIPDownlink::NewL(TMSIPDevSoundObserver& observer,
-const TMMFPrioritySettings priority)
+const guint32 codecID, const TMMFPrioritySettings priority)
 {
-TMSIPDownlink* self = new (ELeave) TMSIPDownlink();
+TMSIPDownlink* self = new (ELeave) TMSIPDownlink(observer);
 CleanupStack::PushL(self);
 self->ConstructL(codecID, priority);
 CleanupStack::Pop(self);
 return self;
 }
 //
 void TMSIPDownlink::ConstructL(const guint32 codecID,
 const TMMFPrioritySettings priority)
 {
 TRACE_PRN_FN_ENT;
 iCodecID = codecID;
 iPriority = priority;
 // Client must set these before querying!
 iG711DecodeMode = TMS_G711_CODEC_MODE_ALAW;
 iILBCDecodeMode = TMS_ILBC_CODEC_MODE_20MS_FRAME;
 TRAPD(err, InitDevSoundL(EMMFStatePlaying, priority));
 if (err != TMS_RESULT_SUCCESS)
 {
 User::Leave(err);
 }
 iMaxBufLen = ConfigureMedia(iCodecID);
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::Start
 // -----------------------------------------------------------------------------
 //
 void TMSIPDownlink::Start()
 {
 TRACE_PRN_FN_ENT;
 gint err = TMS_RESULT_ILLEGAL_OPERATION;
 if (iStatus == EReady && iDevSound)
 {
 TRAP(err, iDevSound->PlayInitL());
 TRACE_PRN_IF_ERR(err);
-#ifdef _DEBUG
-iSamplesPlayedCount = 0;
-#endif
 if (err != TMS_RESULT_SUCCESS)
 {
 iStatus = EReady;
-}
+iObserver.DownlinkStarted(err);
 }
+}
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::Stop
 if (iStatus == EStreaming && iDevSound)
 {
 iDevSound->Stop();
 iStatus = EReady;
 }
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::BufferToBeFilled
 // -----------------------------------------------------------------------------
 //
 void TMSIPDownlink::BufferToBeFilled(CMMFBuffer* aBuffer)
 {
 // Store pointer to the received buffer
-iDevSoundBufPtr = static_cast<CMMFDataBuffer*>(aBuffer);
+iDevSoundBufPtr = static_cast<CMMFDataBuffer*> (aBuffer);
 iBufLen = iDevSoundBufPtr->RequestSize();
 TRACE_PRN_N1(_L("TMS->DNL->BTBF: LEN[%d]"), iBufLen);
 #ifndef __WINSCW__
-//TODO: revisit this!
+//TODO: Is this still true?
 // The first AMR buffer returns 1 for no data frame.
 /*if (iCodecID == KMccFourCCIdAMRNB)
 {
 iBufLen = iMaxBufLen;
 }*/
 #endif //__WINSCW__
 // Create or adjust the chunk
 gint err = DoChunk(iBufLen, iMsgBuffer);
 if (err != TMS_RESULT_SUCCESS)
 {
 {
 // Notify client there is buffer ready to be filled
 iMsgBuffer.iStatus = err;
 iMsgBuffer.iInt = iBufLen;
 iStatus = EStreaming;
 // If chunk is opened, we will expect a call from the client to
 // get chunk handle. When we get a call to copy chunk handle,
 // check these variables and see if they match. This is not
 // completely secure, but will provide some level of security
 if (iMsgBuffer.iBool == TRUE)
 }
 }
 iMsgBuffer.iRequest = ECmdFillBuffer;
 err = iMsgQueue.Send(iMsgBuffer);
 TRACE_PRN_IF_ERR(err);
 }
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::BufferFilled
 {
 TRACE_PRN_N1(_L("TMS->DNL->BF: LEN[%d]"), buflen);
 // Copy data over from chunk
 TPtr8 dataPtr(iChunk.Base(), buflen, iMaxBufLen);
-//    RDebug::RawPrint(dataPtr);
+//RDebug::RawPrint(dataPtr);
 if (iStatus == EStreaming && iDevSound && iDevSoundBufPtr)
 {
 // Fill D/S buffer and send it for playback
 iDevSoundBufPtr->Data() = dataPtr;
 else
 {
 status = TMS_RESULT_ILLEGAL_OPERATION;
 }
 }
 TRACE_PRN_IF_ERR(status);
 return status;
 }
 // -----------------------------------------------------------------------------
 CIlbcDecoderIntfc::E30msFrame);
 TRACE_PRN_N(_L("TMS->DNL: iLBC Mode Set [30ms]"));
 }
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 CG711DecoderIntfc::EDecULaw);
 TRACE_PRN_N(_L("TMS->DNL: G711 Mode Set [uLaw]"));
 }
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 {
 err = iErrConcealmentIntfc->FrameModeRqrdForEC(frmodereq);
 TRACE_PRN_N1(_L("TMS->DNL: FrameModeRqrdForEC [%d]"), frmodereq);
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 {
 err = iErrConcealmentIntfc->SetFrameMode(frmode);
 TRACE_PRN_N1(_L("TMS->DNL: SetFrameMode [%d]"), frmode);
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 // not available through CIs -> return cached value
 frmode = iFrameMode;
 TRACE_PRN_N1(_L("TMS->DNL: GetFrameMode [%d]"), frmode);
 err = TMS_RESULT_SUCCESS;
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 if (iErrConcealmentIntfc)
 {
 err = iErrConcealmentIntfc->ConcealErrorForNextBuffer();
 TRACE_PRN_N(_L("TMS->DNL: ConcealErrorForNextBuffer"));
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 {
 err = iIlbcDecoderIntfc->SetCng(cng);
 TRACE_PRN_N1(_L("TMS->DNL: SetCng [%d]"), cng);
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 {
 err = iIlbcDecoderIntfc->GetCng(cng);
 TRACE_PRN_N1(_L("TMS->DNL: GetCng [%d]"), cng);
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 iPlc = plc;
 err = iG711DecoderIntfc->SetPlc(iPlc);
 TRACE_PRN_N1(_L("TMS->DNL: SetPlc [%d]"), plc);
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 // not available through CIs -> return cached value
 plc = iPlc;
 err = TMS_RESULT_SUCCESS;
 TRACE_PRN_N1(_L("TMS->DNL: GetPlc [%d]"), plc);
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 {
 err = iG729DecoderIntfc->BadLsfNextBuffer();
 TRACE_PRN_N(_L("TMS->DNL: BadLsfNextBuffer"));
 }
 }
 TRACE_PRN_IF_ERR(err);
 return err;
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void TMSIPDownlink::InitializeComplete(TInt aError)
 {
 TRACE_PRN_FN_ENT;
+gint status = aError;
-gint err = aError;
+if (status == TMS_RESULT_SUCCESS && iDevSound)
-if (err == 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 later CI setting failure
 iStatus = EReady;
 iMaxVolume = iDevSound->MaxVolume();
 }
-// Init Custom Interface API to the decoder
+// Init Custom Interface API to the Decoder. 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 decoder is not fully configured but
-// it can still run in the default mode.
+iObserver.DownlinkInitCompleted(status);
-TRACE_PRN_IF_ERR(err);
+TRACE_PRN_IF_ERR(status);
-}
-}
-// TODO: Notify client
-TRACE_PRN_IF_ERR(err);
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSIPDownlink::PlayError
 // From MDevSoundObserver
 // Record error is send to client over comm channel.
 // The state of recorder is rolled back to EReady.
 // -----------------------------------------------------------------------------
 //
-void TMSIPDownlink::PlayError(TInt /*aError*/)
+void TMSIPDownlink::PlayError(TInt aError)
 {
-//TRACE_PRN_IF_ERR(aError);
-#ifdef _DEBUG
-iSamplesPlayedCount = 0;
-#endif
 iStatus = EReady;
+iObserver.DownlinkStarted(aError);
-// TODO: Notify client
+TRACE_PRN_IF_ERR(aError);
 }
 // End of file

branch	RCL_3
changeset 40	60e492b28869
parent 17	3570217d8c21
child 45	095bea5f582e