# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401541 -7200 # Node ID 709f89d8c04796bb3eedf28bf6cc17887ecaeaed # Parent 4f62049db6ac09f2c99dfb8a65ce79294b763ea6 Revision: 201007 Kit: 201008 diff -r 4f62049db6ac -r 709f89d8c047 inc/EAacPlusUtil.h --- a/inc/EAacPlusUtil.h Fri Feb 19 23:19:48 2010 +0200 +++ b/inc/EAacPlusUtil.h Fri Mar 12 15:45:41 2010 +0200 @@ -1,8 +1,8 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/EABI/3gpDataSourceAdapteru.def --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/EABI/3gpDataSourceAdapteru.def Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/EABI/3gpDataSourceAdapteru.def Fri Mar 12 15:45:41 2010 +0200 @@ -24,15 +24,15 @@ _ZTIN21C3gpDataSourceAdapter21CAsyncProxyFillBufferE @ 23 NONAME _ZTV21C3gpDataSourceAdapter @ 24 NONAME _ZTVN21C3gpDataSourceAdapter21CAsyncProxyFillBufferE @ 25 NONAME - _ZThn60_N21C3gpDataSourceAdapter12EmptyBufferLEP10CMMFBufferP11MDataSource8TMediaId @ 26 NONAME - _ZThn60_N21C3gpDataSourceAdapter13BufferFilledLEP10CMMFBuffer @ 27 NONAME - _ZThn60_N21C3gpDataSourceAdapter14ConstructSinkLERK6TDesC8 @ 28 NONAME - _ZThn60_N21C3gpDataSourceAdapter16SinkDataTypeCodeE8TMediaId @ 29 NONAME - _ZThn60_N21C3gpDataSourceAdapter17CreateSinkBufferLE8TMediaIdRi @ 30 NONAME - _ZThn60_N21C3gpDataSourceAdapter19CanCreateSinkBufferEv @ 31 NONAME - _ZThn60_N21C3gpDataSourceAdapterD0Ev @ 32 NONAME - _ZThn60_N21C3gpDataSourceAdapterD1Ev @ 33 NONAME - _ZThn76_N21C3gpDataSourceAdapter10GetBitRateERj @ 34 NONAME - _ZThn76_N21C3gpDataSourceAdapter12BufferFilledEP10CMMFBuffer @ 35 NONAME - _ZThn76_N21C3gpDataSourceAdapter5EventE4TUid @ 36 NONAME + _ZThn64_N21C3gpDataSourceAdapter12EmptyBufferLEP10CMMFBufferP11MDataSource8TMediaId @ 26 NONAME + _ZThn64_N21C3gpDataSourceAdapter13BufferFilledLEP10CMMFBuffer @ 27 NONAME + _ZThn64_N21C3gpDataSourceAdapter14ConstructSinkLERK6TDesC8 @ 28 NONAME + _ZThn64_N21C3gpDataSourceAdapter16SinkDataTypeCodeE8TMediaId @ 29 NONAME + _ZThn64_N21C3gpDataSourceAdapter17CreateSinkBufferLE8TMediaIdRi @ 30 NONAME + _ZThn64_N21C3gpDataSourceAdapter19CanCreateSinkBufferEv @ 31 NONAME + _ZThn64_N21C3gpDataSourceAdapterD0Ev @ 32 NONAME + _ZThn64_N21C3gpDataSourceAdapterD1Ev @ 33 NONAME + _ZThn80_N21C3gpDataSourceAdapter10GetBitRateERj @ 34 NONAME + _ZThn80_N21C3gpDataSourceAdapter12BufferFilledEP10CMMFBuffer @ 35 NONAME + _ZThn80_N21C3gpDataSourceAdapter5EventE4TUid @ 36 NONAME diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/Src/3gpDataSourceAdapter.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/Src/3gpDataSourceAdapter.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/Src/3gpDataSourceAdapter.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -254,6 +254,10 @@ } if ((iSourceType == KUidMmfFileSource) || (iSourceType == KOldProgDLSourceUid)) { // parser has file handle + if (iSourceType == KUidMmfFileSource) + { + iIsLocalPlayback = ETrue; + } // read async from lib when it has a file handle iClip = static_cast(iDataSource); iDataSource->SourcePrimeL(); diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Data/3GPAudioPlayControllerResource.rss --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Data/3GPAudioPlayControllerResource.rss Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Data/3GPAudioPlayControllerResource.rss Fri Mar 12 15:45:41 2010 +0200 @@ -32,6 +32,7 @@ { shared_buffer_max_num = 2; shared_buffer_max_size = 20480; + shared_buffer_max_size_non_seekable_source = 20480; sampling_rate = EAapSampleRate16000Hz; stereo_support = 2; metadata_support = EAapMetadataSupportTrue; @@ -66,6 +67,7 @@ { shared_buffer_max_num = 2; shared_buffer_max_size = 8192; + shared_buffer_max_size_non_seekable_source = 8192; sampling_rate = EAapSampleRate8000Hz; stereo_support = 0; metadata_support = EAapMetadataSupportTrue; @@ -90,6 +92,7 @@ { shared_buffer_max_num = 2; shared_buffer_max_size = 8192; + shared_buffer_max_size_non_seekable_source = 8192; sampling_rate = EAapSampleRate16000Hz; stereo_support = 0; metadata_support = EAapMetadataSupportTrue; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Src/3GPAudioPlayControllerPlugin.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Src/3GPAudioPlayControllerPlugin.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Src/3GPAudioPlayControllerPlugin.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -267,6 +267,7 @@ TAapProperties aapProperties = iAudioResource->PropertiesL(); iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum; iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize; + iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc; iMetaDataSupport = aapProperties.iMetaDataSupport; iChannels = (aapProperties.iStereoSupport < 2) ? 1 : 2; iSinkNumChannels = iChannels; // Default same as source diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Data/3GPAudioRecordControllerResource.rss --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Data/3GPAudioRecordControllerResource.rss Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Data/3GPAudioRecordControllerResource.rss Fri Mar 12 15:45:41 2010 +0200 @@ -32,6 +32,7 @@ { shared_buffer_max_num = 2; shared_buffer_max_size = 20480; + shared_buffer_max_size_non_seekable_source = 20480; sampling_rate = EAapSampleRate8000Hz; stereo_support = 1; metadata_support = EAapMetadataSupportFalse; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Src/3GPAudioRecordControllerPlugin.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Src/3GPAudioRecordControllerPlugin.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Src/3GPAudioRecordControllerPlugin.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -58,6 +58,7 @@ DP0(_L("C3GPAudioRecordControllerPlugin::ConstructL(3)")); iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum; // default size iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize; // default size + iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc; iMetaData = C3GPAudioRecordControllerMetaData::NewL(); diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/EABI/AdvancedAudioControllerU.DEF --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/EABI/AdvancedAudioControllerU.DEF Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/EABI/AdvancedAudioControllerU.DEF Fri Mar 12 15:45:41 2010 +0200 @@ -323,49 +323,49 @@ _ZTV24CAdvancedAudioController @ 322 NONAME _ZTV28CAdvancedAudioPlayController @ 323 NONAME _ZTV30CAdvancedAudioRecordController @ 324 NONAME - _ZThn164_N28CAdvancedAudioPlayController12RefillBufferEP10CMMFBuffer @ 325 NONAME - _ZThn164_N28CAdvancedAudioPlayController14LastBufferSentEv @ 326 NONAME - _ZThn164_N28CAdvancedAudioPlayController16PlaybackCompleteEv @ 327 NONAME - _ZThn164_N28CAdvancedAudioPlayController9SendEventERK9TMMFEvent @ 328 NONAME - _ZThn164_N30CAdvancedAudioRecordController12EmptyBufferLEP10CMMFBuffer @ 329 NONAME - _ZThn164_N30CAdvancedAudioRecordController14RecordCompleteEv @ 330 NONAME - _ZThn164_N30CAdvancedAudioRecordController9SendEventERK9TMMFEvent @ 331 NONAME - _ZThn168_N28CAdvancedAudioPlayController22MapcSetPlaybackWindowLERK25TTimeIntervalMicroSecondsS2_ @ 332 NONAME - _ZThn168_N28CAdvancedAudioPlayController23MapcGetLoadingProgressLERi @ 333 NONAME - _ZThn168_N28CAdvancedAudioPlayController25MapcDeletePlaybackWindowLEv @ 334 NONAME - _ZThn168_N30CAdvancedAudioRecordController19MarcSetMaxDurationLERK25TTimeIntervalMicroSeconds @ 335 NONAME - _ZThn168_N30CAdvancedAudioRecordController19MarcSetMaxFileSizeLEi @ 336 NONAME - _ZThn168_N30CAdvancedAudioRecordController21MarcAddMetaDataEntryLERK17CMMFMetaDataEntry @ 337 NONAME - _ZThn168_N30CAdvancedAudioRecordController24MarcRemoveMetaDataEntryLEi @ 338 NONAME - _ZThn168_N30CAdvancedAudioRecordController25MarcReplaceMetaDataEntryLEiRK17CMMFMetaDataEntry @ 339 NONAME - _ZThn168_N30CAdvancedAudioRecordController27MarcGetRecordTimeAvailableLER25TTimeIntervalMicroSeconds @ 340 NONAME - _ZThn168_N30CAdvancedAudioRecordController9MarcCropLEi @ 341 NONAME - _ZThn172_N28CAdvancedAudioPlayController14BitRateChangedEv @ 342 NONAME - _ZThn172_N28CAdvancedAudioPlayController19SeekPositionReachedEj @ 343 NONAME - _ZThn172_N28CAdvancedAudioPlayController28PlayWindowEndPositionReachedEv @ 344 NONAME - _ZThn172_N30CAdvancedAudioRecordController12MardGetGainLERi @ 345 NONAME - _ZThn172_N30CAdvancedAudioRecordController12MardSetGainLEi @ 346 NONAME - _ZThn172_N30CAdvancedAudioRecordController15MardGetBalanceLERi @ 347 NONAME - _ZThn172_N30CAdvancedAudioRecordController15MardGetMaxGainLERi @ 348 NONAME - _ZThn172_N30CAdvancedAudioRecordController15MardSetBalanceLEi @ 349 NONAME - _ZThn176_N28CAdvancedAudioPlayController10GetBitRateERj @ 350 NONAME - _ZThn176_N28CAdvancedAudioPlayController12BufferFilledEP10CMMFBuffer @ 351 NONAME - _ZThn176_N28CAdvancedAudioPlayController5EventE4TUid @ 352 NONAME - _ZThn180_N28CAdvancedAudioPlayController15MscEnableEventsEi @ 353 NONAME - _ZThn180_N28CAdvancedAudioPlayController22MscGetSeekingSupportedERi @ 354 NONAME - _ZThn180_N28CAdvancedAudioPlayController28MscGetRandomSeekingSupportedERi @ 355 NONAME - _ZThn184_N28CAdvancedAudioPlayController14MapcSetRepeatsEiRK25TTimeIntervalMicroSeconds @ 356 NONAME - _ZThn188_N28CAdvancedAudioPlayController14MapdGetVolumeLERi @ 357 NONAME - _ZThn188_N28CAdvancedAudioPlayController14MapdSetVolumeLEi @ 358 NONAME - _ZThn188_N28CAdvancedAudioPlayController15MapdGetBalanceLERi @ 359 NONAME - _ZThn188_N28CAdvancedAudioPlayController15MapdSetBalanceLEi @ 360 NONAME - _ZThn188_N28CAdvancedAudioPlayController17MapdGetMaxVolumeLERi @ 361 NONAME - _ZThn188_N28CAdvancedAudioPlayController18MapdSetVolumeRampLERK25TTimeIntervalMicroSeconds @ 362 NONAME - _ZThn192_N28CAdvancedAudioPlayController16MdcExecuteIntentEN13ContentAccess7TIntentE @ 363 NONAME - _ZThn192_N28CAdvancedAudioPlayController17MdcEvaluateIntentEN13ContentAccess7TIntentE @ 364 NONAME - _ZThn192_N28CAdvancedAudioPlayController19MdcSetAgentPropertyEN13ContentAccess14TAgentPropertyEi @ 365 NONAME - _ZThn192_N28CAdvancedAudioPlayController25MdcDisableAutomaticIntentEi @ 366 NONAME - _ZThn196_N28CAdvancedAudioPlayController28TrailingSilenceTimerCompleteEv @ 367 NONAME + _ZThn168_N28CAdvancedAudioPlayController12RefillBufferEP10CMMFBuffer @ 325 NONAME + _ZThn168_N28CAdvancedAudioPlayController14LastBufferSentEv @ 326 NONAME + _ZThn168_N28CAdvancedAudioPlayController16PlaybackCompleteEv @ 327 NONAME + _ZThn168_N28CAdvancedAudioPlayController9SendEventERK9TMMFEvent @ 328 NONAME + _ZThn168_N30CAdvancedAudioRecordController12EmptyBufferLEP10CMMFBuffer @ 329 NONAME + _ZThn168_N30CAdvancedAudioRecordController14RecordCompleteEv @ 330 NONAME + _ZThn168_N30CAdvancedAudioRecordController9SendEventERK9TMMFEvent @ 331 NONAME + _ZThn172_N28CAdvancedAudioPlayController22MapcSetPlaybackWindowLERK25TTimeIntervalMicroSecondsS2_ @ 332 NONAME + _ZThn172_N28CAdvancedAudioPlayController23MapcGetLoadingProgressLERi @ 333 NONAME + _ZThn172_N28CAdvancedAudioPlayController25MapcDeletePlaybackWindowLEv @ 334 NONAME + _ZThn172_N30CAdvancedAudioRecordController19MarcSetMaxDurationLERK25TTimeIntervalMicroSeconds @ 335 NONAME + _ZThn172_N30CAdvancedAudioRecordController19MarcSetMaxFileSizeLEi @ 336 NONAME + _ZThn172_N30CAdvancedAudioRecordController21MarcAddMetaDataEntryLERK17CMMFMetaDataEntry @ 337 NONAME + _ZThn172_N30CAdvancedAudioRecordController24MarcRemoveMetaDataEntryLEi @ 338 NONAME + _ZThn172_N30CAdvancedAudioRecordController25MarcReplaceMetaDataEntryLEiRK17CMMFMetaDataEntry @ 339 NONAME + _ZThn172_N30CAdvancedAudioRecordController27MarcGetRecordTimeAvailableLER25TTimeIntervalMicroSeconds @ 340 NONAME + _ZThn172_N30CAdvancedAudioRecordController9MarcCropLEi @ 341 NONAME + _ZThn176_N28CAdvancedAudioPlayController14BitRateChangedEv @ 342 NONAME + _ZThn176_N28CAdvancedAudioPlayController19SeekPositionReachedEj @ 343 NONAME + _ZThn176_N28CAdvancedAudioPlayController28PlayWindowEndPositionReachedEv @ 344 NONAME + _ZThn176_N30CAdvancedAudioRecordController12MardGetGainLERi @ 345 NONAME + _ZThn176_N30CAdvancedAudioRecordController12MardSetGainLEi @ 346 NONAME + _ZThn176_N30CAdvancedAudioRecordController15MardGetBalanceLERi @ 347 NONAME + _ZThn176_N30CAdvancedAudioRecordController15MardGetMaxGainLERi @ 348 NONAME + _ZThn176_N30CAdvancedAudioRecordController15MardSetBalanceLEi @ 349 NONAME + _ZThn180_N28CAdvancedAudioPlayController10GetBitRateERj @ 350 NONAME + _ZThn180_N28CAdvancedAudioPlayController12BufferFilledEP10CMMFBuffer @ 351 NONAME + _ZThn180_N28CAdvancedAudioPlayController5EventE4TUid @ 352 NONAME + _ZThn184_N28CAdvancedAudioPlayController15MscEnableEventsEi @ 353 NONAME + _ZThn184_N28CAdvancedAudioPlayController22MscGetSeekingSupportedERi @ 354 NONAME + _ZThn184_N28CAdvancedAudioPlayController28MscGetRandomSeekingSupportedERi @ 355 NONAME + _ZThn188_N28CAdvancedAudioPlayController14MapcSetRepeatsEiRK25TTimeIntervalMicroSeconds @ 356 NONAME + _ZThn192_N28CAdvancedAudioPlayController14MapdGetVolumeLERi @ 357 NONAME + _ZThn192_N28CAdvancedAudioPlayController14MapdSetVolumeLEi @ 358 NONAME + _ZThn192_N28CAdvancedAudioPlayController15MapdGetBalanceLERi @ 359 NONAME + _ZThn192_N28CAdvancedAudioPlayController15MapdSetBalanceLEi @ 360 NONAME + _ZThn192_N28CAdvancedAudioPlayController17MapdGetMaxVolumeLERi @ 361 NONAME + _ZThn192_N28CAdvancedAudioPlayController18MapdSetVolumeRampLERK25TTimeIntervalMicroSeconds @ 362 NONAME + _ZThn196_N28CAdvancedAudioPlayController16MdcExecuteIntentEN13ContentAccess7TIntentE @ 363 NONAME + _ZThn196_N28CAdvancedAudioPlayController17MdcEvaluateIntentEN13ContentAccess7TIntentE @ 364 NONAME + _ZThn196_N28CAdvancedAudioPlayController19MdcSetAgentPropertyEN13ContentAccess14TAgentPropertyEi @ 365 NONAME + _ZThn196_N28CAdvancedAudioPlayController25MdcDisableAutomaticIntentEi @ 366 NONAME + _ZThn200_N28CAdvancedAudioPlayController28TrailingSilenceTimerCompleteEv @ 367 NONAME _ZThn24_N24CAdvancedAudioController17SendEventToClientERK9TMMFEvent @ 368 NONAME _ZThn24_N28CAdvancedAudioPlayController17SendEventToClientERK9TMMFEvent @ 369 NONAME _ZThn28_N21CAdvancedAudioDecoder21HandleFrameTableEventEN11CFrameTable16TFrameTableEventE @ 370 NONAME diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioController.h --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioController.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioController.h Fri Mar 12 15:45:41 2010 +0200 @@ -540,6 +540,7 @@ TInt iSharedBufferMaxNum; // Max buffer size TInt iSharedBufferMaxSize; + TInt iSharedBufferMaxSizeForNonSeekableSrc; // Array of shared buffers RPointerArray iSharedBuffers; // Current index within iSharedBuffers diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioResource.h --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioResource.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioResource.h Fri Mar 12 15:45:41 2010 +0200 @@ -46,6 +46,7 @@ public: TInt iSharedBufferMaxNum; // Max number of shared buffer TInt iSharedBufferMaxSize; // Max buffer size + TInt iSharedBufferMaxSizeForNonSeekableSrc; // Max buffer size for Non Seekable source like prog download TInt iSamplingRate; // Default sampling rate TInt iStereoSupport; // Default channel number TBool iMetaDataSupport; // Meta Data support indicator diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioResource.rh --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioResource.rh Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Inc/AdvancedAudioResource.rh Fri Mar 12 15:45:41 2010 +0200 @@ -40,6 +40,7 @@ { LONG shared_buffer_max_num; LONG shared_buffer_max_size; + LONG shared_buffer_max_size_non_seekable_source; LONG sampling_rate; LONG stereo_support; LONG metadata_support; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioDecoder.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioDecoder.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioDecoder.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -421,7 +421,9 @@ { CMMFBuffer* refillBuffer = NULL; // index is the next buffer, index-1 is current buffer, check 2 buffers back from the one being selected - TInt checkBufIndex = iSharedBufferIndex-2; +// ou1cimx1#205863 + //TInt checkBufIndex = iSharedBufferIndex-2; + TInt checkBufIndex = iSharedBufferIndex- (iSharedBuffers->Count()-1) ; if (checkBufIndex < 0) { @@ -430,11 +432,13 @@ if ((*iSharedBuffers)[checkBufIndex]->Status() == EBeingEmptied) { - if (iSharedBuffers->Count() <= 2) +// ou1cimx1#205863 +/* if (iSharedBuffers->Count() <= 2) { DP1(_L("CAdvancedAudioDecoder::NextSharedBufferL leave, EBeingEmptied is used on Count[%d]"), iSharedBuffers->Count()); User::Leave(KErrAbort); } +*/ DP2(_L("CAdvancedAudioDecoder::NextSharedBufferL, index[%d] [%x] is EBeingEmptied"), checkBufIndex, static_cast((*iSharedBuffers)[checkBufIndex])->Data().Ptr() ); refillBuffer = (*iSharedBuffers)[checkBufIndex]; @@ -488,9 +492,9 @@ DP3(_L("CAdvancedAudioDecoder::HandleFillBufferL ptr[%x] iRenderEnabled[%d] Position[%d]"), static_cast(iNextBuffer)->Data().Ptr(), iRenderEnabled, iNextBuffer->Position()); DP3(_L("CAdvancedAudioDecoder::HandleFillBufferL frm#[%d] d0[%x] dp[%x]"), static_cast(iNextBuffer)->FrameNumber(), static_cast(iNextBuffer)->Data().Ptr()[0], static_cast(iNextBuffer)->Data().Ptr()[iNextBuffer->Position()]); - - iBufferToFill->SetPosition(0); - static_cast(iBufferToFill)->Data().SetLength(0); +// ou1cimx1#205863 +// iBufferToFill->SetPosition(0); +// static_cast(iBufferToFill)->Data().SetLength(0); iBufferToFill->SetLastBuffer(EFalse); TCodecProcessResult result; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioPlayController.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioPlayController.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioPlayController.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -783,6 +783,7 @@ MDataSource& aSource) { DP1(_L("CAdvancedAudioPlayController::AddDataSourceL this[%x]"), this); + DP2(_L("CAdvancedAudioController::AddDataSourceL iSharedBufferMaxNum[%d] iSharedBufferMaxSize[%d]"), iSharedBufferMaxNum, iSharedBufferMaxSize); iSourceUnreadable = EFalse; iEnablePrimedStateChangedEvent = EFalse; // source type is intended to not be needed by controllers @@ -798,10 +799,6 @@ { User::Leave(KErrAlreadyExists); } - if (iSharedBufferMaxNum <= 2) - { - iSharedBufferMaxNum = 3; - } // set iReadHeader here in case prime is not called before set position is used. @@ -843,6 +840,17 @@ // we need to block this until duration is calculated if using mmfplayutility iBlockDuration = EFalse; +// ou1cimx1#205863 + if (!iDataSourceAdapter->IsLocalPlayback()) + { + DP0(_L("CAdvancedAudioPlayController::AddDataSourceL not file source")); + if (iSharedBufferMaxNum <= 2) + { + iSharedBufferMaxNum = 3; + } + iSharedBufferMaxSize = iSharedBufferMaxSizeForNonSeekableSrc; + DP2(_L("CAdvancedAudioPlayController::AddDataSourceL new iSharedBufferMaxNum[%d] iSharedBufferMaxSize[%d]"), iSharedBufferMaxNum, iSharedBufferMaxSize); + } if ((!iEventsEnabled) && (!iDataSourceAdapter->OnlyHeaderPresent())) { @@ -2240,11 +2248,17 @@ RArray& codecConfigData = const_cast&>(iAudioResource->CodecConfigParametersL()); // Override default values with values found from header, if available GetCodecConfigData(codecConfigData); - iAudioOutput->ConfigureL(iSampleRate, iSinkNumChannels, iDataType, codecConfigData); - DP0(_L("CAdvancedAudioPlayController::DoInitializeSinkL, output configured")); - iAudioOutput->PrimeL(); - DP0(_L("CAdvancedAudioPlayController::DoInitializeSinkL, output primed")); - + if (!iAudioOutput) + { + User::Leave(KErrNotReady); + } + else + { + iAudioOutput->ConfigureL(iSampleRate, iSinkNumChannels, iDataType, codecConfigData); + DP0(_L("CAdvancedAudioPlayController::DoInitializeSinkL, output configured")); + iAudioOutput->PrimeL(); + DP0(_L("CAdvancedAudioPlayController::DoInitializeSinkL, output primed")); + } // we would use this code when we have a NULL sink /* if (iDuration > 0) { diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioResource.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioResource.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioResource.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -89,6 +89,7 @@ iProperties.iSharedBufferMaxNum = iResourceReader.ReadInt32(); iProperties.iSharedBufferMaxSize = iResourceReader.ReadInt32(); + iProperties.iSharedBufferMaxSizeForNonSeekableSrc = iResourceReader.ReadInt32(); iProperties.iSamplingRate = iResourceReader.ReadInt32(); iProperties.iStereoSupport = iResourceReader.ReadInt32(); iProperties.iMetaDataSupport = iResourceReader.ReadInt32(); diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Bwins/DataSourceAdapteru.def --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Bwins/DataSourceAdapteru.def Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Bwins/DataSourceAdapteru.def Fri Mar 12 15:45:41 2010 +0200 @@ -28,4 +28,5 @@ ?SourceThreadLogoff@CDataSourceAdapter@@UAEXXZ @ 27 NONAME ; void CDataSourceAdapter::SourceThreadLogoff(void) ?SourceThreadLogon@CDataSourceAdapter@@UAEHAAVMAsyncEventHandler@@@Z @ 28 NONAME ; int CDataSourceAdapter::SourceThreadLogon(class MAsyncEventHandler &) ?SetAudioOutputControlUtil@CDataSourceAdapter@@QAEHPAVCAudioOutputControlUtility@@@Z @ 29 NONAME ; int CDataSourceAdapter::SetAudioOutputControlUtil(class CAudioOutputControlUtility *) + ?IsLocalPlayback@CDataSourceAdapter@@UAEHXZ @ 30 NONAME ; int CDataSourceAdapter::IsLocalPlayback(void) diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/EABI/DataSourceAdapteru.def --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/EABI/DataSourceAdapteru.def Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/EABI/DataSourceAdapteru.def Fri Mar 12 15:45:41 2010 +0200 @@ -15,24 +15,25 @@ _ZN18CDataSourceAdapter14IsTimeSeekableEv @ 14 NONAME _ZN18CDataSourceAdapter14SeekToPositionEj @ 15 NONAME _ZN18CDataSourceAdapter14SetDataSourceLEP11MDataSourceP29MMultimediaDataSourceObserverP18MAsyncEventHandler @ 16 NONAME - _ZN18CDataSourceAdapter16SetAgentPropertyEN13ContentAccess14TAgentPropertyEi @ 17 NONAME - _ZN18CDataSourceAdapter17IsPositonSeekableEv @ 18 NONAME - _ZN18CDataSourceAdapter17OnlyHeaderPresentEv @ 19 NONAME - _ZN18CDataSourceAdapter17SourceThreadLogonER18MAsyncEventHandler @ 20 NONAME - _ZN18CDataSourceAdapter18SourceThreadLogoffEv @ 21 NONAME - _ZN18CDataSourceAdapter19CreateSourceBufferLE8TMediaIdRi @ 22 NONAME - _ZN18CDataSourceAdapter21CanCreateSourceBufferEv @ 23 NONAME - _ZN18CDataSourceAdapter25SetSourcePrioritySettingsERK20TMMFPrioritySettings @ 24 NONAME - _ZN18CDataSourceAdapter4NewLEv @ 25 NONAME - _ZN18CDataSourceAdapter5EventE4TUid @ 26 NONAME - _ZN18CDataSourceAdapterC1Ev @ 27 NONAME - _ZN18CDataSourceAdapterC2Ev @ 28 NONAME - _ZN18CDataSourceAdapterD0Ev @ 29 NONAME - _ZN18CDataSourceAdapterD1Ev @ 30 NONAME - _ZN18CDataSourceAdapterD2Ev @ 31 NONAME - _ZTI18CDataSourceAdapter @ 32 NONAME ; ## - _ZTIN18CDataSourceAdapter21CAsyncProxyFillBufferE @ 33 NONAME ; ## - _ZTV18CDataSourceAdapter @ 34 NONAME ; ## - _ZTVN18CDataSourceAdapter21CAsyncProxyFillBufferE @ 35 NONAME ; ## - _ZN18CDataSourceAdapter25SetAudioOutputControlUtilEP26CAudioOutputControlUtility @ 36 NONAME + _ZN18CDataSourceAdapter15IsLocalPlaybackEv @ 17 NONAME + _ZN18CDataSourceAdapter16SetAgentPropertyEN13ContentAccess14TAgentPropertyEi @ 18 NONAME + _ZN18CDataSourceAdapter17IsPositonSeekableEv @ 19 NONAME + _ZN18CDataSourceAdapter17OnlyHeaderPresentEv @ 20 NONAME + _ZN18CDataSourceAdapter17SourceThreadLogonER18MAsyncEventHandler @ 21 NONAME + _ZN18CDataSourceAdapter18SourceThreadLogoffEv @ 22 NONAME + _ZN18CDataSourceAdapter19CreateSourceBufferLE8TMediaIdRi @ 23 NONAME + _ZN18CDataSourceAdapter21CanCreateSourceBufferEv @ 24 NONAME + _ZN18CDataSourceAdapter25SetAudioOutputControlUtilEP26CAudioOutputControlUtility @ 25 NONAME + _ZN18CDataSourceAdapter25SetSourcePrioritySettingsERK20TMMFPrioritySettings @ 26 NONAME + _ZN18CDataSourceAdapter4NewLEv @ 27 NONAME + _ZN18CDataSourceAdapter5EventE4TUid @ 28 NONAME + _ZN18CDataSourceAdapterC1Ev @ 29 NONAME + _ZN18CDataSourceAdapterC2Ev @ 30 NONAME + _ZN18CDataSourceAdapterD0Ev @ 31 NONAME + _ZN18CDataSourceAdapterD1Ev @ 32 NONAME + _ZN18CDataSourceAdapterD2Ev @ 33 NONAME + _ZTI18CDataSourceAdapter @ 34 NONAME + _ZTIN18CDataSourceAdapter21CAsyncProxyFillBufferE @ 35 NONAME + _ZTV18CDataSourceAdapter @ 36 NONAME + _ZTVN18CDataSourceAdapter21CAsyncProxyFillBufferE @ 37 NONAME diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Inc/DataSourceAdapter.h --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Inc/DataSourceAdapter.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Inc/DataSourceAdapter.h Fri Mar 12 15:45:41 2010 +0200 @@ -106,6 +106,7 @@ //sets the AudioOutputControlUtitlity reference and sets Datasource to AudioOutputContolUtility IMPORT_C TInt SetAudioOutputControlUtil(CAudioOutputControlUtility* aAudioOutputControlUtility); + IMPORT_C virtual TBool IsLocalPlayback(); protected: /** @@ -159,6 +160,7 @@ CMMFClip* iClip; CAsyncProxyFillBuffer* iAsyncProxyFillBuffer; TBool iHeaderOnly; + TBool iIsLocalPlayback; CAudioOutputControlUtility* iAudioOutputControlUtility; }; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Src/DataSourceAdapter.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Src/DataSourceAdapter.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Src/DataSourceAdapter.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -38,6 +38,7 @@ iTimeSeekable = EFalse; iDataSource = NULL; iIsProtected = EFalse; + iIsLocalPlayback = EFalse; } // ----------------------------------------------------------------------------- @@ -109,6 +110,10 @@ } else if ((iSourceType == KUidMmfFileSource) || (iSourceType == KOldProgDLSourceUid)) { + if (iSourceType == KUidMmfFileSource) + { + iIsLocalPlayback = ETrue; + } iPosSeekable = ETrue; iDataSource->SourcePrimeL(); iIsProtected = static_cast(iDataSource)->IsProtectedL(); @@ -400,6 +405,11 @@ } } +EXPORT_C TBool CDataSourceAdapter::IsLocalPlayback() + { + DP1(_L("CDataSourceAdapter::iIsLocalPlayback[%d]"), iIsLocalPlayback); + return iIsLocalPlayback; + } // ----------------------------------------------------------------------------- // CDataSourceAdapter::CAsyncProxyFillBuffer // ----------------------------------------------------------------------------- diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Data/AACAudioPlayControllerResource.rss --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Data/AACAudioPlayControllerResource.rss Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Data/AACAudioPlayControllerResource.rss Fri Mar 12 15:45:41 2010 +0200 @@ -30,8 +30,9 @@ // RESOURCE ADVANCED_AUDIO_CONTROLLER_RESOURCE aacDecoder { - shared_buffer_max_num = 2; - shared_buffer_max_size = 40960; + shared_buffer_max_num = 1; + shared_buffer_max_size = 504000; // multiple of 72000 + shared_buffer_max_size_non_seekable_source = 8192; sampling_rate = EAapSampleRate16000Hz; stereo_support = 2; metadata_support = EAapMetadataSupportTrue; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Src/AACAudioPlayControllerPlugin.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Src/AACAudioPlayControllerPlugin.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Src/AACAudioPlayControllerPlugin.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -61,7 +61,7 @@ iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum; iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize; iMetaDataSupport = aapProperties.iMetaDataSupport; - + iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc; iAudioUtility = CEAACPlusAudioControllerUtility::NewL(); iDecoderBuilder = CAACAudioPlayControllerDecoderBuilder::NewL(); } diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Data/AMRAudioPlayControllerResource.rss --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Data/AMRAudioPlayControllerResource.rss Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Data/AMRAudioPlayControllerResource.rss Fri Mar 12 15:45:41 2010 +0200 @@ -30,8 +30,9 @@ // RESOURCE ADVANCED_AUDIO_CONTROLLER_RESOURCE amrDecoder { - shared_buffer_max_num = 2; - shared_buffer_max_size = 8192; + shared_buffer_max_num = 1; + shared_buffer_max_size = 524288; // multiple of 1024 + shared_buffer_max_size_non_seekable_source = 8192; sampling_rate = EAapSampleRate8000Hz; stereo_support = 0; metadata_support = EAapMetadataSupportFalse; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Src/AMRAudioPlayControllerPlugin.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Src/AMRAudioPlayControllerPlugin.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Src/AMRAudioPlayControllerPlugin.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -56,7 +56,7 @@ iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum; iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize; iMetaDataSupport = aapProperties.iMetaDataSupport; - + iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc; iAudioUtility = CAMRAudioControllerUtility::NewL(); iDecoderBuilder = CAMRAudioPlayControllerDecoderBuilder::NewL(); } diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/Data/AMRAudioRecordControllerResource.rss --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/Data/AMRAudioRecordControllerResource.rss Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/Data/AMRAudioRecordControllerResource.rss Fri Mar 12 15:45:41 2010 +0200 @@ -33,6 +33,7 @@ { shared_buffer_max_num = 4; shared_buffer_max_size = 1024; + shared_buffer_max_size_non_seekable_source = 1024; sampling_rate = EAapSampleRate8000Hz; stereo_support = 0; metadata_support = EAapMetadataSupportFalse; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/Src/AMRAudioRecordControllerPlugin.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/Src/AMRAudioRecordControllerPlugin.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/Src/AMRAudioRecordControllerPlugin.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -52,7 +52,7 @@ TAapProperties aapProperties = iAudioResource->PropertiesL(); iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum; iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize; - + iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc; iAudioUtility = CAMRAudioControllerUtility::NewL(); } diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/Data/AWBAudioPlayControllerResource.rss --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/Data/AWBAudioPlayControllerResource.rss Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/Data/AWBAudioPlayControllerResource.rss Fri Mar 12 15:45:41 2010 +0200 @@ -30,8 +30,9 @@ // RESOURCE ADVANCED_AUDIO_CONTROLLER_RESOURCE awbDecoder { - shared_buffer_max_num = 2; - shared_buffer_max_size = 8192; + shared_buffer_max_num = 1; + shared_buffer_max_size = 524288; // multiple of 1024 + shared_buffer_max_size_non_seekable_source = 8192; sampling_rate = EAapSampleRate16000Hz; stereo_support = 0; metadata_support = EAapMetadataSupportFalse; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/Src/AWBAudioPlayControllerPlugin.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/Src/AWBAudioPlayControllerPlugin.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/Src/AWBAudioPlayControllerPlugin.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -55,7 +55,7 @@ iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum; iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize; iMetaDataSupport = aapProperties.iMetaDataSupport; - + iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc; iAudioUtility = CAWBAudioControllerUtility::NewL(); iDecoderBuilder = CAWBAudioPlayControllerDecoderBuilder::NewL(); } diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Data/MP3AudioPlayControllerResource.rss --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Data/MP3AudioPlayControllerResource.rss Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Data/MP3AudioPlayControllerResource.rss Fri Mar 12 15:45:41 2010 +0200 @@ -30,8 +30,9 @@ // RESOURCE ADVANCED_AUDIO_CONTROLLER_RESOURCE mp3Decoder { - shared_buffer_max_num = 2; - shared_buffer_max_size = 40960; + shared_buffer_max_num = 1; + shared_buffer_max_size = 528000; // multiple of 48000 + shared_buffer_max_size_non_seekable_source = 40960; sampling_rate = EAapSampleRate16000Hz; stereo_support = 2; metadata_support = EAapMetadataSupportTrue; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Src/MP3AudioPlayControllerPlugin.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Src/MP3AudioPlayControllerPlugin.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Src/MP3AudioPlayControllerPlugin.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -53,7 +53,7 @@ iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum; iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize; iMetaDataSupport = aapProperties.iMetaDataSupport; - + iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc; iAudioUtility = CMP3AudioControllerUtility::NewL(); iDecoderBuilder = CMP3AudioPlayControllerDecoderBuilder::NewL(); } diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_11 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_11 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_5 kbps_Voice.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_5 kbps_Voice.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_6 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_6 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_8 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_8 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/ActiveScheduledTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/conf/AudioPlaybackTestModule.cfg --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/conf/AudioPlaybackTestModule.cfg Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/conf/AudioPlaybackTestModule.cfg Fri Mar 12 15:45:41 2010 +0200 @@ -2,135 +2,6 @@ //***************************************************************************************************************** //* added new cases for CTC coverage improvement //***************************************************************************************************************** - - - -//************************** -//* Play (ID 100) -//************************** - -//For 3rd PartyDRM CR-Req 102-5626 - -[TestCase] -id 100 -Title AudioPlayback.1 - For DRM File 133-mp3-160.odf -SoundFile F:\download\133-mp3-160.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 100 -Title AudioPlayback.2 - For DRM File 132-allthatshewants.odf -SoundFile F:\download\132-allthatshewants.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - - -[TestCase] -id 100 -Title AudioPlayback.3 - For DRM File 66-WAV_64k_16b_signed_st_Test1.odf -SoundFile F:\download\66-WAV_64k_16b_signed_st_Test1.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 100 -Title AudioPlayback.4 - For DRM File eAAC-48k-24kbps.odf -SoundFile F:\download\eAAC-48k-24kbps.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 100 -Title AudioPlayback.5 - For DRM File AAC-mp4.odf -SoundFile F:\download\AAC-mp4.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 100 -Title AudioPlayback.6 - For DRM File AAC-audio-3gpp.odf -SoundFile F:\download\AAC-audio-3gpp.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 100 -Title AudioPlayback.7 - For DRM File AMR-WB-i-believe.odf -SoundFile F:\download\AMR-WB-i-believe.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -//************************** -//* Play (ID 99) -//************************** -// Testing LoopPlay for 3rd Party DRM CR-Req 102-5626 - -[TestCase] -id 99 -Title AudioPlayback.1 - For DRM File 133-mp3-160.odf -SoundFile F:\download\133-mp3-160.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 99 -Title AudioPlayback.2 - For DRM File -SoundFile F:\download\132-allthatshewants.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - - -[TestCase] -id 99 -Title AudioPlayback.3 - For DRM File 66-WAV_64k_16b_signed_st_Test1.odf -SoundFile F:\download\66-WAV_64k_16b_signed_st_Test1.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 99 -Title AudioPlayback.4 - For DRM File eAAC-48k-24kbps.odf -SoundFile F:\download\eAAC-48k-24kbps.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 99 -Title AudioPlayback.5 - For DRM File AAC-mp4.odf -SoundFile F:\download\AAC-mp4.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 99 -Title AudioPlayback.6 - For DRM File AAC-audio-3gpp.odf -SoundFile F:\download\AAC-audio-3gpp.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - -[TestCase] -id 99 -Title AudioPlayback.7 - For DRM File AMR-WB-i-believe.odf -SoundFile F:\download\AMR-WB-i-believe.odf -Expected Duration 2 000 000 -ErrorRange 1 000 000 -[End_TestCase] - - //************************** //* Play (ID 145) //************************** @@ -144,54 +15,6 @@ //************************** -//* Play (ID 136) -//************************** -//Testing NewL function for 3rd PartyDRM CR-Req 102-5626 - -[TestCase] -id 136 -Title AudioPlayback.1 - NewFilePlayerL 133-mp3-160.odf -SoundFile F:\download\133-mp3-160.odf -[End_TestCase] - -[TestCase] -id 136 -Title AudioPlayback.2 - NewFilePlayerL testmidi.dcf -SoundFile F:\download\132-allthatshewants.odf -[End_TestCase] - -[TestCase] -id 136 -Title AudioPlayback.3 - NewFilePlayerL 66-WAV_64k_16b_signed_st_Test1.odf -SoundFile F:\download\66-WAV_64k_16b_signed_st_Test1.odf -[End_TestCase] - -[TestCase] -id 136 -Title AudioPlayback.4 - NewFilePlayerL eAAC-48k-24kbps.odf -SoundFile F:\download\eAAC-48k-24kbps.odf -[End_TestCase] - -[TestCase] -id 136 -Title AudioPlayback.5 - NewFilePlayerL AAC-mp4.odf -SoundFile F:\download\AAC-mp4.odf -[End_TestCase] - -[TestCase] -id 136 -Title AudioPlayback.6 - NewFilePlayerL AAC-audio-3gpp.odf -SoundFile F:\download\AAC-audio-3gpp.odf -[End_TestCase] - -[TestCase] -id 136 -Title AudioPlayback.7 - For DRM File AMR-WB-i-believe.odf -SoundFile F:\download\AMR-WB-i-believe.odf -[End_TestCase] - - -//************************** //* Play (ID 152) //************************** @@ -260,9 +83,8 @@ [TestCase] id 143 -Title AudioPlayback.210 - CtrImpInfo Play AMR_WB_6.6kbps.awb -SoundFile e:\testing\data\awb\AMR_WB_6.6kbps.awb -Expected Duration 2 000 000 +Title AudioPlayback.210 - CtrImpInfo Play 10s_smooth.mp3 +SoundFile e:\testing\data\mp3\10s_smooth.mp3 ErrorRange 1 000 000 [End_TestCase] @@ -298,22 +120,10 @@ id 139 Title AudioPlayback.214 - GetLoadPercentage_Play 10s_AMR_WB_15.85kbps.awb SoundFile e:\testing\data\awb\10s_AMR_WB_15.85kbps.awb -Position 5 000 000 ErrorRange 1 000 000 [End_TestCase] -//************************** -//* Play - OpenUrlL (ID 106) -//*Real Hw -//*rtsp://63.108.142.51/TestContent/MediaContent/WCDMA/VideoContent/CBR/3GPP2/VideoContents/MPEG4/30k_MPEG4_3G2_176x144_15fps.3g2 -//************************** - -[TestCase] -id 106 -Title AudioPlayback.215 - OpenUrlL 10s_smooth.mp3 -SoundFile rtsp://63.108.142.51/testing/data/mp3/10s_smooth.mp3 -[End_TestCase] //************************** //* Play - Priority (ID 135) @@ -660,14 +470,6 @@ [End_TestCase] -// data file too big, comment out test case -//[TestCase] -//id 114 -//Title AudioPlayback.35 - DisplayFields FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//[End_TestCase] - [TestCase] id 114 Title AudioPlayback.36 - DisplayFields DownUnder_remix.aac @@ -698,14 +500,6 @@ DontPlayAudioClip [End_TestCase] -// data file too big, comment out test case -//[TestCase] -//id 133 -//Title AudioPlayback.40 - MetaDataCount FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//EntryCount 14 -//DontPlayAudioClip -//[End_TestCase] [TestCase] id 133 @@ -939,118 +733,7 @@ MetaDataData Dance [End_TestCase] -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.67 - MetaDataData SongTitle FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName title -//MetaDataData Fix You -//[End_TestCase] -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.68 - MetaDataData Artist FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName artist -//MetaDataData Coldplay -//[End_TestCase] - - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.69 - MetaDataData Album FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName album -//MetaDataData X & Y -//[End_TestCase] - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.70 - MetaDataData Year FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName year -//MetaDataData 2005 -//[End_TestCase] - - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.71 - MetaDataData Comment FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName comment -//MetaDataData Soothing -//[End_TestCase] - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.72 - MetaDataData AlbumTrack FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName albumtrack -//MetaDataData 4/13 -//[End_TestCase] - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.73 - MetaDataData Genre FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName genre -//MetaDataData Alternative -//[End_TestCase] - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.74 - MetaDataData Composer FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName composer -//MetaDataData Chris Martin -//[End_TestCase] - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.75 - MetaDataData Copyright FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName copyright -//MetaDataData EMI Records -//[End_TestCase] - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.76 - MetaDataData OrigArtist FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName originalartist -//MetaDataData coldplay -//[End_TestCase] - - -// data file too big, comment out test case -//[TestCase] -//id 130 -//Title AudioPlayback.77 - MetaDataData UserUrl FixYou_Coldplay.mp3 -//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 -//DontPlayAudioClip -//MetaDataName userdefinedurllinkframe -//MetaDataData www.coldplay.com -//[End_TestCase] //************************** //* Play AMR NB Modes 0-7 (ID 120) @@ -1678,7 +1361,7 @@ [TestCase] id 155 Title AudioPlayback.152 - Repeat Pause MIDI -SoundFile e:\testing\data\mid\37s_MID_Generic.mid +SoundFile e:\testing\data\mid\30s_MID_Generic.mid RepeatTimes 3 SilenceDuration 3 000 000 PauseDelay 20000000 @@ -2081,3 +1764,137 @@ // StartPosition 3 000 000 // EndPosition 7 000 000 // [End_TestCase] + +//************************** +//* Play - OpenUrlL (ID 106) +//*Real Hw +//*rtsp://63.108.142.51/TestContent/MediaContent/WCDMA/VideoContent/CBR/3GPP2/VideoContents/MPEG4/30k_MPEG4_3G2_176x144_15fps.3g2 +//************************** + +//[TestCase] +//id 106 +//Title AudioPlayback.215 - OpenUrlL 10s_smooth.mp3 +//SoundFile rtsp://63.108.142.51/testing/data/mp3/10s_smooth.mp3 +//SoundFile rtsp://10.58.104.43:554/aac64kbps44khzHint.mp4 +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 114 +//Title AudioPlayback.35 - DisplayFields FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.67 - MetaDataData SongTitle FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName title +//MetaDataData Fix You +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.68 - MetaDataData Artist FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName artist +//MetaDataData Coldplay +//[End_TestCase] + + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.69 - MetaDataData Album FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName album +//MetaDataData X & Y +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.70 - MetaDataData Year FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName year +//MetaDataData 2005 +//[End_TestCase] + + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.71 - MetaDataData Comment FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName comment +//MetaDataData Soothing +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.72 - MetaDataData AlbumTrack FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName albumtrack +//MetaDataData 4/13 +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.73 - MetaDataData Genre FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName genre +//MetaDataData Alternative +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.74 - MetaDataData Composer FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName composer +//MetaDataData Chris Martin +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.75 - MetaDataData Copyright FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName copyright +//MetaDataData EMI Records +//[End_TestCase] + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.76 - MetaDataData OrigArtist FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName originalartist +//MetaDataData coldplay +//[End_TestCase] + + +// data file too big, comment out test case +//[TestCase] +//id 130 +//Title AudioPlayback.77 - MetaDataData UserUrl FixYou_Coldplay.mp3 +//SoundFile e:\testing\data\metadata\FixYou_Coldplay.mp3 +//DontPlayAudioClip +//MetaDataName userdefinedurllinkframe +//MetaDataData www.coldplay.com +//[End_TestCase] \ No newline at end of file diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_11 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_11 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_5 kbps_Voice.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_5 kbps_Voice.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_6 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_6 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_8 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_8 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/src/MmfTsPlay_core.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/src/MmfTsPlay_core.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/src/MmfTsPlay_core.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include #include "MmfTsPlay.h" -#include +#include // Constants const TInt CMmfTsPlay::MAX_TESTCASE_ID = 160; @@ -560,13 +560,11 @@ iLogger->Log(_L("Creating simple player with file [%S]"), &FileNamePtr); CSimpleSoundPlayer *sndPlayer = CSimpleSoundPlayer::NewL( FileName, TestModuleIf() , *iLogger); - sndPlayer -> CtrImpInfo(); - - CleanupStack::PushL(sndPlayer); iLogger->Log(_L("Starting scheduler")); CActiveScheduler::Start(); + sndPlayer -> CtrImpInfo(); iLogger->Log(_L("Returned from player, errorcode: %d"), sndPlayer->iFinalError ); @@ -951,7 +949,6 @@ TInt CMmfTsPlay::TestCaseGetLoadPercentageL(CStifSectionParser *section, TTestResult & aResult) { TPtrC FileNamePtr; - TTimeIntervalMicroSeconds Position = KDefaultPosition; if ( !section->GetLine(KTagSoundFile, FileNamePtr, ENoTag) ) { @@ -960,55 +957,22 @@ CSimpleSoundPlayer *sndPlayer = CSimpleSoundPlayer::NewL( FileName, TestModuleIf() , *iLogger); CleanupStack::PushL(sndPlayer); - TBool UsingDefault; - Position = GetTimeIntervalL(section, KTagPosition, UsingDefault, KDefaultPosition); - - iLogger->Log(_L("Seting position to: %d"), Position.Int64()); - if (UsingDefault) {iLogger->Log(_L("Using default position duration of: (%d)") , KDefaultPosition.Int64());} - sndPlayer->iPosition = Position; - - TTimeIntervalMicroSeconds ErrorRange = GetTimeIntervalL(section, KTagErrorRange, UsingDefault, KDefaultErrorRange); - if (UsingDefault) {iLogger->Log(_L("Using default error range"));} - // * ************************************************************** - - sndPlayer -> GetLoad_Percentage(); - iLogger->Log(_L("Starting scheduler")); - TTime StartTime,EndTime; - StartTime.HomeTime(); - CActiveScheduler::Start(); - EndTime.HomeTime(); - - - - TTimeIntervalMicroSeconds PerceivedDuration = EndTime.MicroSecondsFrom( StartTime ); - + CActiveScheduler::Start(); + sndPlayer -> GetLoad_Percentage(); + iLogger->Log(_L("Returned from player, errorcode: %d"), sndPlayer->iFinalError ); - iLogger->Log(_L("Perceived duration: %d") , PerceivedDuration.Int64() ); - - - TTimeIntervalMicroSeconds ExpectedDuration = TTimeIntervalMicroSeconds(I64INT(sndPlayer->GetDuration().Int64()) - I64INT(Position.Int64())); - iLogger->Log(_L("ExpectedDuration: %d") ,ExpectedDuration.Int64() ); - - if ( Abs(ExpectedDuration.Int64() - PerceivedDuration.Int64()) > ErrorRange.Int64() ) - { //Durations too different - iLogger->Log(_L("The clips duration is too different from the actual duration + position") ); - aResult.iResult = KErrExpectedValueDifferent; - aResult.iResultDes.Copy(KTestCaseResultFailExpectedValueDifferent()); + aResult.iResult = sndPlayer->iFinalError; + if (aResult.iResult) + { + iLogger->Log(_L("Test failed, error code %d"), aResult.iResult); + aResult.iResultDes.Copy(KTestCaseResultFail()); } else { - aResult.iResult = sndPlayer->iFinalError; - if (aResult.iResult) - { - iLogger->Log(_L("Test failed, error code %d"), aResult.iResult); - aResult.iResultDes.Copy(KTestCaseResultFail()); - } - else - { - iLogger->Log(_L("Test was successful")); - aResult.iResultDes.Copy(KTestCaseResultSuccess()); - } + iLogger->Log(_L("Test was successful")); + aResult.iResultDes.Copy(KTestCaseResultSuccess()); } + CleanupStack::PopAndDestroy(sndPlayer); return KErrExecuted; } diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/src/SimpleSoundPlayer.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/src/SimpleSoundPlayer.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/src/SimpleSoundPlayer.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -692,7 +692,11 @@ { TInt percentage; iLogger.Log(_L("Trying to GetLoad_Percentage\n ") ); - iMdaPlayer->GetAudioLoadingProgressL(percentage); + TRAPD(err,iMdaPlayer->GetAudioLoadingProgressL(percentage)); //Controller doesnt support GetAudioLoadingProgressL. + if( err == KErrNotSupported ) + { + iFinalError = 0; + } iLogger.Log(_L("GetAudioLoadingProgressL (%d)") , percentage); } @@ -791,9 +795,9 @@ void CSimpleSoundPlayer::CtrImpInfo() { - iLogger.Log(_L("Trying to GetLoad_Percentage\n ") ); - const CMMFControllerImplementationInformation& info = iMdaPlayer->ControllerImplementationInformationL(); - iLogger.Log(_L("GetDRMCustomCommand() finished") ); + iLogger.Log(_L("Trying to CtrImpInfo\n ") ); + const CMMFControllerImplementationInformation& info = iMdaPlayer->ControllerImplementationInformationL(); + iLogger.Log(_L("CtrImpInfo finished") ); } void CSimpleSoundPlayer::Set_Priority() diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/conf/AudioRecorderTestModule.cfg --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/conf/AudioRecorderTestModule.cfg Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/conf/AudioRecorderTestModule.cfg Fri Mar 12 15:45:41 2010 +0200 @@ -197,9 +197,9 @@ [TestCase] Id 211 Title AudioRecord.24 - SetPriority - amr -File e:\testing\data\record\PriorityTest1-.amr 5 0 2 0 0 -File e:\testing\data\record\PriorityTest2-.amr 3 1 1 0 0 -File e:\testing\data\record\PriorityTest3-.amr 8 0 8 0 0 +File e:\testing\data\record\PriorityTest1-.amr 5 0 6 0 0 +File e:\testing\data\record\PriorityTest2-.amr 3 1 2 0 0 +File e:\testing\data\record\PriorityTest3-.amr 8 0 11 0 0 RecTime 3 0 0 [End_TestCase] diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_11 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_11 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_5 kbps_Voice.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_5 kbps_Voice.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_6 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_6 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_8 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_8 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordOpen.h --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordOpen.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordOpen.h Fri Mar 12 15:45:41 2010 +0200 @@ -25,7 +25,7 @@ #include #include "TestCaseBase.h" -#include +#include class CRecordOpen : public CTestCaseBase, public MMdaObjectStateChangeObserver { diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordingBase.h --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordingBase.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordingBase.h Fri Mar 12 15:45:41 2010 +0200 @@ -26,7 +26,7 @@ #include #include "TestCaseBase.h" #include "MediaEvent.h" - +#include class CRecordingBase; typedef CRecordingBase* recPtr; @@ -76,6 +76,13 @@ bool isAmr; bool isBitRateTest; + RFs iFs; + + /** + * Pointer to a file manager object. Owned. + */ + CFileMan* iFileMan; + //To create an object of the derived class static CRecordingBase* CreateObjectL(CTestModuleIf *aConsole, CStifLogger *aLogger); diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioLoadingProgress.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioLoadingProgress.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioLoadingProgress.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -176,7 +176,7 @@ TInt percentage; TRAPD(err, recorder->GetAudioLoadingProgressL(percentage)); - if (err != KErrNone) + if (err != KErrNotSupported) { logger->Log(_L("Error %d for GetAudioLoadingProgressL %d "),KErrProgressPect, percentage ); callbackErr = KErrProgressPect; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/MetaDataEntry.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/MetaDataEntry.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/MetaDataEntry.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -167,7 +167,7 @@ TInt NumMetaDatas =0; err = recorder->GetNumberOfMetaDataEntries(NumMetaDatas); - if ( err ) + if ( err !=KErrNotSupported ) { //Error getting meta data info logger->Log(_L("Error getting meta data info %d"),err); callbackErr = err; @@ -186,7 +186,7 @@ CMMFMetaDataEntry *myMetaData = CMMFMetaDataEntry::NewL(myName, myValue); TRAPD(err, recorder->AddMetaDataEntryL(*myMetaData)); - if (err != KErrNone) + if (err != KErrNotSupported) { logger->Log(_L("Error %d for AddMetaDataEntryL"),err); callbackErr = err; @@ -197,7 +197,7 @@ CMMFMetaDataEntry *currentMetaData; TRAPD(err1, (currentMetaData = recorder->GetMetaDataEntryL(0))); - if (err1 != KErrNone) + if (err1 != KErrNotSupported) { logger->Log(_L("Error %d for GetMetaDataEntryL"),err1); callbackErr = err1; @@ -212,13 +212,17 @@ logger->Log(_L("getting meta data info %d"),currMetaDataIndex); CMMFMetaDataEntry *currMetaData; TRAPD(err2, (currMetaData = recorder->GetMetaDataEntryL(currMetaDataIndex))); - if (err2 != KErrNone) + if (err2 != KErrNotSupported) { logger->Log(_L("Error %d for GetMetaDataEntryL"),err2); //delete currMetaData; callbackErr = err2; break; } + if( err2 != KErrNone) + { + break; + } if (currMetaData != NULL ) { // check for jpeg image @@ -233,7 +237,7 @@ TRAPD(err3, recorder->ReplaceMetaDataEntryL(0, *myMetaData);); - if (err3 != KErrNone) + if (err3 != KErrNotSupported) { logger->Log(_L("Error %d for ReplaceMetaDataEntryL"),err3); callbackErr = err3; @@ -242,7 +246,7 @@ logger->Log(_L("ReplaceMetaDataEntryL CMMFMetaDataEntry.")); TRAPD(err4, recorder->RemoveMetaDataEntry(0)); - if (err4 != KErrNone) + if (err4 != KErrNotSupported) { logger->Log(_L("Error %d for RemoveMetaDataEntry"),err4); callbackErr = err4; diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordingBase.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordingBase.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordingBase.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -41,8 +41,11 @@ } CRecordingBase::~CRecordingBase() -{ +{ + TInt err( iFileMan->Delete( recordingFileName ) ); if (recorder) delete recorder; + iFs.Close(); + if(iFileMan) delete iFileMan; recorder = NULL; } @@ -113,6 +116,9 @@ void CRecordingBase::ConstructL(TFileName* fileName) { logger->Log(_L("Creating file: %S"),fileName); + User::LeaveIfError( iFs.Connect() ); + iFileMan = CFileMan::NewL( iFs ); + recorder = CMdaAudioRecorderUtility::NewL(*this); if (recorder) { diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_11 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_11 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_5 kbps_Voice.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_5 kbps_Voice.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_6 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_6 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_8 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_8 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioStreamTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_11 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_11 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_12 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_128 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_16 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_160 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_192 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_20 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_256 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_32 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_320 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_44 kbps_Stereo Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_5 kbps_Voice.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_5 kbps_Voice.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_6 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_6 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_64 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_8 kbps_Music.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_8 kbps_Music.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra Binary file mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioToneTestModule/data/mmc/ra/RA_96 kbps_Stereo Music - RealAudio 10.ra has changed diff -r 4f62049db6ac -r 709f89d8c047 mmmw_plat/telephony_multimedia_service_api/inc/tms.h --- a/mmmw_plat/telephony_multimedia_service_api/inc/tms.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmmw_plat/telephony_multimedia_service_api/inc/tms.h Fri Mar 12 15:45:41 2010 +0200 @@ -77,10 +77,6 @@ #define TMS_EVENT_ROUTING_AVAIL_OUTPUTS_CHANGED ((gint)0x00000006) #define TMS_EVENT_ROUTING_OUTPUT_CHANGED ((gint)0x00000007) #define TMS_EVENT_ROUTING_SET_OUTPUT_COMPLETE ((gint)0x00000008) -#define TMS_EVENT_RINGTONE_OPEN_COMPLETE ((gint)0x00000009) -#define TMS_EVENT_RINGTONE_PLAY_COMPLETE ((gint)0x0000000A) -#define TMS_EVENT_DTMF_TONE_STARTED ((gint)0x0000000B) -#define TMS_EVENT_DTMF_TONE_STOPPED ((gint)0x0000000C) // Stream states typedef gint TMSStreamState; @@ -147,7 +143,7 @@ #define TMS_ILBC_CODEC_MODE_20MS_FRAME ((gint)0) #define TMS_ILBC_CODEC_MODE_30MS_FRAME ((gint)1) -// Oudio output types +// Audio output types typedef gint TMSAudioOutput; #define TMS_AUDIO_OUTPUT_NONE ((gint)0) #define TMS_AUDIO_OUTPUT_PUBLIC ((gint)1) diff -r 4f62049db6ac -r 709f89d8c047 mmmw_plat/telephony_multimedia_service_api/inc/tmsfactory.h --- a/mmmw_plat/telephony_multimedia_service_api/inc/tmsfactory.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmmw_plat/telephony_multimedia_service_api/inc/tmsfactory.h Fri Mar 12 15:45:41 2010 +0200 @@ -32,9 +32,6 @@ class TMSFactoryImpl; class TMSVer; class TMSGlobalRouting; -class TMSDTMF; -class TMSRTPSession; -class TMSRingTone; /** * TMSFactory class @@ -354,97 +351,6 @@ */ IMPORT_C gint DeleteGlobalRouting(TMSGlobalRouting*& globrouting); - /** - * Create DTMF player object. - * - * @param streamtype - * Stream ID to be used to create the DTMF player. - * TMS_STREAM_UPLINK - * TMS_STREAM_DOWNLINK - * - * @param dtmf - * Created DTMF player. - * - * @return - * TMS_RESULT_SUCCESS if the operation was successful. - * TMS_RESULT_INSUFFICIENT_MEMORY if DTMF player creation failed due - * to insufficient memory. - * TMS_RESULT_FATAL_ERROR if an error occured. - * TMS_REASON_EMERGENCY_CALL_ONGOING if emergency call is active. - * TMS_REASON_PERMISSION_DENIED if permission is denied. - * - */ - IMPORT_C gint CreateDTMF(TMSStreamType streamtype, TMSDTMF*& dtmf); - - /** - * Delete DTMF player object. - * - * @param dtmf - * DTMF player to be deleted. - * - * @return - * TMS_RESULT_SUCCESS if the operation was successful. - * TMS_RESULT_INVALID_ARGUMENT if the DTMF player is not valid. - * - */ - IMPORT_C gint DeleteDTMF(TMSDTMF*& dtmf); - - /** - * Creates TMSRTPSession object. - * - * @param rtpsession - * RTP Session object to be created. - * - * @param sdp - * Session description protocol message. - * - * @param mode - * Buffer processing mode: either PULL or PUSH. - * - * @return - * TMS_RESULT_SUCCESS when object is created successfully. - * TMS_RESULT_INSUFFICIENT_MEMORY when object creation failed due to - * insufficient memory. - */ - IMPORT_C gint CreateRTPSession(TMSRTPSession*& rtpsession, guint8* sdp, - guint mode); - - /** - * Deletes TMSRTPSession object. - * - * @param rtpsession - * RTP Session object to be deleted. - * - * @return - * TMS_RESULT_SUCCESS when object is deleted successfully. - * TMS_RESULT_INVALID_ARGUMENT if RTP session object is invalid. - */ - IMPORT_C gint DeleteRTPSession(TMSRTPSession*& rtpsession); - - /** - * Creates TMSRingTone player object. - * - * @param rt - * RingTone player object to be created. - * - * @return - * TMS_RESULT_SUCCESS when object is created successfully. - * TMS_RESULT_INSUFFICIENT_MEMORY when object creation failed due to - * insufficient memory. - */ - IMPORT_C gint CreateRingTonePlayer(TMSRingTone*& rt); - - /** - * Deletes TMSRingTone object. - * - * @param rt - * RingTone player object to be deleted. - * - * @return - * TMS_RESULT_SUCCESS when object is deleted successfully. - * TMS_RESULT_INVALID_ARGUMENT if RingTone player object is invalid. - */ - IMPORT_C gint DeleteRingTonePlayer(TMSRingTone*& rt); private: /** diff -r 4f62049db6ac -r 709f89d8c047 mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/inc/TMSAudioServicesTestClass.h --- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/inc/TMSAudioServicesTestClass.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/inc/TMSAudioServicesTestClass.h Fri Mar 12 15:45:41 2010 +0200 @@ -27,29 +27,28 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "TimeoutController.h" @@ -332,12 +331,8 @@ TInt GetDownlinkVersion(CStifItemParser& aItem); TInt CreateUplinkStream(CStifItemParser& aItem); TInt GetUplinkVersion(CStifItemParser& aItem); - TInt CreateDTMFTonePlayer(CStifItemParser& aItem); - TInt DeleteDTMFTonePlayer(CStifItemParser& aItem); - TInt CreateRingTonePlayer(CStifItemParser& aItem); TInt GetSupportedFormats(CStifItemParser& aItem); TInt IsCallTypeSupported(CStifItemParser& aItem); - // TInt GetSupportedUplinkFormats( CStifItemParser& aItem ); TInt SetDownlinkFormat(CStifItemParser& aItem); TInt SetUplinkFormat(CStifItemParser& aItem); TInt ReSetDownlinkFormat(CStifItemParser& aItem); @@ -352,11 +347,6 @@ TInt Gain(CStifItemParser& aItem); TInt Volume(CStifItemParser& aItem); - TInt InitDTMFTonePlayer(CStifItemParser& aItem); - TInt DTMFTonePlay(CStifItemParser& aItem); - TInt CloseDTMFPlayer(CStifItemParser& aItem); - TInt StopDTMFTonePlayer(CStifItemParser& aItem); - TInt GetBufferType(CStifItemParser& aItem); // TInt GetSupportedBitrates( CStifItemParser& aItem ); @@ -430,8 +420,6 @@ TMSStream* iTmsDnlink; TMSCall* iTmsCall; TMSStream* iTmsUplink; - TMSDTMF* iDTMFTonePlayerDn; - TMSDTMF* iDTMFTonePlayerUp; TMSAudioOutput iDevice; // Codec format APIs @@ -466,22 +454,15 @@ TBool iPlc; TBool iCng; TBool iVad; - // TBool iFrameMode; - // TBool iFrameModeReqEC; - // TBool iSpkr; guint iMaxGain; guint iGain; guint iMaxVolume; guint iVolume; TUint currentBitrate; - // RArray iBitratesArray; // For streaming buffer control TMSBuffer* iPlayBuf; TMSBuffer* iRecBuf; - // TPtr8 iPlayBufPtr; - // TPtr8 iRecBufPtr; - TBool iPlayBufReady; TBool iRecBufReady; diff -r 4f62049db6ac -r 709f89d8c047 mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TimeoutController.cpp --- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TimeoutController.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TimeoutController.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -249,7 +249,7 @@ if (iTestCaseTimeout > timeout) { RDebug::Print( - _L( "Absolute timer still valid. Restaring timer. iStatus: %d" ), + _L("Absolute timer still valid. Restaring timer. iStatus: %d"), iStatus.Int()); // Start new timer iStatus = KErrNone; // reset value diff -r 4f62049db6ac -r 709f89d8c047 mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp --- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -116,9 +116,6 @@ iLog->Log(_L("")); iLog->Log(_L("")); - delete iDTMFTonePlayerDn; - delete iDTMFTonePlayerUp; - // delete iPlayBuf; if (iTmsDnlink) @@ -174,8 +171,6 @@ ENTRY( "GetEffectType", CTmsAudioServicesTestClass::GetEffectType ), ENTRY( "CreateDownlinkStream", CTmsAudioServicesTestClass::CreateDownlinkStream ), ENTRY( "CreateUplinkStream", CTmsAudioServicesTestClass::CreateUplinkStream ), - ENTRY( "CreateDTMFTonePlayer", CTmsAudioServicesTestClass::CreateDTMFTonePlayer ), - ENTRY( "DeleteDTMFTonePlayer", CTmsAudioServicesTestClass::DeleteDTMFTonePlayer ), ENTRY( "GetSupportedFormats", CTmsAudioServicesTestClass::GetSupportedFormats ), ENTRY( "IsCallTypeSupported", CTmsAudioServicesTestClass::IsCallTypeSupported ), ENTRY( "SetDownlinkFormat", CTmsAudioServicesTestClass::SetDownlinkFormat ), @@ -198,10 +193,6 @@ ENTRY( "GetBitRateList", CTmsAudioServicesTestClass::GetBitRateList ), ENTRY( "SetBitrates", CTmsAudioServicesTestClass::SetBitrates ), ENTRY( "GetBitrates", CTmsAudioServicesTestClass::GetBitrates ), - ENTRY( "InitDTMFTonePlayer", CTmsAudioServicesTestClass::InitDTMFTonePlayer ), - ENTRY( "DTMFTonePlay", CTmsAudioServicesTestClass::DTMFTonePlay ), - ENTRY( "CloseDTMFPlayer", CTmsAudioServicesTestClass::CloseDTMFPlayer ), - ENTRY( "StopDTMFPlayer", CTmsAudioServicesTestClass::StopDTMFTonePlayer ), ENTRY( "GetDownlinkVersion", CTmsAudioServicesTestClass::GetDownlinkVersion ), ENTRY( "GetUplinkVersion", CTmsAudioServicesTestClass::GetUplinkVersion ), ENTRY( "GetType", CTmsAudioServicesTestClass::GetType ), @@ -1124,75 +1115,6 @@ return error; } -TInt CTmsAudioServicesTestClass::CreateDTMFTonePlayer(CStifItemParser& aItem) - { - iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer")); - TInt error = KErrNone; - TPtrC StreamType; - error = aItem.GetNextString(StreamType); - - if (error == KErrNone) - { - if (StreamType == KTagDnlink) - { - if (iTmsCall) - { - error = iFactory->CreateDTMF(0, iDTMFTonePlayerDn); - FTRACE(FPrint(_L("CreateDTMF Error [%d]"),error)); - } - } - else if (StreamType == KTagUplink) - { - if (iTmsCall) - { - error = iFactory->CreateDTMF(0, iDTMFTonePlayerUp); - } - } - else - { - iLog->Log(KMsgBadTestParameters); - error = KErrBadTestParameter;} - } - iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer Error [%d]"), - error); - return error; - } - -TInt CTmsAudioServicesTestClass::DeleteDTMFTonePlayer(CStifItemParser& aItem) - { - iLog->Log(_L("CTmsAudioServicesTestClass::DeleteDTMFTonePlayer")); - TInt error = KErrNone; - TPtrC StreamType; - error = aItem.GetNextString(StreamType); - - if (error == KErrNone) - { - if (StreamType == KTagDnlink) - { - if (iTmsCall && iDTMFTonePlayerDn) - { - error = iFactory->DeleteDTMF(iDTMFTonePlayerDn); - FTRACE(FPrint(_L("DeleteDTMF Error [%d]"),error)); - } - } - else if (StreamType == KTagUplink) - { - if (iTmsCall && iDTMFTonePlayerUp) - { - error = iFactory->DeleteDTMF(iDTMFTonePlayerUp); - } - } - else - { - iLog->Log(KMsgBadTestParameters); - error = KErrBadTestParameter; - } - } - iLog->Log(_L("CTmsAudioServicesTestClass::DeleteDTMFTonePlayer Error [%d]"), - error); - return error; - } - TInt CTmsAudioServicesTestClass::GetSupportedFormats(CStifItemParser& aItem) { iLog->Log(_L("CTmsAudioServicesTestClass::GetSupportedFormats")); @@ -2332,38 +2254,6 @@ return error; } -TInt CTmsAudioServicesTestClass::InitDTMFTonePlayer(CStifItemParser& /*aItem */) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::InitDTMFTonePlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::InitDTMFTonePlayer")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::DTMFTonePlay(CStifItemParser& /*aItem */) - { - FTRACE (FPrint(_L("CTmsAudioServicesTestClass::DTMFTonePlay"))); - iLog->Log(_L("CTmsAudioServicesTestClass::DTMFTonePlay")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::CloseDTMFPlayer(CStifItemParser& /*aItem */) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::StopDTMFTonePlayer(CStifItemParser& /*aItem */) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::StopDTMFTonePlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::StopDTMFTonePlay")); - TInt error = KErrNone; - return error; - } - TInt CTmsAudioServicesTestClass::GetBitRateList(CStifItemParser& /*aItem*/) { iLog ->Log(_L("CTmsAudioServicesTestClass::GetBitRateList")); diff -r 4f62049db6ac -r 709f89d8c047 mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp --- a/mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -331,12 +331,14 @@ // Set the active preset in the equalizer item array iItemArray->SetCurrentActivePreset(aPreset); - // Display Confirmation note - HBufC* activateNoteText = StringLoader::LoadLC( + // Display Confirmation note + // As per 9.2 Spec, No activation note should be shown + + /*HBufC* activateNoteText = StringLoader::LoadLC( R_QTN_EQ_NOTE_INFO_PRESET_ACTIVATED, aPreset); CAknConfirmationNote* dialog = new(ELeave)CAknConfirmationNote(); dialog->ExecuteLD(*activateNoteText); - CleanupStack::PopAndDestroy(activateNoteText); + CleanupStack::PopAndDestroy(activateNoteText); */ // Inform the engine if (aPreset.Compare(*iPresetNoneText) == 0) @@ -1092,6 +1094,8 @@ } iContextSensitiveMenu = EFalse; } + aMenuPane->SetItemDimmed(EEqualizerCmdCreateNew, ETrue ); + aMenuPane->SetItemDimmed(EEqualizerCmdEdit, ETrue); } } diff -r 4f62049db6ac -r 709f89d8c047 mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp --- a/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -70,7 +70,8 @@ iMaxSigStrength(0), iEnableTunerInOffline(EFalse), iSquelch(EFalse), - iPreEmpted(EFalse) + iPreEmpted(EFalse), + iSchedulerWait( NULL ) { } @@ -127,6 +128,8 @@ iMapper = CTspClientMapper::NewL(); iTspState = CTspClientMapper::ERegisteredClients; #endif // RD_TSP_CLIENT_MAPPER + + iSchedulerWait = new (ELeave) CActiveSchedulerWait; RADIO_RDEBUG(_L("[RADIO-SVR] ConstructL() - End")); } @@ -166,6 +169,7 @@ delete iTunerControl; delete iTunerControlObserver; delete iAsyncRequest; + delete iSchedulerWait; ClearQueue(); iRdsNotifyClientIdArray.Close(); @@ -619,6 +623,11 @@ } break; case EStateTunerOff: + if( iSchedulerWait->IsStarted() ) + { + // let the PlayError() continue after this callback + iSchedulerWait->AsyncStop(); + } if ( iAsyncRequest && iAsyncRequest->iType == ERadioServSetFrequencyRange ) { if ( aError == KErrNone ) @@ -639,6 +648,14 @@ CompleteAsyncRequest(aError); } } + else + { + if( aError == KRadioServErrDuplicateRequest ) + { + // tuner off and duplicate request going on, trace it out + RADIO_RDEBUG(_L("[RADIO-SVR] TunerOffComplete() - EStateTunerOff - KRadioServErrDuplicateRequest")); + } + } break; default: // should never happen @@ -1387,7 +1404,7 @@ iDevSound->SetVolume(iSettings->Volume()); iSquelch = EFalse; } - CompleteAsyncRequest(KRadioServErrTuning); + // do not yet complete async request with KRadioServErrTuning } // We are being pre-empted by another application with higher priority. @@ -1395,8 +1412,18 @@ iState = EStateTunerOff; iPreEmpted = ETrue; iSettings->SetRadioOff(aError); - iTunerControl->TunerOff(); + iTunerControl->TunerOff(); //The adaptation is expected to call TunerOffComplete() upon completion + // wait for TunerOffComplete callback + iSchedulerWait->Start(); SetTspTargetClient( ERsPlayerIdle ); + + if ( iAsyncRequest && ( (iAsyncRequest->iType == ERadioServStationSeek) || + (iAsyncRequest->iType == ERadioServStationSeekByPTY) || + (iAsyncRequest->iType == ERadioServStationSeekByTA) || + (iAsyncRequest->iType == ERadioServStationSeekByTP) ) ) + { + CompleteAsyncRequest(KRadioServErrTuning); + } } } diff -r 4f62049db6ac -r 709f89d8c047 mmserv/radioutility/radioserver/Server/Src/RadioServer.h --- a/mmserv/radioutility/radioserver/Server/Src/RadioServer.h Fri Feb 19 23:19:48 2010 +0200 +++ b/mmserv/radioutility/radioserver/Server/Src/RadioServer.h Fri Mar 12 15:45:41 2010 +0200 @@ -727,6 +727,8 @@ TInt iRdsNotifyCount; // Array to keep track of clients requesting to be notified of RDS Data RArray iRdsNotifyClientIdArray; + // Wait logic implementation towards adaptation + CActiveSchedulerWait* iSchedulerWait; #ifdef RD_TSP_CLIENT_MAPPER // Process Id of the client diff -r 4f62049db6ac -r 709f89d8c047 mmserv/thumbnailengine/ImaamiSrc/DCDigitalZoom.cpp --- a/mmserv/thumbnailengine/ImaamiSrc/DCDigitalZoom.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmserv/thumbnailengine/ImaamiSrc/DCDigitalZoom.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -207,6 +207,16 @@ TInt allShiftX, TInt allShiftY, TInt newShiftX, TInt newShiftY) { + // We don't waste time if request ZOOM 1x without Pan + if(aZoomX==1 && aZoomY==1) + { + if(allShiftX==0 && allShiftY==0 && newShiftX ==0 && newShiftX == 0) + { + TInt handle = aOriPtr->Handle(); + aOutPtr->Duplicate(handle); + return; + } + } TInt32 divider, xPos, yPos, tmpline, @@ -571,7 +581,7 @@ yEndRem = (TUint32)(tmpEnd & REMAINDER); //Read a new line from the source image if needed - while (yEndInt > LastLine && LastLine < aOriSizeY-1) + while (yEndInt > LastLine && LastLine < aOriSizeY) { LastLine++; tmpline = lines[0]; @@ -696,7 +706,7 @@ { // Line number if(yStaInt < 0) outFlag = 1; - else if(yStaInt >= aOriSizeY) outFlag = 1; + else if(yStaInt > aOriSizeY) outFlag = 1; else { // Initialise line result @@ -735,11 +745,10 @@ } // Last pixel in first line - if(xEndWei != 0) + if(xEndWei != 0 && xEndInt < aOriSizeX) { // Column number if(xEndInt < 0) outFlag = 1; - else if(xEndInt >= aOriSizeX) outFlag = 1; else { // Pixel weighting to line result @@ -762,7 +771,7 @@ { // Line number if(j < 0) outFlag = 1; - else if(j >= aOriSizeY) outFlag = 1; + else if(j > aOriSizeY) outFlag = 1; else { // Initialise line result @@ -801,11 +810,10 @@ } // Last pixel in middle lines - if(xEndWei != 0) + if(xEndWei != 0 && xEndInt < aOriSizeX) { // Column number if(xEndInt < 0) outFlag = 1; - else if(xEndInt >= aOriSizeX) outFlag = 1; else { // Pixel weighting to line result @@ -829,7 +837,7 @@ { // Line number if(yEndInt < 0) outFlag = 1; - else if(yEndInt >= aOriSizeY) outFlag = 1; + else if(yEndInt > aOriSizeY) outFlag = 1; else { // Initialise line result @@ -866,11 +874,10 @@ } // Last pixel in last line - if(xEndWei != 0) + if(xEndWei != 0 && xEndInt < aOriSizeX) { // Column number if(xEndInt < 0) outFlag = 1; - else if(xEndInt >= aOriSizeX) outFlag = 1; else { tmpB = (TInt)(tmpB + (*(linePtrs[lines[LineNum]] + 3 * xEndInt )) * xEndWei); diff -r 4f62049db6ac -r 709f89d8c047 mmserv/tms/tmsproxy/src/tmsqueuehandler.cpp --- a/mmserv/tms/tmsproxy/src/tmsqueuehandler.cpp Fri Feb 19 23:19:48 2010 +0200 +++ b/mmserv/tms/tmsproxy/src/tmsqueuehandler.cpp Fri Mar 12 15:45:41 2010 +0200 @@ -180,14 +180,6 @@ case ECmdGlobalEffectChange: iObserver->QueueEvent(msgBuf.iInt, msgBuf.iStatus, NULL); break; - case ECmdRingToneOpenComplete: - iObserver->QueueEvent(TMS_EVENT_RINGTONE_OPEN_COMPLETE, - msgBuf.iStatus, &msgBuf.iInt64); - break; - case ECmdRingTonePlayComplete: - iObserver->QueueEvent(TMS_EVENT_RINGTONE_PLAY_COMPLETE, - msgBuf.iStatus, NULL); - break; case ECmdGlobalRoutingChange: iObserver->QueueEvent(msgBuf.iInt, msgBuf.iStatus, &msgBuf.iUint);