# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284492093 -10800 # Node ID 999b2818a0eb7cbce7e303a62cfc0d3311d08930 # Parent 0ac9a5310753613f7f55b483cf85803e12ffe837 Revision: 201033 Kit: 201035 diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/Group/3gpDataSourceAdapter.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/Group/3gpDataSourceAdapter.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/Group/3gpDataSourceAdapter.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -49,7 +49,7 @@ LIBRARY ecom.lib -LIBRARY 3GPMP4Lib.lib +LIBRARY 3gpmp4lib.lib LIBRARY efsrv.lib // File server session LIBRARY bafl.lib // Resource file LIBRARY caf.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Group/3GPAudioPlayControllerPlugin.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Group/3GPAudioPlayControllerPlugin.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Group/3GPAudioPlayControllerPlugin.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -134,15 +134,15 @@ LIBRARY AdvancedAudioController.lib LIBRARY DevSoundAudioOutput.lib LIBRARY FileAudioOutput.lib -LIBRARY 3GPMP4Lib.lib +LIBRARY 3gpmp4lib.lib LIBRARY efsrv.lib // File server session LIBRARY bafl.lib // Resource file -LIBRARY MMFDevSound.lib +LIBRARY mmfdevsound.lib LIBRARY caf.lib LIBRARY cafutils.lib LIBRARY 3gpDataSourceAdapter.lib LIBRARY FrameTable.lib // for CFrameTable -LIBRARY EAacPlusAudioControllerUtility.lib +LIBRARY EAACPlusAudioControllerUtility.lib LIBRARY AMRAudioControllerUtility.lib LIBRARY AWBAudioControllerUtility.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Group/3GPAudioPlayControllerRecognizer.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Group/3GPAudioPlayControllerRecognizer.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Group/3GPAudioPlayControllerRecognizer.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -47,5 +47,5 @@ LIBRARY euser.lib LIBRARY apmime.lib LIBRARY efsrv.lib -LIBRARY 3GPMP4Lib.lib +LIBRARY 3gpmp4lib.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Group/3GPAudioRecordControllerPlugin.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Group/3GPAudioRecordControllerPlugin.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Group/3GPAudioRecordControllerPlugin.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -76,10 +76,10 @@ LIBRARY mmfserverbaseclasses.lib LIBRARY AdvancedAudioController.lib LIBRARY DevSoundAudioInput.lib -LIBRARY 3GPMP4Lib.lib +LIBRARY 3gpmp4lib.lib LIBRARY efsrv.lib // File server session LIBRARY bafl.lib // Resource file -LIBRARY MMFDevSound.lib +LIBRARY mmfdevsound.lib // for MP4MetaDataWrite LIBRARY MetaDataWrite.lib // for MMetaDataWriteCustomCommandImplementor diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Group/AdvancedAudioController.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Group/AdvancedAudioController.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Group/AdvancedAudioController.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -61,7 +61,7 @@ LIBRARY sysutil.lib LIBRARY mmfdevsound.lib LIBRARY mmfstandardcustomcommands.lib -LIBRARY custominterfacebuilder.lib +LIBRARY CustomInterfaceBuilder.lib LIBRARY MetaDataUtility.lib LIBRARY AudioOutputRouting.lib LIBRARY DrmDcf.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioControllerUtility/Group/EAACPlusAudioControllerUtility.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioControllerUtility/Group/EAACPlusAudioControllerUtility.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioControllerUtility/Group/EAACPlusAudioControllerUtility.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -46,5 +46,5 @@ LIBRARY mmfserverbaseclasses.lib #ifdef EABI -LIBRARY ECOM.LIB +LIBRARY ecom.lib #endif diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioInput/Group/DevSoundAudioInput.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioInput/Group/DevSoundAudioInput.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioInput/Group/DevSoundAudioInput.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -46,5 +46,5 @@ LIBRARY mmfdevsound.lib #ifdef EABI // modified by BuildTeam -LIBRARY ECOM.LIB +LIBRARY ecom.lib #endif diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioOutput/Group/DevSoundAudioOutput.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioOutput/Group/DevSoundAudioOutput.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioOutput/Group/DevSoundAudioOutput.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -49,5 +49,5 @@ LIBRARY DataSourceAdapter.lib #ifdef EABI // modified by BuildTeam -LIBRARY ECOM.LIB +LIBRARY ecom.lib #endif diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/FileAudioOutput/Group/FileAudioOutput.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/FileAudioOutput/Group/FileAudioOutput.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/FileAudioOutput/Group/FileAudioOutput.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -44,5 +44,5 @@ LIBRARY mmfcontrollerframework.lib LIBRARY mmfserverbaseclasses.lib #ifdef EABI -LIBRARY ECOM.LIB +LIBRARY ecom.lib #endif diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/MetaDataWrite/Group/MetaDataWrite.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/MetaDataWrite/Group/MetaDataWrite.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/MetaDataWrite/Group/MetaDataWrite.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -39,4 +39,4 @@ LIBRARY euser.lib LIBRARY mediaclientaudio.lib -LIBRARY MMFControllerFramework.lib +LIBRARY mmfcontrollerframework.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/PlaylistRecognizer/group/playlistrecognizer.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/PlaylistRecognizer/group/playlistrecognizer.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/PlaylistRecognizer/group/playlistrecognizer.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: bh1mmcf#4 % +// Version : %version: 5 % @@ -42,7 +42,7 @@ LIBRARY euser.lib LIBRARY apmime.lib -LIBRARY EFSRV.LIB +LIBRARY efsrv.lib LIBRARY playbackhelper.lib #ifdef __WINDOWS_MEDIA diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Group/AACAudioPlayControllerPlugin.mmp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Group/AACAudioPlayControllerPlugin.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Group/AACAudioPlayControllerPlugin.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -85,7 +85,7 @@ LIBRARY DevSoundAudioOutput.lib LIBRARY FileAudioOutput.lib LIBRARY bafl.lib // Resource file -LIBRARY MMFDevSound.lib +LIBRARY mmfdevsound.lib LIBRARY efsrv.lib LIBRARY FrameTable.lib // for CFrameTable @@ -94,20 +94,20 @@ #ifndef __AAC_PLUS_DECODER_PLUGIN // only EAACPlusAudioControllerUtility support AAC optimization // LIBRARY AACAudioControllerUtility.lib - LIBRARY EAacPlusAudioControllerUtility.lib + LIBRARY EAACPlusAudioControllerUtility.lib LIBRARY AacDecoderConfig.lib #else - LIBRARY EAacPlusAudioControllerUtility.lib + LIBRARY EAACPlusAudioControllerUtility.lib LIBRARY EAacPlusDecoderIntfc.lib // LIBRARY EAacPlusFrameParser.lib LIBRARY EAacPlusUtil.lib #endif #else - LIBRARY EAacPlusAudioControllerUtility.lib + LIBRARY EAACPlusAudioControllerUtility.lib LIBRARY AacDecoderConfig.lib #endif #else - LIBRARY EAacPlusAudioControllerUtility.lib + LIBRARY EAACPlusAudioControllerUtility.lib LIBRARY AacDecoderConfig.lib #endif diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Src/AACAudioPlayControllerHwDecoder.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Src/AACAudioPlayControllerHwDecoder.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Src/AACAudioPlayControllerHwDecoder.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDE FILES #include "AACAudioPlayControllerDecoder.h" #include "DebugMacros.h" -#include +#include #include diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Src/MP3AudioPlayControllerHwDecoder.cpp --- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Src/MP3AudioPlayControllerHwDecoder.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Src/MP3AudioPlayControllerHwDecoder.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -22,7 +22,7 @@ #include "MP3AudioPlayControllerDecoder.h" #include "DebugMacros.h" #include -#include +#include const TUint KRawMp3MaxFrameSize = 1441; const TUint KSizeOfInBuffer = 2*KRawMp3MaxFrameSize; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/ringtonerecognizer/group/recrt.mmp --- a/mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/ringtonerecognizer/group/recrt.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/ringtonerecognizer/group/recrt.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -36,7 +36,7 @@ SOURCE recrt.cpp -LIBRARY EUSER.LIB -LIBRARY APMIME.LIB +LIBRARY euser.lib +LIBRARY apmime.lib // End of File diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/group/AudioPlaybackTestModule.mmp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/group/AudioPlaybackTestModule.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/group/AudioPlaybackTestModule.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -66,7 +66,7 @@ //LIBRARY logger.lib LIBRARY efsrv.lib LIBRARY MediaClientAudio.lib -LIBRARY MMFControllerFramework.lib +LIBRARY mmfcontrollerframework.lib LIBRARY ecom.lib LIBRARY mmcommon.lib //LIBRARY estor.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/conf/AudioRecorderTestModule.cfg --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/conf/AudioRecorderTestModule.cfg Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/conf/AudioRecorderTestModule.cfg Tue Sep 14 22:21:33 2010 +0300 @@ -15,7 +15,7 @@ Id 205 Title AudioRecord.2 - RecordClip - amr ErrorRange 5 000 000 -File e:\testing\data\record\RecAMRTest.AMR +File c:\data\RecAMRTest.AMR RecTime 15 000 000 [End_TestCase] @@ -23,7 +23,7 @@ #[TestCase] #Id 206 #Title AudioRecord.3 - SetMaxWriteLength - amr -#File e:\testing\data\record\SizeTest.amr +#File c:\data\SizeTest.amr #MaxLength 5000 #ErrorRange 2000 #[End_TestCase] @@ -43,7 +43,7 @@ [TestCase] Id 209 Title AudioRecord.5 - SetGain - amr -File e:\testing\data\record\GainTest.amr +File c:\data\GainTest.amr RecTime 15 0 0 RelativeGain 50 [End_TestCase] @@ -51,7 +51,7 @@ [TestCase] Id 209 Title AudioRecord.6 - SetGain - amr -File e:\testing\data\record\GainTest.amr +File c:\data\GainTest.amr RecTime 15 0 0 RelativeGain 12 [End_TestCase] @@ -59,7 +59,7 @@ [TestCase] Id 212 Title AudioRecord.7 - RecordBalance - amr -File e:\testing\data\record\BalanceTest.amr +File c:\data\BalanceTest.amr RecTime 7 0 0 Balance 0 [End_TestCase] @@ -127,7 +127,7 @@ [TestCase] Id 221 Title AudioRecord.15 - BitRate 4750 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 4750 [End_TestCase] @@ -135,7 +135,7 @@ [TestCase] Id 221 Title AudioRecord.16 - BitRate 5150 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 5150 [End_TestCase] @@ -143,7 +143,7 @@ [TestCase] Id 221 Title AudioRecord.17 - BitRate 5900 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 5900 [End_TestCase] @@ -151,7 +151,7 @@ [TestCase] Id 221 Title AudioRecord.18 - BitRate 6700 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 6700 [End_TestCase] @@ -159,7 +159,7 @@ [TestCase] Id 221 Title AudioRecord.19 - BitRate 7400 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 7400 [End_TestCase] @@ -167,7 +167,7 @@ [TestCase] Id 221 Title AudioRecord.20 - BitRate 7950 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 7950 [End_TestCase] @@ -175,7 +175,7 @@ [TestCase] Id 221 Title AudioRecord.21 - BitRate 10200 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 10200 [End_TestCase] @@ -183,7 +183,7 @@ [TestCase] Id 221 Title AudioRecord.22 - BitRate 12200 - amr -File e:\testing\data\record\TestBitRate.amr +File c:\data\TestBitRate.amr RecTime 15 0 0 BitRate 12200 [End_TestCase] @@ -191,15 +191,15 @@ #[TestCase] #Id 223 #Title AudioRecord.23 - DataType amr - amr -#File e:\testing\data\record\testDataType.amr +#File c:\data\testDataType.amr #[End_TestCase] [TestCase] Id 211 Title AudioRecord.24 - SetPriority - amr -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 +File c:\data\PriorityTest1-.amr 5 0 6 0 0 +File c:\data\PriorityTest2-.amr 3 1 2 0 0 +File c:\data\PriorityTest3-.amr 8 0 11 0 0 RecTime 3 0 0 [End_TestCase] @@ -220,7 +220,7 @@ Id 205 Title AudioRecord.26 - RecordClip - wav ErrorRange 5 000 000 -File e:\testing\data\record\RecWAVTest.wav +File c:\data\RecWAVTest.wav RecTime 15 000 000 [End_TestCase] @@ -228,7 +228,7 @@ [TestCase] Id 206 Title AudioRecord.27 - SetMaxWriteLength - WAV -File e:\testing\data\record\SizeTest.wav +File c:\data\SizeTest.wav MaxLength 5000 ErrorRange 2000 [End_TestCase] @@ -248,7 +248,7 @@ [TestCase] Id 209 Title AudioRecord.29 - SetGain - WAV -File e:\testing\data\record\GainTest.wav +File c:\data\GainTest.wav RecTime 15 0 0 RelativeGain 50 [End_TestCase] @@ -256,7 +256,7 @@ [TestCase] Id 209 Title AudioRecord.30 - SetGain - WAV -File e:\testing\data\record\GainTest.wav +File c:\data\GainTest.wav RecTime 15 0 0 RelativeGain 12 [End_TestCase] @@ -265,7 +265,7 @@ [TestCase] Id 209 Title AudioRecord.31 - SetGain beyond max Gain - wav -File e:\testing\data\record\GainTest.wav +File c:\data\GainTest.wav RecTime 15 0 0 RelativeGain 110 [End_TestCase] @@ -273,7 +273,7 @@ [TestCase] Id 211 Title AudioRecord.32 - PriorityRecordClip1 - WAV -File e:\testing\data\record\PriorityTest1-.wav 5 0 5 0 0 +File c:\data\PriorityTest1-.wav 5 0 5 0 0 RecTime 3 0 0 [End_TestCase] @@ -281,7 +281,7 @@ [TestCase] Id 211 Title AudioRecord.33 - PriorityRecordClip2 - WAV -File e:\testing\data\record\PriorityTest2-.wav 3 1 3 0 0 +File c:\data\PriorityTest2-.wav 3 1 3 0 0 RecTime 3 0 0 [End_TestCase] @@ -289,14 +289,14 @@ [TestCase] Id 211 Title AudioRecord.34 - PriorityRecordClip3 - WAV -File e:\testing\data\record\PriorityTest3-.wav 8 0 10 0 0 +File c:\data\PriorityTest3-.wav 8 0 10 0 0 RecTime 3 0 0 [End_TestCase] [TestCase] Id 212 Title AudioRecord.35 - RecordBalance center- WAV -File e:\testing\data\record\BalanceTest.wav +File c:\data\BalanceTest.wav RecTime 7 0 0 Balance 0 [End_TestCase] @@ -304,7 +304,7 @@ [TestCase] Id 212 Title AudioRecord.36 - RecordBalance max right- WAV -File e:\testing\data\record\BalanceTest.wav +File c:\data\BalanceTest.wav RecTime 7 0 0 Balance 100 [End_TestCase] @@ -312,7 +312,7 @@ [TestCase] Id 212 Title AudioRecord.37 - RecordBalance max left - WAV -File e:\testing\data\record\BalanceTest.wav +File c:\data\BalanceTest.wav RecTime 7 0 0 Balance -100 [End_TestCase] @@ -320,7 +320,7 @@ [TestCase] Id 212 Title AudioRecord.38 - RecordBalance right - WAV -File e:\testing\data\record\BalanceTest.wav +File c:\data\BalanceTest.wav RecTime 7 0 0 Balance 77 [End_TestCase] @@ -391,7 +391,7 @@ [TestCase] Id 222 Title AudioRecord.46 - 8000hz SampleRate wav -File e:\testing\data\record\testSR.wav +File c:\data\testSR.wav RecTime 15 0 0 SampleRate 8000 [End_TestCase] @@ -399,7 +399,7 @@ [TestCase] Id 222 Title AudioRecord.47 - 16000hz SampleRate wav -File e:\testing\data\record\testSR.wav +File c:\data\testSR.wav RecTime 15 0 0 SampleRate 16000 [End_TestCase] @@ -408,7 +408,7 @@ [TestCase] Id 222 Title AudioRecord.48 - 32000hz SampleRate wav -File e:\testing\data\record\testSR.wav +File c:\data\testSR.wav RecTime 15 0 0 SampleRate 32000 [End_TestCase] @@ -417,7 +417,7 @@ #[TestCase] #Id 223 #Title AudioRecord.49 - DataType wav -#File e:\testing\data\record\testDataType.wav +#File c:\data\testDataType.wav #[End_TestCase] @@ -426,7 +426,7 @@ Id 224 Title AudioRecord.50 - DataFormat WAV ErrorRange 0 0 0 -File e:\testing\data\record\testDataFormat.wav +File c:\data\testDataFormat.wav DataFormat wav [End_TestCase] @@ -434,7 +434,7 @@ [TestCase] Id 225 Title AudioRecord.51 - test steror Channel for wav -File e:\testing\data\record\testChannel.wav +File c:\data\testChannel.wav RecTime 15 0 0 Channels 2 [End_TestCase] @@ -442,7 +442,7 @@ [TestCase] Id 225 Title AudioRecord.52 - test mono Channel for wav -File e:\testing\data\record\testChannel.wav +File c:\data\testChannel.wav RecTime 15 0 0 Channels 1 [End_TestCase] @@ -465,7 +465,7 @@ Id 205 Title AudioRecord.54 - RecordClip - MP4 ErrorRange 5 000 000 -File e:\testing\data\record\RecMP4Test.MP4 +File c:\data\RecMP4Test.MP4 RecTime 15 000 000 BitRate 32000 Channels 1 @@ -487,7 +487,7 @@ [TestCase] Id 209 Title AudioRecord.56 - SetGain - Mp4 -File e:\testing\data\record\GainTest.mp4 +File c:\data\GainTest.mp4 RecTime 15 0 0 RelativeGain 50 BitRate 32000 @@ -499,7 +499,7 @@ [TestCase] Id 209 Title AudioRecord.57 - SetGain - Mp4 -File e:\testing\data\record\GainTest.mp4 +File c:\data\GainTest.mp4 RecTime 15 0 0 RelativeGain 12 BitRate 32000 @@ -512,7 +512,7 @@ [TestCase] Id 209 Title AudioRecord.58 - SetGain beyond max Gain - Mp4 -File e:\testing\data\record\GainTest.mp4 +File c:\data\GainTest.mp4 RecTime 15 0 0 RelativeGain 110 BitRate 32000 @@ -526,7 +526,7 @@ [TestCase] Id 212 Title AudioRecord.59 - RecordBalance center- Mp4 -File e:\testing\data\record\BalanceTest.mp4 +File c:\data\BalanceTest.mp4 RecTime 7 0 0 Balance 0 BitRate 32000 @@ -590,7 +590,7 @@ [TestCase] Id 221 Title AudioRecord.66 - BitRate - Mp4 -File e:\testing\data\record\TestBitRate.mp4 +File c:\data\TestBitRate.mp4 RecTime 15 0 0 DataFormat mp4 [End_TestCase] @@ -598,7 +598,7 @@ [TestCase] Id 222 Title AudioRecord.67 - 8000hz SampleRate Mp4 -File e:\testing\data\record\testSR.mp4 +File c:\data\testSR.mp4 RecTime 15 0 0 SampleRate 8000 [End_TestCase] @@ -606,7 +606,7 @@ [TestCase] Id 222 Title AudioRecord.68 - 16000hz SampleRate Mp4 -File e:\testing\data\record\testSR.mp4 +File c:\data\testSR.mp4 RecTime 15 0 0 SampleRate 16000 [End_TestCase] @@ -615,7 +615,7 @@ [TestCase] Id 222 Title AudioRecord.69 - 32000hz SampleRate Mp4 -File e:\testing\data\record\testSR.mp4 +File c:\data\testSR.mp4 RecTime 15 0 0 SampleRate 32000 [End_TestCase] @@ -624,14 +624,14 @@ #[TestCase] #Id 223 #Title AudioRecord.70 - DataType mp4 -#File e:\testing\data\record\testDataType.mp4 +#File c:\data\testDataType.mp4 #[End_TestCase] [TestCase] Id 225 Title AudioRecord.71 - test steror Channel for mp4 -File e:\testing\data\record\testChannel.mp4 +File c:\data\testChannel.mp4 RecTime 15 0 0 Channels 2 [End_TestCase] @@ -639,7 +639,7 @@ [TestCase] Id 225 Title AudioRecord.72 - test mono Channel for mp4 -File e:\testing\data\record\testChannel.mp4 +File c:\data\testChannel.mp4 RecTime 15 0 0 Channels 1 [End_TestCase] @@ -648,7 +648,7 @@ [TestCase] Id 211 Title AudioRecord.73 - PriorityRecordClip1 - Mp4 -File e:\testing\data\record\PriorityTest1-.mp4 5 0 5 0 0 +File c:\data\PriorityTest1-.mp4 5 0 5 0 0 RecTime 3 0 0 BitRate 32000 Channels 2 @@ -659,7 +659,7 @@ [TestCase] Id 211 Title AudioRecord.74 - PriorityRecordClip2 - Mp4 -File e:\testing\data\record\PriorityTest2-.mp4 3 1 3 0 0 +File c:\data\PriorityTest2-.mp4 3 1 3 0 0 RecTime 3 0 0 BitRate 32000 Channels 2 @@ -671,7 +671,7 @@ [TestCase] Id 211 Title AudioRecord.75 - PriorityRecordClip3 - Mp4 -File e:\testing\data\record\PriorityTest3-.mp4 8 0 10 0 0 +File c:\data\PriorityTest3-.mp4 8 0 10 0 0 RecTime 3 0 0 BitRate 32000 Channels 2 @@ -727,7 +727,7 @@ Id 219 Title Plugin.REC.28 - CropL from middle ErrorRange 2 0 0 -File e:\testing\data\record\CropTest.amr +File c:\data\CropTest.amr RecTime 10 0 0 RelativePos 50 [End_TestCase] @@ -736,7 +736,7 @@ Id 219 Title Plugin.REC.36 - CropFromBeginningL from middle ErrorRange 2 0 0 -File e:\testing\data\record\CropTest.wav +File c:\data\CropTest.wav RecTime 10 0 0 FromBegining 0 RelativePos 50 @@ -846,7 +846,7 @@ [End_TestCase] -//not working??? +//Fails on Udeb logs enabled image, .Need to test on clean fix image [TestCase] Id 201 Title AudioRecord.87 - RecordFormats right - amr diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/AudioResourceNotification.h --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/AudioResourceNotification.h Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/AudioResourceNotification.h Tue Sep 14 22:21:33 2010 +0300 @@ -54,6 +54,7 @@ CMdaAudioRecorderUtility* recorder; void ConstructL(TFileName* fileName); + TInt iCallBackErr; }; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/CustomCommand.h --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/CustomCommand.h Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/CustomCommand.h Tue Sep 14 22:21:33 2010 +0300 @@ -54,6 +54,7 @@ CMdaAudioRecorderUtility* recorder; void ConstructL(TFileName* fileName); + TInt iCallBackErr; }; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/CustomCommandAsync.h --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/CustomCommandAsync.h Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/CustomCommandAsync.h Tue Sep 14 22:21:33 2010 +0300 @@ -54,6 +54,7 @@ CMdaAudioRecorderUtility* recorder; void ConstructL(TFileName* fileName); + TInt iCallBackErr; }; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordFormats.h --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordFormats.h Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/RecordFormats.h Tue Sep 14 22:21:33 2010 +0300 @@ -46,6 +46,7 @@ private: void ConstructL(TFileName* fileName); + TInt iCallBackErr; }; #endif // !defined(AFX_RECORDFORMATS_H__3EDE1ACC_939F_49BE_B0B1_55C01807632D__INCLUDED_) diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/ThreadPriority.h --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/ThreadPriority.h Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/inc/ThreadPriority.h Tue Sep 14 22:21:33 2010 +0300 @@ -46,6 +46,8 @@ CMdaAudioRecorderUtility* recorder; void ConstructL(TFileName* fileName); + + TInt iCallbackErr; }; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioLoadingProgress.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioLoadingProgress.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioLoadingProgress.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -142,9 +142,15 @@ #ifdef _DEBUG RDebug::Print (_L ("CAudioLoadingProgress::MoscoStateChangeEvent")); #endif - TInt err = KErrNone; - callbackErr = KErrNone; + + callbackErr = aErrorCode; + if (aErrorCode != KErrNone) + { + + CActiveScheduler::Stop(); + + } logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); TInt aState = recorder->State(); diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioResourceNotification.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioResourceNotification.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/AudioResourceNotification.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -28,6 +28,7 @@ { console = aConsole; logger = aLogger; + iCallBackErr = KErrNone; } @@ -107,7 +108,10 @@ CleanupStack::PushL(selfObj); CActiveScheduler::Start(); - + if(selfObj->iCallBackErr != KErrNone) + { + error = selfObj->iCallBackErr; + } CleanupStack::PopAndDestroy(2); // schedule, selfObj @@ -141,7 +145,7 @@ logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); - + iCallBackErr = aErrorCode; if (recorder && aErrorCode == KErrNone && aCurrentState == CMdaAudioClipUtility::EOpen && aPreviousState == 0) { @@ -205,9 +209,15 @@ recorder->WillResumePlay(); CActiveScheduler::Stop(); + return; } - - return; + if (aErrorCode != KErrNone) + { + + CActiveScheduler::Stop(); + return; + } + } @@ -222,7 +232,7 @@ } -void CAudioResourceNotification::MarncResourceAvailable(TUid aNotificationEventId, const TDesC8 &aNotificationData) +void CAudioResourceNotification::MarncResourceAvailable(TUid /*aNotificationEventId*/, const TDesC8 &/*aNotificationData*/) { logger->Log(_L("MarncResourceAvailable ")); } diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CropFromBeginning.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CropFromBeginning.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CropFromBeginning.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -107,7 +107,7 @@ CActiveScheduler::Start(); - if (error == KErrNone) + if (selfObj->callbackErr != KErrNone) { error = selfObj->callbackErr; } @@ -140,8 +140,8 @@ #ifdef _DEBUG RDebug::Print (_L ("CCropFromBeginning::MoscoStateChangeEvent")); #endif - TInt err = KErrNone; -// callbackErr = KErrNone; + + callbackErr = aErrorCode; logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); @@ -185,6 +185,12 @@ CActiveScheduler::Stop(); } + if (aErrorCode != KErrNone) + { + + CActiveScheduler::Stop(); + + } return; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CustomCommand.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CustomCommand.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CustomCommand.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -28,7 +28,7 @@ { console = aConsole; logger = aLogger; - + iCallBackErr = KErrNone; } CCustomCommand::~CCustomCommand() @@ -107,8 +107,12 @@ CleanupStack::PushL(selfObj); CActiveScheduler::Start(); - - + + if(selfObj->iCallBackErr != KErrNone) + { + error = selfObj->iCallBackErr; + } + CleanupStack::PopAndDestroy(2); // schedule, selfObj return error; @@ -137,13 +141,16 @@ #ifdef _DEBUG RDebug::Print (_L ("CCustomCommand::MoscoStateChangeEvent")); #endif - TInt err = KErrNone; + logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); - + + iCallBackErr = aErrorCode; + TUint bitRate = recorder->SourceBitRateL(); logger->Log(_L("SourceBitRateL %d "),bitRate); - + + if (recorder && aErrorCode == KErrNone && aCurrentState == CMdaAudioClipUtility::EOpen && aPreviousState == 0) { @@ -237,6 +244,12 @@ recorder->WillResumePlay(); CActiveScheduler::Stop(); } + if(aErrorCode != KErrNone) + { + + CActiveScheduler::Stop(); + + } return; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CustomCommandAsync.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CustomCommandAsync.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/CustomCommandAsync.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -28,6 +28,7 @@ { console = aConsole; logger = aLogger; + iCallBackErr = KErrNone; } @@ -108,7 +109,10 @@ CActiveScheduler::Start(); - + if(selfObj->iCallBackErr != KErrNone) + { + error = selfObj->iCallBackErr; + } CleanupStack::PopAndDestroy(2); // schedule, selfObj return error; @@ -137,12 +141,11 @@ #ifdef _DEBUG RDebug::Print (_L ("CCustomCommandAsync::MoscoStateChangeEvent")); #endif - TInt err = KErrNone; + logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); - - + iCallBackErr = aErrorCode; if (recorder && aErrorCode == KErrNone && aCurrentState == CMdaAudioClipUtility::EOpen && aPreviousState == 0) { TBuf8<25> dataFrom; @@ -204,6 +207,12 @@ CActiveScheduler::Stop(); } + if (aErrorCode != KErrNone) + { + + CActiveScheduler::Stop(); + + } return; } diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/MetaDataEntry.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/MetaDataEntry.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/MetaDataEntry.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -109,7 +109,7 @@ CActiveScheduler::Start(); - if (error == KErrNone) + if (selfObj->callbackErr != KErrNone) { error = selfObj->callbackErr; } @@ -143,13 +143,12 @@ RDebug::Print (_L ("CMetaDataEntry::MoscoStateChangeEvent")); #endif TInt err = KErrNone; -// callbackErr = KErrNone; + callbackErr = aErrorCode; RArray dataTypes; logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); - - + if (recorder && aErrorCode == KErrNone && aCurrentState == CMdaAudioClipUtility::EOpen && aPreviousState == 0) { // Initialize @@ -269,6 +268,13 @@ logger->Log(_L("before stop....-")); CActiveScheduler::Stop(); } + if (aErrorCode != KErrNone) + { + + CActiveScheduler::Stop(); + + } + return; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayBalance.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayBalance.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayBalance.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -225,6 +225,11 @@ CActiveScheduler::Stop(); } + if (aErrorCode != KErrNone) + { + expectedBalance = 0; + CActiveScheduler::Stop(); + } return; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayRamp.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayRamp.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayRamp.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -201,6 +201,13 @@ logger->Log(_L("MoscoStateChangeEvent GetVolume after play: %d "),expectedVol); CActiveScheduler::Stop(); } + + if (aErrorCode != KErrNone) + { + expectedVol = 0; + CActiveScheduler::Stop(); + + } return; } diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayVolume.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayVolume.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayVolume.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -115,8 +115,14 @@ this->volume = volume; logger->Log(_L("MoscoStateChangeEvent getVolume: %d "),volume); CActiveScheduler::Stop(); + return; } - return; + if (aErrorCode != KErrNone) + { + CActiveScheduler::Stop(); + return; + } + } diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayWindow.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayWindow.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/PlayWindow.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -227,6 +227,10 @@ CActiveScheduler::Stop(); } + if (aErrorCode != KErrNone) + { + CActiveScheduler::Stop(); + } return; } diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordDataFormat.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordDataFormat.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordDataFormat.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -122,7 +122,7 @@ CActiveScheduler::Start(); - if (error == KErrNone) + if (selfObj->callbackErr != KErrNone) { error = selfObj->callbackErr; } @@ -160,7 +160,6 @@ if (recorder && aErrorCode == KErrNone && aCurrentState == CMdaAudioClipUtility::EOpen && aPreviousState == 0) { - if (dataFormat == KFormatWav) { logger->Log(_L("SetDestinationFormatL(KMmfUidFormatWAVWrite)")); @@ -174,13 +173,11 @@ CActiveScheduler::Stop(); return; } - if (recorder->DestinationFormatL() != id) { logger->Log(_L("Retrieved format is not same as set format") ); callbackErr = KErrOutOfRange; } - } else { @@ -209,6 +206,10 @@ }*/ } } + if (aErrorCode != KErrNone) + { + callbackErr = aErrorCode; + } CActiveScheduler::Stop(); return; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordDataType.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordDataType.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordDataType.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -107,7 +107,11 @@ CleanupStack::PushL(selfObj); CActiveScheduler::Start(); - + + if(selfObj->callbackErr != KErrNone) + { + error = selfObj->callbackErr; + } CleanupStack::PopAndDestroy(2); // schedule, selfObj @@ -137,8 +141,8 @@ #ifdef _DEBUG RDebug::Print (_L ("CRecordDataType::MoscoStateChangeEvent")); #endif - TInt err = KErrNone; - callbackErr = KErrNone; + + callbackErr = aErrorCode; RArray dataTypes; logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); @@ -207,7 +211,11 @@ CActiveScheduler::Stop(); } - + if (aErrorCode != KErrNone) + { + CActiveScheduler::Stop(); + + } return; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordFormats.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordFormats.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordFormats.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -29,6 +29,7 @@ { console = aConsole; logger = aLogger; + iCallBackErr = KErrNone; } CRecordFormats::~CRecordFormats() @@ -81,7 +82,8 @@ #endif logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); - + iCallBackErr = aErrorCode; + if (recorder && aErrorCode == KErrNone && aCurrentState == CMdaAudioClipUtility::EOpen) { TRAPD(err3, recorder->AudioRecorderControllerImplementationInformationL()); @@ -106,6 +108,7 @@ TInt CRecordFormats::RunTestL(CTestModuleIf* aConsole, CStifLogger *aLogger, CStifSectionParser* aParser, TInt* /*clipCounter*/) { + TInt error = KErrNone; aLogger->Log(_L("Creating scheduler")); CActiveScheduler* scheduler = new (ELeave) CActiveScheduler; @@ -136,8 +139,11 @@ CActiveScheduler::Start(); CleanupStack::PopAndDestroy(2); - - return KErrNone; + + if(selfObj->iCallBackErr != KErrNone) + error = selfObj->iCallBackErr; + + return error; } diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordOpen.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordOpen.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordOpen.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -259,7 +259,7 @@ //File with controller if (type == KOpenFile2) { - TInt aUid = 1; + //TInt aUid = 1; //TUid aRecordControllerUid = TUid::Uid(aUid); TUid aRecordControllerUid = KNullUid;//KUidInterfaceMMFController;//TUid::Uid(KMmfUidPluginInterfaceFormatDecode);//KMmfUidPluginInterfaceController;//{0x10203827}; //const TUid KUidBassBoostEffect = {0x10203827}; diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordingBase.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordingBase.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/RecordingBase.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -142,7 +142,8 @@ RDebug::Print (_L ("CRecordingBase::MoscoStateChangeEvent")); #endif - if (aErrorCode != KErrNone) + + logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"), aErrorCode,aPreviousState,aCurrentState); /* diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/ThreadPriority.cpp --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/ThreadPriority.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioRecorderTestModule/src/ThreadPriority.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -106,8 +106,10 @@ CleanupStack::PushL(selfObj); CActiveScheduler::Start(); - - + + if(selfObj->iCallbackErr != KErrNone) + error = selfObj->iCallbackErr; + CleanupStack::PopAndDestroy(2); // schedule, selfObj return error; @@ -136,10 +138,12 @@ #ifdef _DEBUG RDebug::Print (_L ("CThreadPriority::MoscoStateChangeEvent")); #endif - TInt err = KErrNone; + logger->Log(_L("MoscoStateChangeEvent called, error: %d prev: %d curr : %d"),aErrorCode,aPreviousState,aCurrentState); logger->Log(_L("Before Checking Duaration.")); +iCallbackErr = aErrorCode; + TTimeIntervalMicroSeconds aDuration, aRecordTime; TMMFDurationInfo clipDuration = recorder->Duration(aDuration); logger->Log(_L("Duaration is %d"), aDuration.Int64()); @@ -191,10 +195,17 @@ CActiveScheduler::Stop(); + return; } + if (aErrorCode != KErrNone) + { + + CActiveScheduler::Stop(); + return ; + } - return; + } diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/EmulatorRecordTestModule/AudioRecorderBAT.cfg --- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/EmulatorRecordTestModule/AudioRecorderBAT.cfg Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/EmulatorRecordTestModule/AudioRecorderBAT.cfg Tue Sep 14 22:21:33 2010 +0300 @@ -251,12 +251,13 @@ Title AudioRecord.85-1 - Open File/RFile/SFile/Desc with controller - amr ErrorRange 1 0 0 1 Desc2 c:\testing\data\amr\10s_AMR_NB_mode_0.amr 2 0 0 -[End_TestCase +[End_TestCase] +// This test case is not used temporarily because the value used is the local variable for testing //Open SourceFile/Desc -[TestCase] -Id 234 -Title AudioRecord.88 - Open Desc - amr -ErrorRange 1 0 0 -1 Desc c:\testing\data\amr\10s_AMR_NB_mode_0.amr 2 0 0 -[End_TestCase] \ No newline at end of file +//[TestCase] +//Id 234 +//Title AudioRecord.88 - Open Desc - amr +//ErrorRange 1 0 0 +//1 Desc c:\testing\data\amr\10s_AMR_NB_mode_0.amr 2 0 0 +//[End_TestCase] \ No newline at end of file diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/advancedaudiocontroller/wavplaycontrollerplugin/group/MmfAudioController.mmp --- a/mmfenh/advancedaudiocontroller/wavplaycontrollerplugin/group/MmfAudioController.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/advancedaudiocontroller/wavplaycontrollerplugin/group/MmfAudioController.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -49,7 +49,7 @@ LIBRARY mmfdevsound.lib LIBRARY mmfcontrollerframework.lib LIBRARY mmfstandardcustomcommands.lib -LIBRARY custominterfacebuilder.lib +LIBRARY CustomInterfaceBuilder.lib LIBRARY AudioOutputRouting.lib LIBRARY DrmDcf.lib LIBRARY ConfigurationComponentsFactory.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/audiooutputcontrolutility/AudioOutputControlUtilityProxy/Group/AudioOutputControlUtilityProxy.mmp --- a/mmfenh/audiooutputcontrolutility/AudioOutputControlUtilityProxy/Group/AudioOutputControlUtilityProxy.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/audiooutputcontrolutility/AudioOutputControlUtilityProxy/Group/AudioOutputControlUtilityProxy.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -37,7 +37,7 @@ SYSTEMINCLUDE /epoc32/include/mmf/common SYSTEMINCLUDE /epoc32/include/mmf/server -LIBRARY Euser.lib +LIBRARY euser.lib LIBRARY AudioOutputControlUtility.lib LIBRARY ConfigurationComponentsFactory.lib LIBRARY RestrictedAudioOutput.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/enhancedaudioplayerutility/AudioPlayer/group/S60AudioPlayer.mmp --- a/mmfenh/enhancedaudioplayerutility/AudioPlayer/group/S60AudioPlayer.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/enhancedaudioplayerutility/AudioPlayer/group/S60AudioPlayer.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -52,7 +52,7 @@ LIBRARY mmfcontrollerframework.lib LIBRARY mmfstandardcustomcommands.lib LIBRARY caf.lib -LIBRARY ECom.lib +LIBRARY ecom.lib LIBRARY S60AudioSource.lib LIBRARY S60AudioClientStreamSource.lib LIBRARY S60AudioUtility.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/enhancedaudioplayerutility/AudioStreaming/AudioClientStreamSource/group/S60AudioClientStreamSource.mmp --- a/mmfenh/enhancedaudioplayerutility/AudioStreaming/AudioClientStreamSource/group/S60AudioClientStreamSource.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/enhancedaudioplayerutility/AudioStreaming/AudioClientStreamSource/group/S60AudioClientStreamSource.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -50,5 +50,5 @@ LIBRARY efsrv.lib LIBRARY mmfcontrollerframework.lib LIBRARY mmfstandardcustomcommands.lib -LIBRARY ECom.lib +LIBRARY ecom.lib LIBRARY S60AudioSource.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmfenh/enhancedaudioplayerutility/S60AudioUtility/group/S60AudioUtility.mmp --- a/mmfenh/enhancedaudioplayerutility/S60AudioUtility/group/S60AudioUtility.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmfenh/enhancedaudioplayerutility/S60AudioUtility/group/S60AudioUtility.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -45,7 +45,7 @@ library euser.lib library efsrv.lib -library MmfControllerFramework.lib +library mmfcontrollerframework.lib library caf.lib library cafutils.lib library ecom.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmmw_plat/audio_metadata_reader_api/inc/MetaDataField.hrh --- a/mmmw_plat/audio_metadata_reader_api/inc/MetaDataField.hrh Wed Sep 01 12:23:00 2010 +0100 +++ b/mmmw_plat/audio_metadata_reader_api/inc/MetaDataField.hrh Tue Sep 14 22:21:33 2010 +0300 @@ -26,7 +26,7 @@ EUnknownMetaDataField = 0, EMetaDataSongTitle = 1, - EMetaDataArtist, + EMetaDataArtist, // the artist of the song EMetaDataAlbum, EMetaDataYear, EMetaDataComment, @@ -46,7 +46,8 @@ EMetaDataUnsyncLyrics, EMetaDataProtected, // get the Protected info, "0"=non protected, "1"=protected EMetaDataSampleRate, // Hz - EMetaDataBitRate // Bps + EMetaDataBitRate, // Bps + EMetaDataAlbumArtist // the artist of the album // More later... }; diff -r 0ac9a5310753 -r 999b2818a0eb mmmw_plat/audio_metadata_reader_api/tsrc/group/bld.inf --- a/mmmw_plat/audio_metadata_reader_api/tsrc/group/bld.inf Wed Sep 01 12:23:00 2010 +0100 +++ b/mmmw_plat/audio_metadata_reader_api/tsrc/group/bld.inf Tue Sep 14 22:21:33 2010 +0300 @@ -37,20 +37,20 @@ PRJ_TESTEXPORTS -..\init\TestFramework.ini \epoc32\winscw\c\testframework\TestFramework.ini +../init/TestFramework.ini /epoc32/winscw/c/testframework/TestFramework.ini -..\conf\MetaDataDisplay.cfg \epoc32\winscw\c\testframework\MetaDataDisplay.cfg +../conf/MetaDataDisplay.cfg /epoc32/winscw/c/testframework/MetaDataDisplay.cfg -..\data\mmc\GodRest.WMA \epoc32\winscw\c\testing\data\GodRest.WMA -..\data\mmc\DRM_NRTmeta.dcf \epoc32\winscw\c\testing\data\DRM_NRTmeta.dcf -..\data\mmc\DownUnder_remix.aac \epoc32\winscw\c\testing\data\DownUnder_remix.aac -..\data\mmc\JapJap.mp3 \epoc32\winscw\c\testing\data\JapJap.mp3 -..\data\mmc\JepJep.mp3 \epoc32\winscw\c\testing\data\JepJep.mp3 -..\data\mmc\JipJip.mp3 \epoc32\winscw\c\testing\data\JipJip.mp3 -..\data\mmc\MP3_MD.mp3 \epoc32\winscw\c\testing\data\MP3_MD.mp3 -..\data\mmc\test3gp.3gp \epoc32\winscw\c\testing\data\test3gp.3gp -..\data\mmc\testm4a.m4a \epoc32\winscw\c\testing\data\testm4a.m4a -..\data\mmc\testmp4.mp4 \epoc32\winscw\c\testing\data\testmp4.mp4 +../data/mmc/GodRest.WMA /epoc32/winscw/c/testing/data/GodRest.WMA +../data/mmc/DRM_NRTmeta.dcf /epoc32/winscw/c/testing/data/DRM_NRTmeta.dcf +../data/mmc/DownUnder_remix.aac /epoc32/winscw/c/testing/data/DownUnder_remix.aac +../data/mmc/JapJap.mp3 /epoc32/winscw/c/testing/data/JapJap.mp3 +../data/mmc/JepJep.mp3 /epoc32/winscw/c/testing/data/JepJep.mp3 +../data/mmc/JipJip.mp3 /epoc32/winscw/c/testing/data/JipJip.mp3 +../data/mmc/MP3_MD.mp3 /epoc32/winscw/c/testing/data/MP3_MD.mp3 +../data/mmc/test3gp.3gp /epoc32/winscw/c/testing/data/test3gp.3gp +../data/mmc/testm4a.m4a /epoc32/winscw/c/testing/data/testm4a.m4a +../data/mmc/testmp4.mp4 /epoc32/winscw/c/testing/data/testmp4.mp4 PRJ_MMPFILES diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/callaudiocontrol/group/CallAudioControl.mmp --- a/mmserv/callaudiocontrol/group/CallAudioControl.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/callaudiocontrol/group/CallAudioControl.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -46,7 +46,7 @@ //SYSTEMINCLUDE /epoc32/include/CallAudioControl LIBRARY euser.lib -LIBRARY telephonyaudiorouting.lib +LIBRARY TelephonyAudioRouting.lib LIBRARY centralrepository.lib #ifdef __SERIES60_31__ diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Group/MetaDataUtility.mmp --- a/mmserv/metadatautility/Group/MetaDataUtility.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Group/MetaDataUtility.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -85,12 +85,12 @@ LIBRARY euser.lib LIBRARY efsrv.lib // File handling LIBRARY charconv.lib -LIBRARY 3GPMP4Lib.lib +LIBRARY 3gpmp4lib.lib LIBRARY caf.lib LIBRARY estlib.lib LIBRARY centralrepository.lib LIBRARY bafl.lib -LIBRARY SysLangUtil.lib +LIBRARY syslangutil.lib LIBRARY DrmRightsInfo.lib LIBRARY 3GPExtParser.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/3GPExtParser.h --- a/mmserv/metadatautility/Src/3GPExtParser.h Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/3GPExtParser.h Tue Sep 14 22:21:33 2010 +0300 @@ -143,9 +143,12 @@ TUint32 iTrackNumberSize; TUint32 iCoverOffset; TUint32 iCoverSize; + TUint32 iAlbumArtistOffset; + TUint32 iAlbumArtistSize; public: // constants + // for converting from %xxxx to @xxxx TBuf8<4> K3GPExtMetaTitle; TBuf8<4> K3GPExtMetaArtist; TBuf8<4> K3GPExtMetaComposer; @@ -153,6 +156,7 @@ TBuf8<4> K3GPExtMetaComment; TBuf8<4> K3GPExtMetaCustomGenre; TBuf8<4> K3GPExtMetaYear; + TBuf8<4> K3GPExtMetaArtistLower; }; #endif // C3GPEXTPARSER_H diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/MetaDataParser3GPExt.cpp --- a/mmserv/metadatautility/Src/MetaDataParser3GPExt.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/MetaDataParser3GPExt.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -167,6 +167,12 @@ TRAP(err, GetDurationL(EMetaDataDuration)); + TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbumArtist, &buf8)); + if (KErrNone == err) + { + ConvertAndAppendL(&buf8, EMetaDataAlbumArtist); + } + TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataJpeg, &buf8)); if (KErrNone == err) { @@ -258,6 +264,14 @@ } break; + case EMetaDataAlbumArtist: + TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbumArtist, &buf8)); + if (KErrNone == err) + { + ConvertAndAppendL(&buf8, EMetaDataAlbumArtist); + } + break; + case EMetaDataJpeg: TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataJpeg, &buf8)); if (KErrNone == err) diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/MetaDataParserID3v2.cpp --- a/mmserv/metadatautility/Src/MetaDataParserID3v2.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/MetaDataParserID3v2.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -232,6 +232,7 @@ case EMetaDataComposer: case EMetaDataCopyright: case EMetaDataOriginalArtist: + case EMetaDataAlbumArtist: TRAP(err, GetTextInfoL( fieldId, frameSize )); break; @@ -339,6 +340,7 @@ case EMetaDataComposer: case EMetaDataCopyright: case EMetaDataOriginalArtist: + case EMetaDataAlbumArtist: TRAP(err, GetTextInfoL( fieldId, frameSize )); break; diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/MetaDataParserID3v22.cpp --- a/mmserv/metadatautility/Src/MetaDataParserID3v22.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/MetaDataParserID3v22.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -47,6 +47,7 @@ _LIT8( KID3v2FrameIdDuration, "TLE" ); _LIT8( KID3v2FrameIdDate, "TDA" ); _LIT8( KID3v2FrameIdRating, "POP" ); +_LIT8( KID3v2FrameIdAlbumArtist, "TP2" ); _LIT8( KID3v2ImageFormatPng, "PNG" ); _LIT8( KID3v2ImageFormatJpeg, "JPG" ); @@ -253,6 +254,10 @@ { aFieldId = EMetaDataRating; } + else if ( frameId.Compare( KID3v2FrameIdAlbumArtist ) == 0 ) + { + aFieldId = EMetaDataAlbumArtist; + } else { aFieldId = EUnknownMetaDataField; diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/MetaDataParserID3v23.cpp --- a/mmserv/metadatautility/Src/MetaDataParserID3v23.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/MetaDataParserID3v23.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -46,6 +46,7 @@ _LIT8( KID3v2FrameIdDuration, "TLEN" ); _LIT8( KID3v2FrameIdDate, "TDAT" ); _LIT8( KID3v2FrameIdRating, "POPM" ); +_LIT8( KID3v2FrameIdAlbumArtist, "TPE2" ); _LIT8( KID3v2ImageFormatPngMime, "image/png" ); _LIT8( KID3v2ImageFormatPng, "png" ); @@ -281,6 +282,10 @@ { aFieldId = EMetaDataRating; } + else if ( frameId.Compare( KID3v2FrameIdAlbumArtist ) == 0 ) + { + aFieldId = EMetaDataAlbumArtist; + } else { aFieldId = EUnknownMetaDataField; diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/MetaDataParserID3v24.cpp --- a/mmserv/metadatautility/Src/MetaDataParserID3v24.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/MetaDataParserID3v24.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -47,6 +47,7 @@ _LIT8( KID3v2FrameIdDuration, "TLEN" ); _LIT8( KID3v2FrameIdDate, "TDRC" ); // same as year _LIT8( KID3v2FrameIdRating, "POPM" ); +_LIT8( KID3v2FrameIdAlbumArtist, "TPE2" ); _LIT8( KID3v2ImageFormatPngMime, "image/png" ); _LIT8( KID3v2ImageFormatPng, "png" ); @@ -285,6 +286,10 @@ { aFieldId = EMetaDataRating; } + else if ( frameId.Compare( KID3v2FrameIdAlbumArtist ) == 0 ) + { + aFieldId = EMetaDataAlbumArtist; + } else { aFieldId = EUnknownMetaDataField; diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/MetaDataParserWMA.cpp --- a/mmserv/metadatautility/Src/MetaDataParserWMA.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/MetaDataParserWMA.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -69,6 +69,8 @@ _LIT(KWMAudioFileURL, "WM/AudioFileURL\0"); _LIT(KWMSharedUserRating, "WM/SharedUserRating\0"); _LIT(KWMDate, "WM/OriginalReleaseTime\0"); +_LIT(KWMAlbumArtist, "WM/AlbumArtist\0"); + #ifdef __WINDOWS_MEDIA _LIT(KWMProvider, "WM/Provider\0"); #endif @@ -181,6 +183,7 @@ TRAP(err, GetExtContDesEntryL(EMetaDataAlbumTrack, iTrackNumberOffset)); TRAP(err, GetExtContDesEntryL(EMetaDataUniqueFileIdentifier, iUniqueFileIdentifierOffset)); TRAP(err, GetExtContDesEntryL(EMetaDataUrl, iAudioFileURLOffset)); + TRAP(err, GetExtContDesEntryL(EMetaDataAlbumArtist, iAlbumArtistOffset)); TRAP(err, GetDurationL()); TRAP(err, GetExtContDesEntryL(EMetaDataDate, iDateOffset)); #ifdef __WINDOWS_MEDIA @@ -245,6 +248,9 @@ case EMetaDataDate: TRAP(err, GetExtContDesEntryL(EMetaDataDate, iDateOffset)); break; + case EMetaDataAlbumArtist: + TRAP(err, GetExtContDesEntryL(EMetaDataAlbumArtist, iAlbumArtistOffset)); + break; #ifdef __WINDOWS_MEDIA case EMetaDataVendor: TRAP(err, GetExtContDesEntryL(EMetaDataVendor, iProviderOffset)); @@ -886,6 +892,10 @@ { iDateOffset = offset; } + else if(!name16.Compare(KWMAlbumArtist)) + { + iAlbumArtistOffset = offset; + } #ifdef __WINDOWS_MEDIA else if(!name16.Compare(KWMProvider)) { diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/metadatautility/Src/MetaDataParserWMA.h --- a/mmserv/metadatautility/Src/MetaDataParserWMA.h Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/metadatautility/Src/MetaDataParserWMA.h Tue Sep 14 22:21:33 2010 +0300 @@ -236,6 +236,7 @@ TInt iSharedUserRatingOffset; TInt iDateOffset; TInt iLyricsOffset; + TInt iAlbumArtistOffset; #ifdef __WINDOWS_MEDIA TInt iProviderOffset; #endif diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp --- a/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -2099,7 +2099,8 @@ } } } - + process.Close(); + client.Close(); #endif // RD_TSP_CLIENT_MAPPER if ( --iSessionCountPrimary == 0 ) @@ -3348,6 +3349,8 @@ { iProcessId = process.Id(); } + process.Close(); + client.Close(); #endif // RD_TSP_CLIENT_MAPPER } // End of File diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/thumbnailengine/Group/HXTNEEngine.mmp --- a/mmserv/thumbnailengine/Group/HXTNEEngine.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/thumbnailengine/Group/HXTNEEngine.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -70,7 +70,7 @@ LIBRARY euser.lib efsrv.lib LIBRARY fbscli.lib LIBRARY gdi.lib -LIBRARY 3GPMP4Lib.lib +LIBRARY 3gpmp4lib.lib LIBRARY ecom.lib LIBRARY devvideo.lib LIBRARY flogger.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/thumbnailengine/Group/TNEEngine.mmp --- a/mmserv/thumbnailengine/Group/TNEEngine.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/thumbnailengine/Group/TNEEngine.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -67,7 +67,7 @@ LIBRARY euser.lib efsrv.lib LIBRARY fbscli.lib LIBRARY gdi.lib -LIBRARY 3GPMP4Lib.lib +LIBRARY 3gpmp4lib.lib LIBRARY ecom.lib LIBRARY devvideo.lib diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/thumbnailengine/TneAPISrc/HXTNEVideoClipInfoImp.cpp --- a/mmserv/thumbnailengine/TneAPISrc/HXTNEVideoClipInfoImp.cpp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/thumbnailengine/TneAPISrc/HXTNEVideoClipInfoImp.cpp Tue Sep 14 22:21:33 2010 +0300 @@ -421,6 +421,14 @@ if ( !iRgbBuf ) { + //we only support even frame width & height. Ignore and return error + if ( (iMetaData.iWidth & 0x01) || (iMetaData.iHeight & 0x01) ) + { + FLOG(_L("CHXTNEVideoClipInfoImp::GenerateThumbNail non-even frame size returning error iMetaData.iWidth=%d iMetaData.iHeight=%d "),iMetaData.iWidth,iMetaData.iHeight); + HandleThumbnailError(KErrNotSupported); + return; + } + TSize inputFrameResolution(iMetaData.iWidth,iMetaData.iHeight); // rgb specs diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/tms/tmscallserver/group/tmscallserver.mmp --- a/mmserv/tms/tmscallserver/group/tmscallserver.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/tms/tmscallserver/group/tmscallserver.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -73,15 +73,15 @@ LIBRARY libgstapp.lib LIBRARY libgstdevsoundext.lib #else //__USE_GSTREAMER__ -LIBRARY errorconcealmentintfc.lib -LIBRARY g711decoderintfc.lib -LIBRARY g711encoderintfc.lib -LIBRARY g729decoderintfc.lib -LIBRARY g729encoderintfc.lib -LIBRARY ilbcdecoderintfc.lib -LIBRARY ilbcencoderintfc.lib -LIBRARY speechencoderconfig.lib -LIBRARY audiooutputrouting.lib +LIBRARY ErrorConcealmentIntfc.lib +LIBRARY G711DecoderIntfc.lib +LIBRARY G711EncoderIntfc.lib +LIBRARY G729DecoderIntfc.lib +LIBRARY G729EncoderIntfc.lib +LIBRARY IlbcDecoderIntfc.lib +LIBRARY IlbcEncoderIntfc.lib +LIBRARY SpeechEncoderConfig.lib +LIBRARY AudioOutputRouting.lib #endif //__USE_GSTREAMER__ LIBRARY euser.lib LIBRARY estor.lib @@ -91,8 +91,8 @@ LIBRARY mmfdevsound.lib LIBRARY mmfserverbaseclasses.lib LIBRARY mediaclientaudio.lib -LIBRARY profileengine.lib -LIBRARY telephonyaudiorouting.lib +LIBRARY ProfileEngine.lib +LIBRARY TelephonyAudioRouting.lib LIBRARY tmsutility.lib DEFFILE tmscallserver.def diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/voipaudioservices/VoIPIntfc/group/VoIPAudioIntfc.mmp --- a/mmserv/voipaudioservices/VoIPIntfc/group/VoIPAudioIntfc.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/voipaudioservices/VoIPIntfc/group/VoIPAudioIntfc.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -73,15 +73,15 @@ LIBRARY euser.lib LIBRARY mediaclientaudioinputstream.lib LIBRARY mediaclientaudiostream.lib -LIBRARY audiooutputrouting.lib +LIBRARY AudioOutputRouting.lib LIBRARY mediaclientaudio.lib -LIBRARY errorconcealmentintfc.lib -LIBRARY g711decoderintfc.lib -LIBRARY g711encoderintfc.lib -LIBRARY g729decoderintfc.lib -LIBRARY g729encoderintfc.lib -LIBRARY ilbcdecoderintfc.lib -LIBRARY ilbcencoderintfc.lib +LIBRARY ErrorConcealmentIntfc.lib +LIBRARY G711DecoderIntfc.lib +LIBRARY G711EncoderIntfc.lib +LIBRARY G729DecoderIntfc.lib +LIBRARY G729EncoderIntfc.lib +LIBRARY IlbcDecoderIntfc.lib +LIBRARY IlbcEncoderIntfc.lib SMPSAFE diff -r 0ac9a5310753 -r 999b2818a0eb mmserv/voipaudioservices/VoIPServer/group/VoIPAudioServer.mmp --- a/mmserv/voipaudioservices/VoIPServer/group/VoIPAudioServer.mmp Wed Sep 01 12:23:00 2010 +0100 +++ b/mmserv/voipaudioservices/VoIPServer/group/VoIPAudioServer.mmp Tue Sep 14 22:21:33 2010 +0300 @@ -54,16 +54,16 @@ LIBRARY estor.lib LIBRARY mediaclientaudio.lib LIBRARY mmfdevsound.lib -LIBRARY errorconcealmentintfc.lib -LIBRARY g711decoderintfc.lib -LIBRARY g711encoderintfc.lib -LIBRARY g729decoderintfc.lib -LIBRARY g729encoderintfc.lib -LIBRARY ilbcdecoderintfc.lib -LIBRARY ilbcencoderintfc.lib -LIBRARY speechencoderconfig.lib -LIBRARY audiooutputrouting.lib -LIBRARY profileengine.lib +LIBRARY ErrorConcealmentIntfc.lib +LIBRARY G711DecoderIntfc.lib +LIBRARY G711EncoderIntfc.lib +LIBRARY G729DecoderIntfc.lib +LIBRARY G729EncoderIntfc.lib +LIBRARY IlbcDecoderIntfc.lib +LIBRARY IlbcEncoderIntfc.lib +LIBRARY SpeechEncoderConfig.lib +LIBRARY AudioOutputRouting.lib +LIBRARY ProfileEngine.lib LIBRARY voipjitterbuffer.lib LIBRARY mmfserverbaseclasses.lib