FCL/sf/mw/mmmw: comparison khronosfws/openmax_al/src/mmf

equal deleted inserted replaced

-:b67dd1fc57c5
+:2ed61feeead6
 if (func == ERecord)
 {
 if (iRecordState == ERecorderNotReady)
 {
 iFileFormat = format;
-iAPIBeingUsed = DetermineAPIToUse(uri, EPlay);
+iAPIBeingUsed = DetermineAPIToUse(uri, ERecord);
 err = XA_RESULT_INTERNAL_ERROR;
 if (iAPIBeingUsed == EAudioRecorderUtility)
 {
 /* Initialize URI as needed by MMF utilities */
 err = InitializeURIForMMFUtil(uri);
 RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
 /* Initalize Recorder related objects */
 TRAP(err, InitAudioRecorderUtilityL());
 RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
-TRAP(err, iAudioRecorder->OpenFileL(iFileName));
+TRAP(err, iAudioRecorder->OpenFileL(iUriPtr));
 RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
 /* Wait until we receive moscostatechanged callback */
 if(!iActiveSchedulerWait->IsStarted())
 {
 iActiveSchedulerWait->Start();
 RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
 /* Initalize Player related objects */
 TRAP(err, InitVideoPlayerUtilityL());
 RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
-/* Open file */
+if(iUriType == ELocal)
-TAG_TIME_PROFILING_BEGIN;
+{
-TRAP(err, iVideoPlayer->OpenFileL(iUriPtr));
+/* Open file */
-RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
+TAG_TIME_PROFILING_BEGIN;
-TAG_TIME_PROFILING_END;
+TRAP(err, iVideoPlayer->OpenFileL(iUriPtr));
-PRINT_TO_CONSOLE_TIME_DIFF;
+RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
+TAG_TIME_PROFILING_END;
+PRINT_TO_CONSOLE_TIME_DIFF;
+}
+else
+{
+/* Open URL */
+TAG_TIME_PROFILING_BEGIN;
+TRAP(err, iVideoPlayer->OpenUrlL(iUriPtr));
+RET_IF_ERR(err, XA_RESULT_INTERNAL_ERROR);
+TAG_TIME_PROFILING_END;
+PRINT_TO_CONSOLE_TIME_DIFF;
+}
 /* Wait until we receive  MvpuoOpenComplete */
 PRINT_TO_CONSOLE_HOME_TIME;
 if (!iActiveSchedulerWait->IsStarted())
 {
 iActiveSchedulerWait->Start();
 {
 char* dotPtr = NULL;
 char ext[MAX_EXTENSION_SIZE] = { 0 };
 int extLen;
+int colpos;
+char urischeme[MAX_EXTENSION_SIZE] = { 0 };
+int urischemeLen;
 dotPtr = strrchr(uri, (int)'.');
 if (!dotPtr)
 {
 return KErrNotFound;
 }
 for(unsigned int i=0; i < extLen; i++)
 {
 ext[i] = tolower(ext[i]);
 }
+colpos = strcspn(uri,":");
+strncpy(urischeme, uri, colpos+1);
+/*Null terminate the string*/
+urischeme[colpos+1] = '\0';
+urischemeLen = sizeof(urischeme);
+for(unsigned int i=0; i < urischemeLen; i++)
+{
+urischeme[i] = tolower(urischeme[i]);
+}
 if (aFunc == ERecord)
 {
 return EAudioRecorderUtility;
 }
 else
 {
-if (!strcasecmp(ext, ".mp3") ||
+if(!strcasecmp(urischeme, "file:"))
-!strcasecmp(ext, ".amr") ||
+{
-!strcasecmp(ext, ".aac") ||
+if (!strcasecmp(ext, ".mp3") ||
-!strcasecmp(ext, ".mid") ||
+!strcasecmp(ext, ".amr") ||
-		   !strcasecmp(ext, ".wav") ||
+!strcasecmp(ext, ".aac") ||
-!strcasecmp(ext, ".awb"))
+!strcasecmp(ext, ".mid") ||
-{
+!strcasecmp(ext, ".wav") ||
-return EAudioPlayerUtility;
+!strcasecmp(ext, ".awb"))
-}
+{
-else
+return EAudioPlayerUtility;
+}
+else
+{
+return EVideoPlayerUtility;
+}
+}
+else
 {
 return EVideoPlayerUtility;
 }
 }
 }
 if (iErrorCode == KErrNone)
 {
 if (iPreviousRecordState == CMdaAudioClipUtility::ENotReady)
 {
 //RDebug::Print(_L("CMMFBackendEngine::MoscoStateChangeEvent 2"));
-TRAP(err,iaudioInputRecord = CAudioInput::NewL( *iAudioRecorder ));
+TRAP(err,iAudioInputRecord = CAudioInput::NewL( *iAudioRecorder ));
-RArray<CAudioInput::TAudioInputPreference> inputArray;
+if(err == KErrNone)
-inputArray.Append( CAudioInput::EDefaultMic );
+{
-// Set Audio Input
+RArray<CAudioInput::TAudioInputPreference> inputArray;
-iaudioInputRecord->SetAudioInputL( inputArray.Array( ) );
+inputArray.Append( CAudioInput::EDefaultMic );
-inputArray.Close();
+// Set Audio Input
+TRAP(err, iAudioInputRecord->SetAudioInputL( inputArray.Array( ) ));
+inputArray.Close();
+}
 TMMFMessageDestination destination(KUidMetaDataWriteCustomCommand);
 TMMFMessageDestinationPckg pckg = TMMFMessageDestinationPckg(destination);
 TInt ret = iAudioRecorder->RecordControllerCustomCommandSync(pckg, 0, KNullDesC8, KNullDesC8);
 //RDebug::Print(_L("CMMFBackendEngine::MoscoStateChangeEvent 3 [%d]"),ret);
 if (ret != KErrNone && iFileFormat == XA_CONTAINERTYPE_MP4)
 case EPlayerClosed:
 default:
 break;
 };
 }
+// deleting the AudioInput object
+if(iAudioInputRecord)
+{
+delete iAudioInputRecord;
+iAudioInputRecord = NULL;
+}
 if (iBaseAudioPlayer && iAudioPlayer)
 {
 iAudioPlayer->Close();
 }
 delete iPlayItfPositionUpdateTimer;
 iPlayItfPositionUpdateTimer = NULL;
 delete iBaseVideoPlayer;
 iBaseVideoPlayer = NULL;
 iVideoPlayer = NULL;
-delete iaudioInputRecord;
-iaudioInputRecord = NULL;
 delete iBaseAudioPlayer;
 iBaseAudioPlayer = NULL;
 iAudioPlayer = NULL;
 delete iBaseAudioRecorder;
 iBaseAudioRecorder = NULL;
 if(iRecordState != CMMFBackendEngine::ERecorderNotReady)
 {
 TRAP(err, sr = iAudioRecorder->DestinationSampleRateL());
 if(err == KErrNone)
 {
-*samplerate = sr;
+*samplerate = sr*1000;
 }
 }
 }
 else if(iAPIBeingUsed == EAudioPlayerUtility)
 {
 KNullDesC8,
 KNullDesC8,
 configPackage);
 if(err == KErrNone)
 {
-*samplerate = configPackage().iSampleRate;
+*samplerate = configPackage().iSampleRate*1000;
 }
 }
 }
 return err;
 }
 TInt CMMFBackendEngine::SetDestinationSampleRate(XAmilliHertz* samplerate)
 {
 TInt err(KErrNone);
 if(iRecordState == CMMFBackendEngine::ERecorderOpen)
 {
-TRAP(err, iAudioRecorder->SetDestinationSampleRateL(*samplerate));
+TRAP(err, iAudioRecorder->SetDestinationSampleRateL(*samplerate/1000));
 if(err != KErrNone)
 {
 return XA_RESULT_PARAMETER_INVALID;
 }
 }
 if (err != KErrNone)
 return err;
 iUriPtr.Set(iUri->Des());
 iUriPtr.Copy(uriParam); /* Copy data*/
-iUriPtr.LowerCase();
+//iUriPtr.LowerCase();
 /* For file scheme convert from file:///c:/folder/file.ext
 * format to c:\\folder\\file.ext using TUriParser. */
 _LIT(KFileScheme,"file:///");
 if (iUriPtr.Find(KFileScheme) >= 0)
 {
+iUriType = ELocal;
 TPtr tmp(const_cast<TUint16 *>(iUriPtr.Ptr()) + KFileScheme().Length(),
 iUriPtr.Length(),
 iUriPtr.Length());
 /* Convert from c:/folder/file.ext format to
 * c:\\folder\\file.ext using TUriParser.
 iUriPtr.Copy(file->Des());
 delete file;
 file = NULL;
 }
+else
+{
+iUriType = EStreaming;
+}
 return err;
 }
 XAresult CMMFBackendEngine::SetVolume(XAuint32 volume)

changeset 21	2ed61feeead6
parent 20	b67dd1fc57c5
child 25	6f7ceef7b1d1