yes0x101F5D070x101FFA00";//yes indicates controller has no url handling capability.
- }
- };
- },
- INTERFACE_INFO
- {
- interface_uid = KMmfUidToneSequenceFormatInterface;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KMmfUidToneSequenceFormatRead ;
- version_no = 1;
- display_name = "Tone Sequence Play Format";
- default_data = "?";
- opaque_data = "Symbian0x101F5D07.sqnSQNC";
- }
- };
- }
-
- };
- }
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 devsound/devsoundrefplugin/src/controller/audio/2002C398.rss
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devsound/devsoundrefplugin/src/controller/audio/2002C398.rss Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,60 @@
+// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Copied from... Registry file for the Example Interface Implementation Collection
+//
+//
+
+#include
+#include
+#include "MmfAudioToneController.hrh"
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = 0x2002C398;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KMmfUidPluginInterfaceController ;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KMmfUidControllerAudioTone ;
+ version_no = 1;
+ display_name = "Symbian Audio Tone Test controller";
+ default_data = "?";
+ opaque_data = "Symbianyes0x101F5D070x101FFA00";//yes indicates controller has no url handling capability.
+ }
+ };
+ },
+ INTERFACE_INFO
+ {
+ interface_uid = KMmfUidToneSequenceFormatInterface;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KMmfUidToneSequenceFormatRead ;
+ version_no = 1;
+ display_name = "Tone Sequence Play Format";
+ default_data = "?";
+ opaque_data = "Symbian0x101F5D07.sqnSQNC";
+ }
+ };
+ }
+
+ };
+ }
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/cameraunittest/group/custom/poststep_custom.xml
--- a/imagingandcamerafws/cameraunittest/group/custom/poststep_custom.xml Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
- fetch-log
-
-
-
-
-
-
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/cameraunittest/group/custom/prestep_custom.xml
--- a/imagingandcamerafws/cameraunittest/group/custom/prestep_custom.xml Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
- makedir
-
-
-
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingfws/ImageProcessor/bwins/imageprocessor.def
--- a/imagingandcamerafws/imagingfws/ImageProcessor/bwins/imageprocessor.def Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/bwins/imageprocessor.def Mon Aug 23 18:56:36 2010 +0100
@@ -164,4 +164,6 @@
?ZoomL@TPreview@ImageProcessor@@QBEMXZ @ 163 NONAME ; float ImageProcessor::TPreview::ZoomL(void) const
??1CImgProcessor@ImageProcessor@@UAE@XZ @ 164 NONAME ; ImageProcessor::CImgProcessor::~CImgProcessor(void)
?SetInputL@CImgProcessor@ImageProcessor@@QAEXAAVCImagePanorama@@@Z @ 165 NONAME ; void ImageProcessor::CImgProcessor::SetInputL(class CImagePanorama &)
+ ?Extension@TInputInfo@ImageProcessor@@QBEPAXVTUid@@@Z @ 166 NONAME ; void * ImageProcessor::TInputInfo::Extension(class TUid) const
+ ?Extension@TOutputInfo@ImageProcessor@@QBEPAXVTUid@@@Z @ 167 NONAME ; void * ImageProcessor::TOutputInfo::Extension(class TUid) const
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingfws/ImageProcessor/eabi/imageprocessor.def
--- a/imagingandcamerafws/imagingfws/ImageProcessor/eabi/imageprocessor.def Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/eabi/imageprocessor.def Mon Aug 23 18:56:36 2010 +0100
@@ -168,4 +168,6 @@
_ZN14ImageProcessor13CImgProcessorD1Ev @ 167 NONAME
_ZN14ImageProcessor13CImgProcessorD2Ev @ 168 NONAME
_ZN14ImageProcessor13CImgProcessor9SetInputLER14CImagePanorama @ 169 NONAME
+ _ZNK14ImageProcessor10TInputInfo9ExtensionE4TUid @ 170 NONAME
+ _ZNK14ImageProcessor11TOutputInfo9ExtensionE4TUid @ 171 NONAME
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingfws/ImageProcessor/inc/imageprocessorinputinfo.h
--- a/imagingandcamerafws/imagingfws/ImageProcessor/inc/imageprocessorinputinfo.h Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/inc/imageprocessorinputinfo.h Mon Aug 23 18:56:36 2010 +0100
@@ -23,6 +23,7 @@
#define __IMAGE_PROCESSOR_INPUT_INFO_H__
#include
+#include
namespace ImageProcessor
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessorinputinfo.cpp
--- a/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessorinputinfo.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessorinputinfo.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -135,6 +135,17 @@
return iInputInfoImpl.HasAlphaL();
}
- }//namespace ImageProcessor
+/**
+Retrieves access to a custom extension.
+
+@param aExtension
+ The UID of the extension to be retrieved
+@return Extension corresponding to the UID given as a parameter.
+*/
+EXPORT_C TAny* TInputInfo::Extension(TUid /*aExtension*/) const
+ {
+ return NULL;
+ }
+ }//namespace ImageProcessor
//EOF
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessoroutputinfo.cpp
--- a/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessoroutputinfo.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessoroutputinfo.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -52,7 +52,17 @@
__ASSERT_ALWAYS(iImageProcessorImpl.IsOutputSet(), User::Leave(KErrNotReady));
iOutputInfoImpl.SetSamplingL(aSampling);
}
+/**
+Retrieves access to a custom extension.
- }//namespace ImageProcessor
+@param aExtension
+ The UID of the extension to be retrieved
+@return Extension corresponding to the UID given as a parameter.
+*/
+EXPORT_C TAny* TOutputInfo::Extension(TUid /*aExtension*/) const
+ {
+ return NULL;
+ }
+ }//namespace ImageProcessor
//EOF
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingfws/group/bld.inf
--- a/imagingandcamerafws/imagingfws/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingfws/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -115,10 +115,10 @@
// i.e. tests where no user input is required. The default will apply if neither "manual"
// or "support" is specified.
-../group/TImageViewer.mmp
-../group/TImageDisplay.mmp
-../group/TImageTran.mmp
-../group/tphotoeditor.mmp
+//../group/TImageViewer.mmp
+//../group/TImageDisplay.mmp
+//../group/TImageTran.mmp
+//../group/tphotoeditor.mmp
PRJ_TESTEXPORTS
// specify the source file followed by its destination here
@@ -127,10 +127,11 @@
// Romkit include files - additional test files
../group/ImageConversionTest.iby /epoc32/rom/include/imageconversiontest.iby
../group/ImageConversionProfile.iby /epoc32/rom/include/imageconversionprofile.iby
-../group/TImageViewer.iby /epoc32/rom/include/timageviewer.iby
-../group/TImageDisplay.iby /epoc32/rom/include/timagedisplay.iby
-../group/timagetran.iby /epoc32/rom/include/timagetran.iby
-../group/tphotoeditor.iby /epoc32/rom/include/tphotoeditor.iby
+
+//../group/TImageViewer.iby /epoc32/rom/include/timageviewer.iby
+//../group/TImageDisplay.iby /epoc32/rom/include/timagedisplay.iby
+//../group/timagetran.iby /epoc32/rom/include/timagetran.iby
+//../group/tphotoeditor.iby /epoc32/rom/include/tphotoeditor.iby
PRJ_TESTEXPORTS
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/TSI_ICL_COD/COD/TSI_ICLCODstep.cpp
--- a/imagingandcamerafws/imaginginttest/TSI_ICL_COD/COD/TSI_ICLCODstep.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/TSI_ICL_COD/COD/TSI_ICLCODstep.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -63,6 +63,7 @@
TVerdict RIclCodStep::OpenL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFs.Connect());
iScheduler = new (ELeave) CActiveScheduler;
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/TSI_ICL_COD/group/TSU_ICL_COD.iby
--- a/imagingandcamerafws/imaginginttest/TSI_ICL_COD/group/TSU_ICL_COD.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/TSI_ICL_COD/group/TSU_ICL_COD.iby Mon Aug 23 18:56:36 2010 +0100
@@ -16,7 +16,7 @@
#ifndef __TSU_ICL_COD_IBY__
#define __TSU_ICL_COD_IBY__
-file=ABI_DIR\BUILD_DIR\TSI_ICL_COD.DLL System\Libs\TSU_ICL_COD.DLL
+file=ABI_DIR\BUILD_DIR\TSI_ICL_COD.DLL System\Libs\TSI_ICL_COD.DLL
// scripts
data=EPOCROOT##epoc32\data\c\ICL\TSI_ICL_COD_00.script TSI_ICL_COD_00.script
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/group/inttest_icl.pkg
--- a/imagingandcamerafws/imaginginttest/group/inttest_icl.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/group/inttest_icl.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,9 +13,9 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSI_ICL_FRM_00.dll"-"c:\sys\bin\TSI_ICL_FRM_00.dll"
+"\epoc32\release\armv5\udeb\TSI_ICL_FRM_00.dll"-"c:\sys\bin\TSI_ICL_FRM_00.dll"
-\\ REM test scripts
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imaginginttest\scriptfiles\TSI_ICL_FRM_00.script"-"c:\TSI_ICL_FRM_00.script"
"\sf\os\mm\imagingandcamerafws\imaginginttest\scriptfiles\TSI_ICL_FRM_FS.script"-"c:\TSI_ICL_FRM_FS.script"
"\sf\os\mm\imagingandcamerafws\imaginginttest\scriptfiles\TSI_ICL_FRM_DRM.script"-"c:\TSI_ICL_FRM_DRM.script"
@@ -25,25 +25,26 @@
"\sf\os\mm\imagingandcamerafws\imaginginttest\scriptfiles\TSI_ICL_FRM_YUV_ALLOC.script"-"c:\TSI_ICL_FRM_YUV_ALLOC.script"
"\sf\os\mm\imagingandcamerafws\imaginginttest\scriptfiles\TSI_ICL_FRM_00.ini"-"c:\icl\TSI_ICL_FRM_00.ini"
-\\ testdata
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\jfif444_8.mbm""-"c:\icl\refimages\jfif444_8.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\jfif444.mbm""-"c:\icl\refimages\jfif444.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\trans_1.mbm""-"c:\icl\refimages\trans_1.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\trans_8.mbm""-"c:\icl\refimages\trans_8.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\operator.mbm""-"c:\icl\refimages\operator.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\bmp8bpp_8.mbm""-"c:\icl\refimages\bmp8bpp_8.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\sun.mbm""-"c:\icl\refimages\sun.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\png4_8.mbm""-"c:\icl\refimages\png4_8.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\tif3_4.mbm""-"c:\icl\refimages\tif3_4.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\wmf3_8.mbm""-"c:\icl\refimages\wmf3_8.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\icoepoc.mbm""-"c:\icl\refimages\icoepoc.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\mbm24bpp_4.mbm""-"c:\icl\refimages\mbm24bpp_4.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\mbm24bpp_4.mbm""-"c:\icl\testimages\mbm24bpp_4.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\textfile.mbm""-"c:\icl\refimages\textfile.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\img_1705.mbm""-"c:\icl\refimages\img_1705.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\Preview.ppm"-"c:\icl\refimages\preview.ppm"
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\preview.mbm""-"c:\icl\refimages\preview.mbm""
-"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\mbm_datanewl_0300.mbm""-"c:\icl\refimages\mbm_datanewl_0300.mbm""
+// testdata
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\jfif444_8.mbm"-"c:\icl\refimages\jfif444_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\minimum.mbm"-"c:\icl\refimages\minimum.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\jfif444.mbm"-"c:\icl\refimages\jfif444.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\trans_1.mbm"-"c:\icl\refimages\trans_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\trans_8.mbm"-"c:\icl\refimages\trans_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\operator.mbm"-"c:\icl\refimages\operator.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\bmp8bpp_8.mbm"-"c:\icl\refimages\bmp8bpp_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\sun.mbm"-"c:\icl\refimages\sun.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\png4_8.mbm"-"c:\icl\refimages\png4_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\tif3_4.mbm"-"c:\icl\refimages\tif3_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\wmf3_8.mbm"-"c:\icl\refimages\wmf3_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\icoepoc.mbm"-"c:\icl\refimages\icoepoc.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\mbm24bpp_4.mbm"-"c:\icl\refimages\mbm24bpp_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\mbm24bpp_4.mbm"-"c:\icl\testimages\mbm24bpp_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\textfile.mbm"-"c:\icl\refimages\textfile.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\img_1705.mbm"-"c:\icl\refimages\img_1705.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\Preview.ppm"-"c:\icl\testimages\preview.ppm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\preview.mbm"-"c:\icl\refimages\preview.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\mbm_datanewl_0300.mbm""-"c:\icl\refimages\mbm_datanewl_0300.mbm"
"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\mbm_datanewl_0300.uic"-"c:\icl\refimages\mbm_datanewl_0300.uic"
// data
@@ -237,7 +238,7 @@
"\sf\os\mm\imagingandcamerafws\imaginginttest\data\refimages\mbm\auto_rot_4_ref160_dec1.mbm"-"c:\icl\refimages\mbm\auto_rot_4_ref160_dec1.mbm"
"\sf\os\mm\imagingandcamerafws\imaginginttest\data\refimages\mbm\auto_rot_4_refarto160.mbm"-"c:\icl\refimages\mbm\auto_rot_4_refarto160.mbm"
-\\mm_testdata
+//mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\back.gif"-"c:\icl\testimages\back.gif"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\bmp8bpp_8.bmp"-"c:\icl\testimages\bmp8bpp_8.bmp"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\clock.gif"-"c:\icl\testimages\clock.gif"
@@ -264,7 +265,7 @@
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\wmf3_8.wmf"-"c:\icl\testimages\wmf3_8.wmf"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\wmf3_9.wmf"-"c:\icl\testimages\wmf3_9.wmf"
-\\ SYMBIAN_CAF_V2
+// SYMBIAN_CAF_V2
"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\Image.contentrights"-"c:\icl\testimages\Image.contentrights"
"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\Image.content"-"c:\icl\testimages\Image.content"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/imagedecoder/group/tsi_icl_imagedecoder.pkg
--- a/imagingandcamerafws/imaginginttest/imagedecoder/group/tsi_icl_imagedecoder.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/imagedecoder/group/tsi_icl_imagedecoder.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -34,6 +34,9 @@
"\sf\os\mm\imagingandcamerafws\imaginginttest\imagedecoder\scripts\tsi_icl_imagedecoder_autorotate.ini"-"c:\icl\imagedecoder\tsi_icl_imagedecoder_autorotate.ini"
"\sf\os\mm\imagingandcamerafws\imaginginttest\imagedecoder\scripts\tsi_icl_imagedecoder_autorotate.script"-"c:\tsi_icl_imagedecoder_autorotate.script"
+// testimages
+"\sf\os\mm\imagingandcamerafws\imaginginttest\data\testimages\mbm\bitmap_small01.mbm"-"c:\icl\testimages\mbm\bitmap_small01.mbm"
+
// reference images
"\sf\os\mm\imagingandcamerafws\imaginginttest\data\refimages\mbm\jpeg_sml07_refperf100.mbm"-"c:\icl\refimages\mbm\jpeg_sml07_refperf100.mbm"
"\sf\os\mm\imagingandcamerafws\imaginginttest\data\refimages\mbm\jpeg_sml10_refperf110.mbm"-"c:\icl\refimages\mbm\jpeg_sml10_refperf110.mbm"
@@ -255,4 +258,13 @@
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_supersize01.jpg"-"c:\icl\testimages\jpeg\jpeg_supersize01.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin02.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin02.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin03.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin03.jpg"
-"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin17.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin17.jpg"
\ No newline at end of file
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin17.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin17.jpg"
+
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_1.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_1.jpeg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_2.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_2.jpeg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_3.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_3.jpeg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_4.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_4.jpeg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_5.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_5.jpeg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_6.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_6.jpeg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_7.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_7.jpeg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_8.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_8.jpeg"
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/imagedecoder/src/tsi_icl_decode_stepbase.cpp
--- a/imagingandcamerafws/imaginginttest/imagedecoder/src/tsi_icl_decode_stepbase.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/imagedecoder/src/tsi_icl_decode_stepbase.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1862,6 +1862,7 @@
iUM = new (ELeave) CUtilityMembers();
User::LeaveIfError(iUM->iFs.Connect());
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
// derived test step class to implement
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/imageencoder/group/tsi_icl_imageencoder.pkg
--- a/imagingandcamerafws/imaginginttest/imageencoder/group/tsi_icl_imageencoder.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/imageencoder/group/tsi_icl_imageencoder.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -51,6 +51,35 @@
"\sf\os\mm\imagingandcamerafws\imaginginttest\data\testimages\mbm\bitmap_restartinterop.mbm"-"c:\icl\testimages\mbm\bitmap_restartinterop.mbm"
//mm_testdata
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small10.jpg"-"c:\icl\testimages\jpeg\jpeg_small10.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small08.jpg"-"c:\icl\testimages\jpeg\jpeg_small08.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_a.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_b.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_b.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_c.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_c.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_d.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_d.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18.jpg"-"c:\icl\testimages\jpeg\jpeg_small18.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_b.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_b.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_c.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_c.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_d.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_d.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_e.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_e.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_f.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_f.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_g.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_g.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_h.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_h.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_i.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_i.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_j.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_j.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small14_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small14_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small10_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small10_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin02.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin02.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin03.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin03.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin17.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin17.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_supersize01.jpg"-"c:\icl\testimages\jpeg\jpeg_supersize01.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small09_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small09_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small15.jpg"-"c:\icl\testimages\jpeg\jpeg_small15.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small13_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small13_a.jpg"
+
+
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\refimages\jpeg\bitmap_avg01_refperf30.jpg"-"c:\icl\refimages\jpeg\bitmap_avg01_refperf30.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\refimages\jpeg\bitmap_avg01_refperf620.jpg"-"c:\icl\refimages\jpeg\bitmap_avg01_refperf620.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\refimages\jpeg\bitmap_avg01_refperf650.jpg"-"c:\icl\refimages\jpeg\bitmap_avg01_refperf650.jpg"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/imageencoder/src/tsi_icl_encode_stepbase.cpp
--- a/imagingandcamerafws/imaginginttest/imageencoder/src/tsi_icl_encode_stepbase.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/imageencoder/src/tsi_icl_encode_stepbase.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -819,6 +819,7 @@
__MM_HEAP_MARK
User::LeaveIfError(iFs.Connect());
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
// derived test step class to implement
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/inc/ICLFbsSessionTest.inl
--- a/imagingandcamerafws/imaginginttest/inc/ICLFbsSessionTest.inl Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/inc/ICLFbsSessionTest.inl Mon Aug 23 18:56:36 2010 +0100
@@ -40,6 +40,7 @@
*/
inline void CICLFbsSessionTest::ConnectToSessionL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/src/TestImageDecoderDRM.cpp
--- a/imagingandcamerafws/imaginginttest/src/TestImageDecoderDRM.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/src/TestImageDecoderDRM.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -92,6 +92,7 @@
__MM_HEAP_MARK;
TInt err = KErrNone;
+ User::LeaveIfError(FbsStartup());
err = RFbsSession::Connect();
if (err != KErrNone)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/src/TestImageDecoderFileSource.cpp
--- a/imagingandcamerafws/imaginginttest/src/TestImageDecoderFileSource.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/src/TestImageDecoderFileSource.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -297,6 +297,7 @@
__MM_HEAP_MARK;
TInt err = KErrNone;
+ User::LeaveIfError(FbsStartup());
err = RFbsSession::Connect();
if (err != KErrNone)
{
@@ -502,6 +503,7 @@
__MM_HEAP_MARK;
TInt err = KErrNone;
+ User::LeaveIfError(FbsStartup());
err = RFbsSession::Connect();
if (err != KErrNone)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/src/TestNegativeConversion.cpp
--- a/imagingandcamerafws/imaginginttest/src/TestNegativeConversion.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/src/TestNegativeConversion.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -174,7 +174,14 @@
TVerdict result = EFail ;
TInt theRes = KErrNone;
- TInt err = RFbsSession::Connect();
+ TInt err = FbsStartup();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("FbsStartup failed, err = %d"), err);
+ return EInconclusive;
+ }
+
+ err = RFbsSession::Connect();
if (err != KErrNone)
{
INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
@@ -208,12 +215,19 @@
TVerdict result = EFail ;
TInt theRes = KErrNone;
- TInt err = RFbsSession::Connect();
- if (err != KErrNone)
- {
- INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
- return EInconclusive;
- }
+ TInt err = FbsStartup();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("FbsStartup failed, err = %d"), err);
+ return EInconclusive;
+ }
+
+ err = RFbsSession::Connect();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
+ return EInconclusive;
+ }
//try to open corrupted file
TRAP_IGNORE(theRes = OpenImageForDecodeFromBufferL(iFileNameSrc, iImageTypeUid));
@@ -246,12 +260,19 @@
TVerdict result = EFail ;
TInt theRes = KErrNone;
- TInt err = RFbsSession::Connect();
- if (err != KErrNone)
- {
- INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
- return EInconclusive;
- }
+ TInt err = FbsStartup();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("FbsStartup failed, err = %d"), err);
+ return EInconclusive;
+ }
+
+ err = RFbsSession::Connect();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
+ return EInconclusive;
+ }
TRAP_IGNORE(theRes = OpenImageForDecodeFromBufferL(iFileNameSrc));
@@ -620,12 +641,19 @@
TVerdict result = EFail ;
TInt theRes = KErrNone;
- TInt err = RFbsSession::Connect();
- if (err != KErrNone)
- {
- INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
- return EInconclusive;
- }
+ TInt err = FbsStartup();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("FbsStartup failed, err = %d"), err);
+ return EInconclusive;
+ }
+
+ err = RFbsSession::Connect();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
+ return EInconclusive;
+ }
TRAP_IGNORE(theRes = OpenImageForDecodeFromBufferL( iFileNameSrc ));
@@ -662,12 +690,19 @@
return EInconclusive;
__MM_HEAP_MARK;
- err = RFbsSession::Connect();
- if (err != KErrNone)
- {
- INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
- return EInconclusive;
- }
+ TInt err1 = FbsStartup();
+ if (err1 != KErrNone)
+ {
+ INFO_PRINTF2(_L("FbsStartup failed, err = %d"), err1);
+ return EInconclusive;
+ }
+
+ err1 = RFbsSession::Connect();
+ if (err1 != KErrNone)
+ {
+ INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err1);
+ return EInconclusive;
+ }
CRightsDatabase* database = CRightsDatabase::NewL(EFalse); // clear current database
delete database; // delete database object
@@ -1063,6 +1098,7 @@
CleanupStack::PopAndDestroy(3, theImageEncoder);
+ RFbsSession::Disconnect();
return EPass;
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/src/TestPositiveConversion.cpp
--- a/imagingandcamerafws/imaginginttest/src/TestPositiveConversion.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/src/TestPositiveConversion.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -138,12 +138,19 @@
return EInconclusive;
__MM_HEAP_MARK;
- TInt err = RFbsSession::Connect();
- if (err != KErrNone)
- {
- INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
- return EInconclusive;
- }
+ TInt err = FbsStartup();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("FbsStartup failed, err = %d"), err);
+ return EInconclusive;
+ }
+
+ err = RFbsSession::Connect();
+ if (err != KErrNone)
+ {
+ INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
+ return EInconclusive;
+ }
if(iImageTypeUid == KImageTypeWBMPUid ||
iImageTypeUid == KImageTypeOTAUid)
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/src/TestStepConversion.cpp
--- a/imagingandcamerafws/imaginginttest/src/TestStepConversion.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/src/TestStepConversion.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -2091,15 +2091,23 @@
// Need to do this BEFORE doing any allocation testing !
TInt CTestStepConversion::DummyHalCall()
{
- TInt err = RFbsSession::Connect();
- if (err != KErrNone)
- {
- INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err);
- return err;
- }
+ TInt err1 = FbsStartup();
+ if (err1 != KErrNone)
+ {
+ INFO_PRINTF2(_L("FbsStartup failed, err = %d"), err1);
+ return EInconclusive;
+ }
+
+ err1 = RFbsSession::Connect();
+ if (err1 != KErrNone)
+ {
+ INFO_PRINTF2(_L("RFbsSession::Connect() failed, err = %d"), err1);
+ return EInconclusive;
+ }
TInt displayMode = EColor256;
CFbsScreenDevice* screenDevice = NULL;
+ TInt err;
while(displayMode < EColorLast)
{
TRAP(err, screenDevice = CFbsScreenDevice::NewL(_L("NotUsed"),(TDisplayMode)displayMode));
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/group/te_tsi_icl_cod_5suite.pkg
--- a/imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/group/te_tsi_icl_cod_5suite.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/group/te_tsi_icl_cod_5suite.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -944,7 +944,7 @@
"\sf\os\mm\imagingandcamerafws\imaginginttest\te_tsi_icl_cod_5\testdata\mng\ref\subframes_16mu_image_display_decode_frame_5.mbm"-"c:\te_tsi_icl_cod_05\mng\ref\subframes_16mu_image_display_decode_frame_5.mbm"
"\sf\os\mm\imagingandcamerafws\imaginginttest\te_tsi_icl_cod_5\testdata\mng\ref\subframes_16mu_image_display_decode_frame_5_mask.mbm"-"c:\te_tsi_icl_cod_05\mng\ref\subframes_16mu_image_display_decode_frame_5_mask.mbm"
-\\ PDEF128541: Certain image cannot be seen on MO during share image.
+// PDEF128541: Certain image cannot be seen on MO during share image.
"\sf\os\mm\imagingandcamerafws\imaginginttest\te_tsi_icl_cod_5\testdata\bmp\ref\8bpp_bmp_16m_no_mask_decode.mbm"-"c:\te_tsi_icl_cod_05\bmp\ref\8bpp_bmp_16m_no_mask_decode.mbm"
"\sf\os\mm\imagingandcamerafws\imaginginttest\te_tsi_icl_cod_5\testdata\bmp\ref\8bpp_bmp_16mu_no_mask_decode.mbm"-"c:\te_tsi_icl_cod_05\bmp\ref\8bpp_bmp_16mu_no_mask_decode.mbm"
"\sf\os\mm\imagingandcamerafws\imaginginttest\te_tsi_icl_cod_5\testdata\bmp\ref\8bpp_bmp_16ma_no_mask_decode.mbm"-"c:\te_tsi_icl_cod_05\bmp\ref\8bpp_bmp_16ma_no_mask_decode.mbm"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/scripts/te_tsi_icl_cod_5Suite_2.script
--- a/imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/scripts/te_tsi_icl_cod_5Suite_2.script Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/scripts/te_tsi_icl_cod_5Suite_2.script Mon Aug 23 18:56:36 2010 +0100
@@ -426,7 +426,7 @@
RUN_TEST_STEP 200 te_tsi_icl_cod_5Suite tsi_icl_cod_52Step c:\testdata\configs\te_tsi_icl_cod_5Suite.ini GIF_ANIMATED_TRANSPARENCY_NOMASKDECODE_3
END_TESTCASE MM-TSI-ICL-COD-05-0068
-TART_TESTCASE MM-TSI-ICL-COD-05-0069
+START_TESTCASE MM-TSI-ICL-COD-05-0069
//!@SYMTestCaseID MM-TSI-ICL-COD-05-0069
//!@SYMTestCaseDesc Decode all frames of a multiple frame source image into a separate, single CFbsBitmap (with display mode of 16M, 16MU and 16MA) and a separate mask, then verify each frame against a reference file.
//!@SYMTestType CIT
@@ -446,7 +446,7 @@
//! 6. Repeat 2. through to 5. until all frames and masks have been decoded and verified.
//! 7. Performance timing figures are also included, but these are not checked in the test.
//!@SYMTestExpectedResults The bitmap containing the decoded data matches the reference files.
-S
+
RUN_TEST_STEP 200 te_tsi_icl_cod_5Suite tsi_icl_cod_53Step c:\testdata\configs\te_tsi_icl_cod_5Suite.ini GIF_ANIMATED_TRANSPARENCY_MASKDECODE_3
END_TESTCASE MM-TSI-ICL-COD-05-0069
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/group/tsi_icl_btrans_01.pkg
--- a/imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/group/tsi_icl_btrans_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/group/tsi_icl_btrans_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,9 +13,9 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSI_ICL_BTRANS_01.dll"-"c:\sys\bin\TSI_ICL_BTRANS_01.dll"
+"\epoc32\release\armv5\udeb\TSI_ICL_BTRANS_01.dll"-"c:\sys\bin\TSI_ICL_BTRANS_01.dll"
-"\sf\os\mm\imagingandcamerafws\imaginginttest\tsi_icl_btrans_01\scripts\TSI_ICL_BTRANS_01.script"-"c:\mm\TSI_ICL_BTRANS_01.script"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\tsi_icl_btrans_01\scripts\TSI_ICL_BTRANS_01.script"-"c:\TSI_ICL_BTRANS_01.script"
"\sf\os\mm\imagingandcamerafws\imaginginttest\tsi_icl_btrans_01\scripts\TSI_ICL_BTRANS_01_Panic.script"-"c:\TSI_ICL_BTRANS_01_Panic.script"
"\sf\os\mm\imagingandcamerafws\imaginginttest\tsi_icl_btrans_01\scripts\TSI_ICL_BTRANS_01_Alloc.script"-"c:\TSI_ICL_BTRANS_01_Alloc.script"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/src/TestStepBitmapTransforms.cpp
--- a/imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/src/TestStepBitmapTransforms.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/src/TestStepBitmapTransforms.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -112,6 +112,17 @@
*/
TVerdict CTestStepBitmapTransforms::DoTestStepPreambleL()
{
+ if(!iAllocTest)
+ {
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ //[ log failed to connect to bitmap server ]
+ Log(_L("Failed to connect to bitmap server in teststep preamble = %d"), errCode );
+ return EFail;
+ }
+ }
// [Test if this build support alloc testing]
if(iAllocTest)
{
@@ -229,7 +240,7 @@
//[ Destroy the scheduler ]
delete iScheduler ;
iScheduler = NULL;
-
+ RFbsSession::Disconnect();
return EPass;
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/group/tsu_icl_cod_03.pkg
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/group/tsu_icl_cod_03.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/group/tsu_icl_cod_03.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,9 +13,9 @@
// Description:
//
-"\epoc32\release\armv5\urel\tsu_icl_cod_03.dll"-"c:\sys\bin\tsu_icl_cod_03.dll"
+"\epoc32\release\armv5\udeb\tsu_icl_cod_03.dll"-"c:\sys\bin\tsu_icl_cod_03.dll"
-\\ REM test scripts
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_03\scripts\TSU_ICL_COD_03.script"-"c:\TSU_ICL_COD_03.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_03\scripts\TSU_ICL_COD_03_alloc.script"-"c:\TSU_ICL_COD_03_alloc.script"
@@ -144,7 +144,7 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_03\TestFiles\refbut4.mbm"-"c:\tsu_icl_cod_03\refbut4.mbm"
-\\ mm_testdata
+// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\__scale__1_444834624.gif"-"c:\tsu_icl_cod_03\__scale__1_444834624.gif"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\00000023.tif"-"c:\tsu_icl_cod_03\00000023.tif"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\00000026.tif"-"c:\tsu_icl_cod_03\00000026.tif"
@@ -316,4 +316,6 @@
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\wrongcommentblock3.jpg"-"c:\tsu_icl_cod_03\wrongcommentblock3.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\zero-len-comment-1.gif"-"c:\tsu_icl_cod_03\zero-len-comment-1.gif"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\zero-len-comment-2.gif"-"c:\tsu_icl_cod_03\zero-len-comment-2.gif"
-"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\00000077.gif"-"c:\tsu_icl_cod_03\00000077.gif"
\ No newline at end of file
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\00000077.gif"-"c:\tsu_icl_cod_03\00000077.gif"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\secret.gif"-"c:\tsu_icl_cod_03\secret.gif"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\3178500m.tif"-"c:\tsu_icl_cod_03\3178500m.tif"
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/src/ICLCodecDefectTestStep.cpp
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/src/ICLCodecDefectTestStep.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/src/ICLCodecDefectTestStep.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -658,8 +658,10 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(RFbsSession::Connect());
//Open and load the file
TFileName fileName;
GetTestFileNameL(fileName, KCorruptPngFile);
@@ -692,6 +694,7 @@
void RPngDecodeFailureTest::Close()
{
+ RFbsSession::Disconnect();
delete iSourceData; iSourceData = NULL;
delete iScheduler; iScheduler = NULL;
iFileSession.Close();
@@ -763,7 +766,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -891,7 +894,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
// We expect to find these plugins
@@ -1071,7 +1074,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -1171,7 +1174,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -1267,7 +1270,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -1380,7 +1383,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -1496,7 +1499,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -1594,7 +1597,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -1970,7 +1973,7 @@
iListener = new (ELeave) CActiveListener;
iStatus = &iListener->iStatus;
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -2110,8 +2113,10 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KCommentJpg);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -2225,7 +2230,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -2334,7 +2339,7 @@
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -2795,7 +2800,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -2927,7 +2932,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -3081,7 +3086,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -3189,7 +3194,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -3359,7 +3364,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -3476,7 +3481,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -3582,7 +3587,7 @@
CleanupStack::PushL( iScheduler );
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
-
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -3689,8 +3694,9 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
iSourceBitmap = new (ELeave) CFbsBitmap;
iReferenceBitmap = new (ELeave) CFbsBitmap;
@@ -3826,11 +3832,13 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
+
iListener = new (ELeave) CActiveListener;
iStatus = &iListener->iStatus;
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
return (iTestStepResult=EPass);
}
@@ -4106,13 +4114,14 @@
iAS = new (ELeave) CActiveScheduler;
CActiveScheduler::Install(iAS);
-
+
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
+
iListener = new (ELeave) CActiveListener;
iStatus = &iListener->iStatus;
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
-
GetTestFileNameL(iSourceFile, KReductionFactorTestGif);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -4241,8 +4250,11 @@
CleanupStack::PushL( iScheduler );
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
+
return (iTestStepResult=EPass);
}
@@ -4347,8 +4359,10 @@
CleanupStack::PushL( iScheduler );
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
return (iTestStepResult=EPass);
}
@@ -4462,8 +4476,9 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
iSourceBitmap = new (ELeave) CFbsBitmap;
iReferenceBitmap = new (ELeave) CFbsBitmap;
@@ -4573,8 +4588,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KPeaceGifImage);
iSourceImage = new(ELeave) CFbsBitmap;
@@ -4707,8 +4723,9 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
iSourceBitmap = new (ELeave) CFbsBitmap;
iReferenceBitmap = new (ELeave) CFbsBitmap;
@@ -4830,8 +4847,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KJFIFWithThumbnailMbm);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -5016,7 +5034,8 @@
iListener = new (ELeave) CActiveListener;
iStatus = &iListener->iStatus;
-
+
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -5219,7 +5238,8 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KErrArgumentGif);
@@ -5309,8 +5329,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KPeaceGifImage);
iSourceImage = new(ELeave) CFbsBitmap;
@@ -5431,6 +5452,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -5532,6 +5554,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -5684,6 +5707,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -5776,6 +5800,7 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -5885,6 +5910,7 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -5986,8 +6012,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(iFileSession.Connect());
- User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFileCorrupt,KLzwStreamCorruptGif);
INFO_PRINTF2(_L("Source: %S"),&iSourceFileCorrupt);
@@ -6087,8 +6114,9 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KSmallFirstFrameGif);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -6218,8 +6246,9 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KSmallFirstFrameGif);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -6428,8 +6457,9 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KFrameGifSizeAnim);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -6715,8 +6745,9 @@
CActiveScheduler::Install( iScheduler );
CleanupStack::Pop(iScheduler);
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KCorruptRLEBitmap);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -6819,8 +6850,9 @@
iListener = new (ELeave) CActiveListener;
iStatus = &iListener->iStatus;
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KClockZeroSubBlockGif);
INFO_PRINTF2(_L("Source: %S"),&iSourceFile);
@@ -6913,8 +6945,9 @@
{
INFO_PRINTF1(_L("INC097489: SWSV_633_91_R6A01_Image: GIF 256 color picture \"Damaged\" after editing in Pic..."));
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
TFileName defaultPath = static_cast(iSuite)->DefaultPath();
TParse parse;
@@ -7226,6 +7259,7 @@
{
CActiveScheduler* iScheduler = new (ELeave) CActiveScheduler();
CActiveScheduler::Install(iScheduler);
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError( iFileSession.Connect() );
User::LeaveIfError( RFbsSession::Connect() );
iFbsConnected = ETrue;
@@ -7349,8 +7383,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KStreamFFFFJpg);
@@ -7448,8 +7483,11 @@
INFO_PRINTF1(_L("DEF099679: CImageDecoder::ReducedSize() does not check upper boundary"));
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
+
iSourceBitmap = new(ELeave) CFbsBitmap;
iDestnBitmap = new(ELeave) CFbsBitmap;
return iTestStepResult;
@@ -7701,8 +7739,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, K24BppPng);
i16MuBitmap = new(ELeave) CFbsBitmap;
@@ -7827,8 +7866,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(iFileSession.Connect());
- User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
return EPass;
}
@@ -7927,8 +7967,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, K24BppPng);
i16MxBitmap = new(ELeave) CFbsBitmap;
@@ -8080,8 +8121,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install(iScheduler);
- User::LeaveIfError(iFileSession.Connect());
- User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
return EPass;
}
@@ -8188,6 +8230,8 @@
INFO_PRINTF1(_L("PDEF111303 AQP: Coverity tool for ICL - FORWARD NULL Reference in ICL"));
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
GetTestFileNameL(iSourceFile, KCorruptWMFFile);
@@ -8261,8 +8305,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(iFileSession.Connect());
- User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
return EPass;
}
@@ -8352,8 +8397,9 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
iSourceBitmap = new(ELeave) CFbsBitmap;
iDestnBitmap = new(ELeave) CFbsBitmap;
@@ -8532,7 +8578,10 @@
INFO_PRINTF1(_L("PDEF111193: iDecoder = CImageDecoder::FileNewL(iFs, aFile); is slow"));
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
+
GetTestFileNameL(iSourceFile, KPerformanceEnhanceTestJPG);
return iTestStepResult;
}
@@ -8631,8 +8680,10 @@
INFO_PRINTF1(_L("PDEF112298: Mbm Bitmap is not encoded to JPEG correctly using CImageEncoder"));
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFs.Connect());
+
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFs.Connect());
iListener = new (ELeave) CActiveListener;
return iTestStepResult;
@@ -8827,8 +8878,9 @@
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFileSession.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFileSession.Connect());
return iTestStepResult;
}
@@ -8931,6 +8983,8 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -9468,6 +9522,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
@@ -9645,8 +9700,9 @@
TVerdict RTestStep_5104::OpenL()
{
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFs.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFs.Connect());
iScheduler = new(ELeave) CActiveScheduler();
CActiveScheduler::Install(iScheduler);
@@ -9744,8 +9800,9 @@
{
INFO_PRINTF1(_L("INC116806: Media files: Open image folder containing gif89 images results in a Main crash"));
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFs.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFs.Connect());
iScheduler = new(ELeave) CActiveScheduler();
CActiveScheduler::Install(iScheduler);
@@ -9872,6 +9929,7 @@
{
INFO_PRINTF1(_L("INC117891: 5.0 LWS: Browser crashes while loading the page"));
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFs.Connect());
@@ -9949,6 +10007,7 @@
{
INFO_PRINTF1(_L("PDEF123012: 5.0 :Browser crashes while loading the homepage for www.refdesk.com"));
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFs.Connect());
@@ -10050,8 +10109,9 @@
TVerdict RTestStep_5106::OpenL()
{
- User::LeaveIfError(RFbsSession::Connect());
- User::LeaveIfError(iFs.Connect());
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
+ User::LeaveIfError(iFs.Connect());
iScheduler = new(ELeave) CActiveScheduler();
CActiveScheduler::Install(iScheduler);
@@ -10135,6 +10195,7 @@
TVerdict RTestStep_5107::OpenL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFs.Connect());
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/TSU_ICL_COD_04.iby
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/TSU_ICL_COD_04.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/TSU_ICL_COD_04.iby Mon Aug 23 18:56:36 2010 +0100
@@ -23,7 +23,8 @@
REM Scripts
-data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_04.script \TSU_ICL_COD_04.script
+data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_04_part1.script \TSU_ICL_COD_04_part1.script
+data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_04_part2.script \TSU_ICL_COD_04_part2.script
data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_04_alloc.script \TSU_ICL_COD_04_alloc.script
data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_04b.script \TSU_ICL_COD_04b.script
data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_04.ini \TSU_ICL_COD_04.ini
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/bld.inf
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -33,7 +33,9 @@
../scripts/TSU_ICL_COD_04.ini c:/tsu_icl_cod_04.ini
// scripts
-../scripts/TSU_ICL_COD_04.script c:/tsu_icl_cod_04.script
+../scripts/TSU_ICL_COD_04_part1.script c:/tsu_icl_cod_04_part1.script
+../scripts/TSU_ICL_COD_04_part2.script c:/tsu_icl_cod_04_part2.script
+
../scripts/TSU_ICL_COD_04_alloc.script c:/tsu_icl_cod_04_alloc.script
../scripts/TSU_ICL_COD_04b.script c:/tsu_icl_cod_04b.script
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/tsu_icl_cod_04.pkg
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/tsu_icl_cod_04.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/tsu_icl_cod_04.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,15 +13,16 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSU_ICL_COD_04.dll"-"c:\sys\bin\TSU_ICL_COD_04.dll"
+"\epoc32\release\armv5\udeb\TSU_ICL_COD_04.dll"-"c:\sys\bin\TSU_ICL_COD_04.dll"
-\\ REM test scripts
-"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\scripts\TSU_ICL_COD_04.script"-"c:\TSU_ICL_COD_04.script"
+// REM test scripts
+"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\scripts\TSU_ICL_COD_04_part1.script"-"c:\TSU_ICL_COD_04_part1.script"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\scripts\TSU_ICL_COD_04_part2.script"-"c:\TSU_ICL_COD_04_part2.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\scripts\TSU_ICL_COD_04_alloc.script"-"c:\TSU_ICL_COD_04_alloc.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\scripts\TSU_ICL_COD_04b.script"-"c:\TSU_ICL_COD_04b.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\scripts\TSU_ICL_COD_04.ini"-"c:\TSU_ICL_COD_04.ini"
-\\ testfiles
+// testfiles
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\TestFiles\DecodeThumbnail.mbm"-"c:\tsu_icl_cod_04\decodethumbnail.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\TestFiles\EncodeTestSource.mbm"-"c:\tsu_icl_cod_04\encodetestsource.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\TestFiles\EncodeThumbnail.mbm"-"c:\tsu_icl_cod_04\encodethumbnail.mbm"
@@ -34,7 +35,7 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\TestFiles\TestCorruptThumbnailHeader.mbm"-"c:\tsu_icl_cod_04\testcorruptthumbnailheader.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_04\TestFiles\TestNoExifReference.mbm"-"c:\tsu_icl_cod_04\testnoexifreference.mbm"
-\\mm_testdata
+//mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_04\testfiles\1103018943-tazpvdft.jpg"-"c:\tsu_icl_cod_04\1103018943-tazpvdft.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_04\testfiles\1103018943-tazpvdft_ref.jpg"-"c:\tsu_icl_cod_04\1103018943-tazpvdft_ref.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_04\testfiles\289_8981100000300165521f.jpg"-"c:\tsu_icl_cod_04\289_8981100000300165521f.jpg"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/scripts/TSU_ICL_COD_04.script
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/scripts/TSU_ICL_COD_04.script Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1123 +0,0 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// ICL Codec Testing Scripts
-//
-//
-
-PRINT Run all the ICL codec tests
-PRINT
-
-LOAD_SUITE TSU_ICL_COD_04.dll
-
-// Decode tests
-//! @SYMTestCaseID MM-ICL-COD-U-0501-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0501-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0502-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0502-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0503-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0503-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0504-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0504-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0505-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0505-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0506-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0506-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0507-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0507-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0508-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0508-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0509-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0509-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0510-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0510-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0511-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0511-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0512-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0512-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0513-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0513-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0514-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0514-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0515-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0515-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0516-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0516-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0517-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0517-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0518-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0518-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0519-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0519-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// Encode tests
-
-//! @SYMTestCaseID MM-ICL-COD-U-0521-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0521-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0522-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0522-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0523-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0523-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0524-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0524-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0525-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0525-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0526-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0526-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0527-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0527-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0528-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0528-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0529-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0529-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0530-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0530-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0531-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0531-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0532-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0532-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0533-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0533-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0534-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0534-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0535-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0535-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0536-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0536-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0537-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0537-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-// Thumbnail tests
-
-//! @SYMTestCaseID MM-ICL-COD-U-0541-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0541-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0542-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0542-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0543-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0543-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0544-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0544-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0545-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0545-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0546-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0546-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// Transform tests
-
-//! @SYMTestCaseID MM-ICL-COD-U-0562-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0562-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0563-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0563-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0564-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0564-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0565-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0565-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0566-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0566-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0567-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0567-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0568-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0568-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0569-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0569-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0570-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0570-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0571-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0571-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0572-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0572-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0573-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0573-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0574-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0574-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0575-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0575-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0576-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0576-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0577-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0577-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0578-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0578-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0579-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0579-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0580-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0580-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0581-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0581-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0582-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0582-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0583-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0583-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0584-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0584-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0585-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0585-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0586-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0586-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0587-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0587-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0588-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0588-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0589-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0589-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0590-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0590-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-0591-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0591-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-// ExifUtility tests
-
-//! @SYMTestCaseID MM-ICL-COD-U-0601-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0601-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082361
-
-//! @SYMTestCaseID MM-ICL-COD-U-0602-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0602-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// INC059847
-
-//! @SYMTestCaseID MM-ICL-COD-U-1001-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1001-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// INC061409
-
-//! @SYMTestCaseID MM-ICL-COD-U-1002-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1002-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF072039
-
-//! @SYMTestCaseID MM-ICL-COD-U-1003-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1003-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//GPS IFD tests
-
-//! @SYMTestCaseID MM-ICL-COD-U-1101-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1101-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1102-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1102-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1103-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1103-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1104-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1104-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1105-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1105-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1106-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1106-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-//! @SYMTestCaseID MM-ICL-COD-U-1111-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1111-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1112-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1112-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1113-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1113-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1114-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1114-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1115-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1115-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-//! @SYMTestCaseID MM-ICL-COD-U-1121-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1121-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1122-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1122-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-//! @SYMTestCaseID MM-ICL-COD-U-1131-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1131-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1132-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1132-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1133-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1133-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1134-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1134-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1135-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1135-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-//! @SYMTestCaseID MM-ICL-COD-U-1141-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1141-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1142-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1142-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1143-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1143-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1144-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1144-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-//! @SYMTestCaseID MM-ICL-COD-U-1151-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1151-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1152-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1152-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1153-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1153-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1154-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1154-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//Exif CImageTransform Descriptor tests
-//! @SYMTestCaseID MM-ICL-COD-U-1161-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1161-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1162-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1162-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1163-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1163-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1164-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1164-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1165-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1165-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1166-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1166-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1167-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1167-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1168-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1168-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1169-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1169-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1170-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1170-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1171-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1171-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1172-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1172-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// 1173, 1174 & 1175 are for CancelTransform() which needs timeout
-//! @SYMTestCaseID MM-ICL-COD-U-1173-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1173-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1174-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1174-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1175-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1175-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1176-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1176-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1177-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1177-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-
-//GPS Misc
-//! @SYMTestCaseID MM-ICL-COD-U-1181-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1181-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1182-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1182-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF085006
-//! @SYMTestCaseID MM-ICL-COD-U-1183-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1183-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082163
-//! @SYMTestCaseID MM-ICL-COD-U-1184-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1184-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082163
-//! @SYMTestCaseID MM-ICL-COD-U-1185-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1185-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1186-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1186-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082161
-//! @SYMTestCaseID MM-ICL-COD-U-1187-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1187-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF083701
-// This test is for CancelTransform() which needs timeout
-//! @SYMTestCaseID MM-ICL-COD-U-1188-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1188-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF085007
-//! @SYMTestCaseID MM-ICL-COD-U-1189-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1189-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082166
-//! @SYMTestCaseID MM-ICL-COD-U-1190-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1190-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082166
-//! @SYMTestCaseID MM-ICL-COD-U-1191-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1191-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF085007
-//! @SYMTestCaseID MM-ICL-COD-U-1192-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1192-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF085007
-//! @SYMTestCaseID MM-ICL-COD-U-1193-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1193-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF085004
-//! @SYMTestCaseID MM-ICL-COD-U-1194-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1194-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082167
-//! @SYMTestCaseID MM-ICL-COD-U-1195-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1195-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082167
-//! @SYMTestCaseID MM-ICL-COD-U-1196-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1196-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF085002
-//! @SYMTestCaseID MM-ICL-COD-U-1197-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1197-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF085002
-//! @SYMTestCaseID MM-ICL-COD-U-1198-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1198-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-1199-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1199-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// JPEG ImageFrame
-
-//! @SYMTestCaseID MM-ICL-COD-U-2000-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2000-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2001-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2001-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2002-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2002-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2003-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2003-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2004-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2004-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2005-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2005-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2006-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2006-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2007-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2007-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2008-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2008-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2009-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2009-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2010-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2010-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2050-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2050-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2051-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2051-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2052-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2052-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2053-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2053-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2054-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2054-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2055-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2055-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2056-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2056-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2057-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2057-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2058-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2058-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2059-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2059-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-2060-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2060-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3001-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3001-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3002-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3002-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3003-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3003-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3004-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3004-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3005-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3005-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3006-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3006-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3007-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3007-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3008-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3008-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3009-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3009-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3010-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3010-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3011-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3011-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-4000-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4000-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-4001-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4001-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-4002-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4002-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-4003-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4003-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-4004-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4004-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-4005-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4005-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// INC083025
-
-//! @SYMTestCaseID MM-ICL-COD-U-3020-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3020-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3021-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3021-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3022-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3022-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3023-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3023-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF084849
-
-//! @SYMTestCaseID MM-ICL-COD-U-3024-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3024-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-// DEF082165
-
-//! @SYMTestCaseID MM-ICL-COD-U-3030-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3030-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3031-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3031-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3032-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3032-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF090653
-//! @SYMTestCaseID MM-ICL-COD-U-3033-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3033-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//PDEF085003: Exif Output file corrupt if JPEGInterchangeFormatLength tag not present
-//! @SYMTestCaseID MM-ICL-COD-U-3040-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3040-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3041-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3041-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF091418: T: Transforming a Nikon camera jpeg image returns KErrNotSupported.
-//! @SYMTestCaseID MM-ICL-COD-U-3042-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3042-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF091185: T: Exif data is added after the transform to an image which had no exif.
-//! @SYMTestCaseID MM-ICL-COD-U-3045-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3045-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//CR910: T: Images with partially corrupt EXIF data are opened and the non-corrupt data is retrieved
-//! @SYMTestCaseID MM-ICL-COD-U-3050-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3050-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-
-// CRPCUG-6SSBQ7: ICL CImageDecoder / CImageTransform option to skip EXIF metadata decoding.
-// Decoder option tests.
-//! @SYMTestCaseID MM-ICL-COD-U-3051-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3051-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-// Transform option tests.
-//! @SYMTestCaseID MM-ICL-COD-U-3052-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3052-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//INC101733: Behaviour of Exif transform with successive invalid tags is not as expected
-//! @SYMTestCaseID MM-ICL-COD-U-3053-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3053-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF101880: JPEG Encoder may produce distorted images
-//! @SYMTestCaseID MM-ICL-COD-U-3054-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3054-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//INC094070: RF Inconsistent file open mode with CImageTransform Exif JPEG plugin.
-//! @SYMTestCaseID MM-ICL-COD-U-1200-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1200-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//INC094070: RF Inconsistent file open mode with CImageTransform Exif JPEG plugin.
-//! @SYMTestCaseID MM-ICL-COD-U-1201-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1201-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//INC094070: RF Inconsistent file open mode with CImageTransform Exif JPEG plugin.
-//! @SYMTestCaseID MM-ICL-COD-U-1202-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1202-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//PDEF110735: JPEG Exif IFDs with 0 entries can cause invalid JPEG
-//! @SYMTestCaseID MM-ICL-COD-U-3055-HP
-
-RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3055-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//DEF110487: Decoding jpeg file with height of 17 pixels to image frame buffer errors with -9
-//! @SYMTestCaseID MM-ICL-COD-U-3056-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3056-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//PDEF128742:Image transform can not handle illegal exif when original image is to preserved
-//! @SYMTestCaseID MM-ICL-COD-U-3057-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3057-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//CR1329 tests : MM-ICL-COD-U-3060-HP to MM-ICL-COD-U-3063-HP
-//! @SYMTestCaseID MM-ICL-COD-U-3060-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3060-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3061-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3061-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3062-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3062-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-ICL-COD-U-3063-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3063-HP, c:\TSU_ICL_COD_04.ini
-TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/scripts/TSU_ICL_COD_04_part1.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/scripts/TSU_ICL_COD_04_part1.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,1090 @@
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// ICL Codec Testing Scripts
+//
+//
+
+PRINT Run all the ICL codec tests
+PRINT
+
+LOAD_SUITE TSU_ICL_COD_04.dll
+
+// Decode tests
+//! @SYMTestCaseID MM-ICL-COD-U-0501-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0501-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0502-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0502-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0503-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0503-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0504-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0504-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0505-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0505-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0506-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0506-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0507-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0507-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0508-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0508-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0509-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0509-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0510-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0510-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0511-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0511-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0512-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0512-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0513-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0513-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0514-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0514-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0515-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0515-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0516-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0516-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0517-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0517-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0518-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0518-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0519-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0519-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// Encode tests
+
+//! @SYMTestCaseID MM-ICL-COD-U-0521-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0521-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0522-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0522-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0523-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0523-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0524-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0524-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0525-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0525-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0526-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0526-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0527-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0527-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0528-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0528-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0529-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0529-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0530-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0530-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0531-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0531-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0532-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0532-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0533-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0533-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0534-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0534-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0535-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0535-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0536-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0536-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0537-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0537-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+// Thumbnail tests
+
+//! @SYMTestCaseID MM-ICL-COD-U-0541-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0541-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0542-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0542-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0543-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0543-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0544-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0544-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0545-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0545-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0546-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0546-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// Transform tests
+
+//! @SYMTestCaseID MM-ICL-COD-U-0562-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0562-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0563-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0563-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0564-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0564-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0565-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0565-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0566-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0566-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0567-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0567-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0568-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0568-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0569-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0569-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0570-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0570-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0571-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0571-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0572-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0572-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0573-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0573-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0574-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0574-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0575-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0575-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0576-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0576-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0577-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0577-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0578-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0578-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0579-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0579-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0580-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0580-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0581-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0581-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0582-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0582-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0583-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0583-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0584-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0584-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0585-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0585-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0586-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0586-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0587-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0587-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0588-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0588-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0589-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0589-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0590-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0590-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-0591-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0591-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+// ExifUtility tests
+
+//! @SYMTestCaseID MM-ICL-COD-U-0601-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0601-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082361
+
+//! @SYMTestCaseID MM-ICL-COD-U-0602-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-0602-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// INC059847
+
+//! @SYMTestCaseID MM-ICL-COD-U-1001-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1001-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// INC061409
+
+//! @SYMTestCaseID MM-ICL-COD-U-1002-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1002-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF072039
+
+//! @SYMTestCaseID MM-ICL-COD-U-1003-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1003-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//GPS IFD tests
+
+//! @SYMTestCaseID MM-ICL-COD-U-1101-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1101-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1102-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1102-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1103-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1103-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1104-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1104-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1105-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1105-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1106-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1106-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+//! @SYMTestCaseID MM-ICL-COD-U-1111-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1111-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1112-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1112-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1113-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1113-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1114-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1114-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1115-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1115-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+//! @SYMTestCaseID MM-ICL-COD-U-1121-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1121-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1122-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1122-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+//! @SYMTestCaseID MM-ICL-COD-U-1131-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1131-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1132-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1132-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1133-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1133-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1134-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1134-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1135-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1135-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+//! @SYMTestCaseID MM-ICL-COD-U-1141-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1141-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1142-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1142-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1143-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1143-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1144-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1144-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+//! @SYMTestCaseID MM-ICL-COD-U-1151-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1151-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1152-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1152-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1153-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1153-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1154-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1154-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//Exif CImageTransform Descriptor tests
+//! @SYMTestCaseID MM-ICL-COD-U-1161-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1161-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1162-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1162-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1163-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1163-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1164-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1164-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1165-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1165-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1166-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1166-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1167-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1167-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1168-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1168-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1169-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1169-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1170-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1170-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1171-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1171-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1172-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1172-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// 1173, 1174 & 1175 are for CancelTransform() which needs timeout
+//! @SYMTestCaseID MM-ICL-COD-U-1173-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1173-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1174-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1174-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1175-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1175-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1176-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1176-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1177-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1177-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+
+//GPS Misc
+//! @SYMTestCaseID MM-ICL-COD-U-1181-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1181-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1182-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1182-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF085006
+//! @SYMTestCaseID MM-ICL-COD-U-1183-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1183-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082163
+//! @SYMTestCaseID MM-ICL-COD-U-1184-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1184-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082163
+//! @SYMTestCaseID MM-ICL-COD-U-1185-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1185-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1186-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1186-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082161
+//! @SYMTestCaseID MM-ICL-COD-U-1187-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1187-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF083701
+// This test is for CancelTransform() which needs timeout
+//! @SYMTestCaseID MM-ICL-COD-U-1188-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-1188-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF085007
+//! @SYMTestCaseID MM-ICL-COD-U-1189-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1189-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082166
+//! @SYMTestCaseID MM-ICL-COD-U-1190-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1190-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082166
+//! @SYMTestCaseID MM-ICL-COD-U-1191-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1191-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF085007
+//! @SYMTestCaseID MM-ICL-COD-U-1192-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1192-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF085007
+//! @SYMTestCaseID MM-ICL-COD-U-1193-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1193-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF085004
+//! @SYMTestCaseID MM-ICL-COD-U-1194-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1194-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082167
+//! @SYMTestCaseID MM-ICL-COD-U-1195-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1195-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082167
+//! @SYMTestCaseID MM-ICL-COD-U-1196-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1196-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF085002
+//! @SYMTestCaseID MM-ICL-COD-U-1197-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1197-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF085002
+//! @SYMTestCaseID MM-ICL-COD-U-1198-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1198-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-1199-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1199-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// JPEG ImageFrame
+
+//! @SYMTestCaseID MM-ICL-COD-U-2000-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2000-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2001-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2001-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2002-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2002-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2003-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2003-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2004-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2004-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2005-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2005-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2006-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2006-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2007-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2007-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2008-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2008-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2009-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2009-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2010-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2010-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2050-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2050-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2051-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2051-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2052-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2052-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2053-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2053-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2054-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2054-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2055-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2055-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2056-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2056-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2057-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2057-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2058-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2058-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2059-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2059-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-2060-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-2060-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3001-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3001-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3002-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3002-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3003-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3003-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3004-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3004-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3005-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3005-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3006-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3006-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3007-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3007-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3008-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3008-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3009-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3009-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3010-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3010-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3011-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3011-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-4000-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4000-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-4001-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4001-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-4002-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4002-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-4003-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4003-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-4004-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4004-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-4005-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-4005-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// INC083025
+
+//! @SYMTestCaseID MM-ICL-COD-U-3020-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3020-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3021-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3021-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3022-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3022-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3023-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3023-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF084849
+
+//! @SYMTestCaseID MM-ICL-COD-U-3024-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3024-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+// DEF082165
+
+//! @SYMTestCaseID MM-ICL-COD-U-3030-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3030-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3031-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3031-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3032-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3032-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF090653
+//! @SYMTestCaseID MM-ICL-COD-U-3033-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3033-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//PDEF085003: Exif Output file corrupt if JPEGInterchangeFormatLength tag not present
+//! @SYMTestCaseID MM-ICL-COD-U-3040-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3040-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3041-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3041-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF091418: T: Transforming a Nikon camera jpeg image returns KErrNotSupported.
+//! @SYMTestCaseID MM-ICL-COD-U-3042-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3042-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF091185: T: Exif data is added after the transform to an image which had no exif.
+//! @SYMTestCaseID MM-ICL-COD-U-3045-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3045-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//CR910: T: Images with partially corrupt EXIF data are opened and the non-corrupt data is retrieved
+//! @SYMTestCaseID MM-ICL-COD-U-3050-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3050-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+
+// CRPCUG-6SSBQ7: ICL CImageDecoder / CImageTransform option to skip EXIF metadata decoding.
+// Decoder option tests.
+//! @SYMTestCaseID MM-ICL-COD-U-3051-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3051-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+// Transform option tests.
+//! @SYMTestCaseID MM-ICL-COD-U-3052-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3052-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//INC101733: Behaviour of Exif transform with successive invalid tags is not as expected
+//! @SYMTestCaseID MM-ICL-COD-U-3053-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3053-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF101880: JPEG Encoder may produce distorted images
+//! @SYMTestCaseID MM-ICL-COD-U-3054-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3054-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//INC094070: RF Inconsistent file open mode with CImageTransform Exif JPEG plugin.
+//! @SYMTestCaseID MM-ICL-COD-U-1200-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1200-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//INC094070: RF Inconsistent file open mode with CImageTransform Exif JPEG plugin.
+//! @SYMTestCaseID MM-ICL-COD-U-1201-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1201-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//INC094070: RF Inconsistent file open mode with CImageTransform Exif JPEG plugin.
+//! @SYMTestCaseID MM-ICL-COD-U-1202-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-1202-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//PDEF110735: JPEG Exif IFDs with 0 entries can cause invalid JPEG
+//! @SYMTestCaseID MM-ICL-COD-U-3055-HP
+
+RUN_TEST_STEP 60000, TSU_ICL_COD_04, MM-ICL-COD-U-3055-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/scripts/TSU_ICL_COD_04_part2.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/scripts/TSU_ICL_COD_04_part2.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,55 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// ICL Codec Testing Scripts
+//
+//
+
+PRINT Run all the ICL codec tests
+PRINT
+
+LOAD_SUITE TSU_ICL_COD_04.dll
+
+
+//PDEF128742:Image transform can not handle illegal exif when original image is to preserved
+//! @SYMTestCaseID MM-ICL-COD-U-3057-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3057-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//CR1329 tests : MM-ICL-COD-U-3060-HP to MM-ICL-COD-U-3063-HP
+//! @SYMTestCaseID MM-ICL-COD-U-3060-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3060-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3061-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3061-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3062-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3062-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-ICL-COD-U-3063-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3063-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
+
+//DEF110487: Decoding jpeg file with height of 17 pixels to image frame buffer errors with -9
+//! @SYMTestCaseID MM-ICL-COD-U-3056-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_04, MM-ICL-COD-U-3056-HP, c:\TSU_ICL_COD_04.ini
+TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/src/jpegperformance.cpp
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/src/jpegperformance.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/src/jpegperformance.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -64,6 +64,8 @@
mulCoef = 1.0;
break;
+
+
default:
{
User::Leave(KErrGeneral);
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/group/tsu_icl_exifimgdisp_01.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/group/tsu_icl_exifimgdisp_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/group/tsu_icl_exifimgdisp_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -15,7 +15,7 @@
"\epoc32\release\armv5\urel\tsu_icl_GenIclImgDisp_01.dll"-"c:\sys\bin\tsu_icl_GenIclImgDisp_01.dll"
-\\ REM test scripts
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\scripts\TSU_ICL_ExifImgDisp_01.script"-"c:\TSU_ICL_ExifImgDisp_01.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\scripts\TSU_ICL_ExifImgDisp_01_ALLOC.script"-"c:\TSU_ICL_ExifImgDisp_01_ALLOC.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\scripts\TSU_ICL_ExifImgDisp_01_Panic.script"-"c:\TSU_ICL_ExifImgDisp_01_Panic.script"
@@ -23,7 +23,7 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\scripts\TSU_ICL_GenIclImgDisp_01_Alloc.script"-"c:\TSU_ICL_GenIclImgDisp_01_Alloc.script"
-\\ testfiles
+// testfiles
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\TestFiles\ref\auto_rot_main.mbm"-"c:\tsu_icl_exifimgdisp_01\ref\auto_rot_main.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\TestFiles\ref\auto_rot_thumb.mbm"-"c:\tsu_icl_exifimgdisp_01\ref\auto_rot_thumb.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\TestFiles\ref\auto_rot_thumb1.mbm"-"c:\tsu_icl_exifimgdisp_01\ref\auto_rot_thumb1.mbm"
@@ -68,8 +68,19 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\TestFiles\ref\wmf3_8_Arm.mbm"-"c:\tsu_icl_exifimgdisp_01\ref\wmf3_8_arm.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\TestFiles\ref\wmf3_8_NE.mbm"-"c:\tsu_icl_exifimgdisp_01\ref\wmf3_8_ne.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_GenIclImgDisp_01\TestFiles\ref\wmf3_8_h6.mbm"-"c:\tsu_icl_exifimgdisp_01\ref\wmf3_8_h6.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\icoepoc.mbm"-"c:\icl\refimages\icoepoc.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\bmp8bpp_8.mbm"-"c:\icl\refimages\bmp8bpp_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\trans_1.mbm"-"c:\icl\refimages\trans_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\trans_1.mbm"-"c:\icl\refimages\trans_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\trans_8.mbm"-"c:\icl\refimages\trans_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\tif3_4.mbm"-"c:\icl\refimages\tif3_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\jfif444.mbm"-"c:\icl\refimages\jfif444.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\operator.mbm"-"c:\icl\refimages\operator.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\png4_8.mbm"-"c:\icl\refimages\png4_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imaginginttest\src\Data\sun.mbm"-"c:\icl\refimages\sun.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_03\TestFiles\WMFRef\DibPatternBrush.mbm"-"c:\tsu_icl_cod_03\wmfref\dibpatternbrush.mbm"
-\\ mm_testdata
+// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_1.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_1.jpeg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_2.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_2.jpeg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\auto_rot_3.jpeg"-"c:\tsu_icl_exifimgdisp_01\auto_rot_3.jpeg"
@@ -82,4 +93,19 @@
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\empty.jpeg"-"c:\tsu_icl_exifimgdisp_01\empty.jpeg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\genicl\anmatcat.gif"-"c:\tsu_icl_exifimgdisp_01\genicl\anmatcat.gif"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\genicl\clock.gif"-"c:\tsu_icl_exifimgdisp_01\genicl\clock.gif"
-"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\genicl\png2.png"-"c:\tsu_icl_exifimgdisp_01\genicl\png2.png"
\ No newline at end of file
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_geniclimgdisp_01\testfiles\genicl\png2.png"-"c:\tsu_icl_exifimgdisp_01\genicl\png2.png"
+
+// mm_testdata
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\icoepoc.ico"-"c:\icl\testimages\icoepoc.ico"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\bmp8bpp_8.bmp"-"c:\icl\testimages\bmp8bpp_8.bmp"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\trans_1.gif"-"c:\icl\testimages\trans_1.gif"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\trans_8.gif"-"c:\icl\testimages\trans_8.gif"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\tif3_4.tif"-"c:\icl\testimages\tif3_4.tif"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\jfif444.jpg"-"c:\icl\testimages\jfif444.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\clock.gif"-"c:\icl\testimages\clock.gif"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\operator.ota"-"c:\icl\testimages\operator.ota"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\png4_8.png"-"c:\icl\testimages\png4_8.png"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\sun.wbmp"-"c:\icl\testimages\sun.wbmp"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\src\data\wmf3_8.wmf"-"c:\icl\testimages\wmf3_8.wmf"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_03\testfiles\wmf\dibpatternbrush.wmf"-"c:\tsu_icl_cod_03\wmf\dibpatternbrush.wmf"
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/src/TestStepExifImageDisplay.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/src/TestStepExifImageDisplay.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/src/TestStepExifImageDisplay.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -594,6 +594,7 @@
TVerdict CTestStepImgDisplayGeneric::DoTestStepFbsL()
{
iLastError = KErrNone;
+ User::LeaveIfError(FbsStartup());
// [ connect to the bitmap server and check the error code]
User::LeaveIfError(RFbsSession::Connect());
iFbsConnection = ETrue;
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/src/TestSuiteExifImageDisplay.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/src/TestSuiteExifImageDisplay.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/src/TestSuiteExifImageDisplay.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -172,6 +172,7 @@
*/
void CTestSuiteExifImageDisplay::InitialiseL( )
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError( RFbsSession::Connect() );
iFBSSession = ETrue;
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/group/tsu_icl_mngimgdisp_01.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/group/tsu_icl_mngimgdisp_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/group/tsu_icl_mngimgdisp_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and\or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// 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".
+// at the URL "http:\\www.eclipse.org\legal\epl-v10.html".
//
// Initial Contributors:
// Nokia Corporation - initial contribution.
@@ -15,16 +15,79 @@
"\epoc32\release\armv5\urel\TSU_ICL_MngImgDisp_01.dll"-"c:\sys\bin\TSU_ICL_MngImgDisp_01.dll"
-\\REM Scripts
+//REM Scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\scripts\TSU_ICL_MngImgDisp_01.script"-"c:\TSU_ICL_MngImgDisp_01.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\scripts\TSU_ICL_MngImgDisp_01_ALLOC.script"-"c:\TSU_ICL_MngImgDisp_01_ALLOC.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\scripts\TSU_ICL_MngImgDisp_01_Panic.script"-"c:\TSU_ICL_MngImgDisp_01_Panic.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\scripts\TSU_ICL_MngIclDecoder_01.script"-"c:\TSU_ICL_MngIclDecoder_01.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\scripts\TSU_ICL_MngIclDecoder_01_Alloc.script"-"c:\TSU_ICL_MngIclDecoder_01_Alloc.script"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\scripts\TSU_ICL_MngIclDecoder_NoLoop.script"-"c:\TSU_ICL_MngIclDecoder_NoLoop.script"
-\\ mm_testdata
+// testdata
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_0.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_0.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_4.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_5.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_5.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_6.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_6.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_7.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_7.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_8.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\digit_9.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\digit_9.mbm"
+
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_4.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_5.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_5.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_6.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_6.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_7.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_7.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_8.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram1_9.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram1_9.mbm"
+
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_black.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_black.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_4.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_6.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_6.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_7.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_7.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_8.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_8.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_10.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_10.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_11.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_11.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram3_12.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram3_12.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram4_4.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram4_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\fram4_6.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\fram4_6.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\no_any_bg_frame_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\no_any_bg_frame_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\no_any_bg_mask_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\no_any_bg_mask_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\no_any_bg_frame_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\no_any_bg_frame_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\no_any_bg_mask_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\no_any_bg_mask_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\no_any_bg_frame_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\no_any_bg_frame_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\no_any_bg_mask_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\no_any_bg_mask_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\advisory_bg_frame_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\advisory_bg_frame_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\advisory_bg_mask_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\advisory_bg_mask_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\advisory_bg_frame_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\advisory_bg_frame_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\advisory_bg_mask_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\advisory_bg_mask_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\advisory_bg_frame_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\advisory_bg_frame_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\advisory_bg_mask_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\advisory_bg_mask_3.mbm"
+
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_frame_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_frame_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_mask_1.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_mask_1.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_frame_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_frame_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_mask_2.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_mask_2.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_frame_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_frame_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_mask_3.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_mask_3.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_frame_4.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_frame_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_mask_4.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_mask_4.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_frame_5.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_frame_5.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_mask_5.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_mask_5.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_frame_6.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_frame_6.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_mask_6.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_mask_6.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_frame_7.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_frame_7.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\subframes_mask_7.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\subframes_mask_7.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_MngImgDisp_01\TestFiles\ref\flag3col.mbm"-"c:\tsu_icl_mngimgdisp_01\ref\flag3col.mbm"
+
+// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\24bit.mng"-"c:\tsu_icl_mngimgdisp_01\24bit.mng"
-"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\advisory_bg.mng"-"c:\tsu_icl_mngimgdisp_01\advisory_bg.mng:"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\advisory_bg.mng"-"c:\tsu_icl_mngimgdisp_01\advisory_bg.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\back-invalidlength.mng"-"c:\tsu_icl_mngimgdisp_01\back-invalidlength.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\back-invalidoptions.mng"-"c:\tsu_icl_mngimgdisp_01\back-invalidoptions.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\basi.mng"-"c:\tsu_icl_mngimgdisp_01\basi.mng"
@@ -35,7 +98,7 @@
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\endl-withoutloop-negative.mng"-"c:\tsu_icl_mngimgdisp_01\endl-withoutloop-negative.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\flag3col.mng"-"c:\tsu_icl_mngimgdisp_01\flag3col.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\forclippingfram1.mng"-"c:\tsu_icl_mngimgdisp_01\forclippingfram1.mng"
-"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\forclippingfram1.mng"-"z:\resource\forclippingfram1.mng"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\forclippingfram1.mng"-"c:\resource\forclippingfram1.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\fram1.mng"-"c:\tsu_icl_mngimgdisp_01\fram1.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\fram2.mng"-"c:\tsu_icl_mngimgdisp_01\fram2.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mngimgdisp_01\testfiles\fram3.mng"-"c:\tsu_icl_mngimgdisp_01\fram3.mng"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/src/TestStepMngImageDisplay.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/src/TestStepMngImageDisplay.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/src/TestStepMngImageDisplay.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -85,6 +85,7 @@
if (!iFbsConnection)
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
iFbsConnection = ETrue;
}
@@ -119,7 +120,7 @@
//[ Destroy the scheduler ]
delete iScheduler ;
iScheduler = NULL;
-
+ RFbsSession::Disconnect();
// [ umark the heap which was marked in preamble ]
__MM_HEAP_MARKEND;
@@ -572,6 +573,7 @@
// [ connect to the bitmap server and check the error code]
if (!iFbsConnection)
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
iFbsConnection = ETrue;
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/src/TestSuiteMngImageDisplay.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/src/TestSuiteMngImageDisplay.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/src/TestSuiteMngImageDisplay.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -291,6 +291,7 @@
*/
void CTestSuiteMngImageDisplay::InitialiseL( )
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError( RFbsSession::Connect() );
iFBSSession = ETrue;
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/group/tsu_icl_btrans_01.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/group/tsu_icl_btrans_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/group/tsu_icl_btrans_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,18 +13,18 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSU_ICL_BTRANS_01.dll"-"c:\sys\bin\TSU_ICL_BTRANS_01.dll"
+"\epoc32\release\armv5\udeb\TSU_ICL_BTRANS_01.dll"-"c:\sys\bin\TSU_ICL_BTRANS_01.dll"
-\\ REM test scripts
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_btrans_01\scripts\TSU_ICL_BTRANS_01.script"-"c:\TSU_ICL_BTRANS_01.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_btrans_01\scripts\TSU_ICL_BTRANS_01_ALLOC.script"-"c:\TSU_ICL_BTRANS_01_ALLOC.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_btrans_01\scripts\TSU_ICL_BTRANS_01_Panic.script"-"c:\TSU_ICL_BTRANS_01_Panic.script"
-\\ mm_testdata
+// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_btrans_01\testfiles\bmp8bpp_8.bmp"-"c:\btrans\bmp8bpp_8.bmp"
-\\ test files
+// test files
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_btrans_01\TestFiles\EColor16IclBtrans.mbm"-"c:\ecolor16iclbtrans.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_btrans_01\TestFiles\EColor16MIclBtrans.mbm"-"c:\ecolor16miclbtrans.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_btrans_01\TestFiles\EColor16MUIclBtrans.mbm"-"c:\ecolor16muiclbtrans.mbm"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/scripts/TSU_ICL_BTRANS_01_ALLOC.script
--- a/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/scripts/TSU_ICL_BTRANS_01_ALLOC.script Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/scripts/TSU_ICL_BTRANS_01_ALLOC.script Mon Aug 23 18:56:36 2010 +0100
@@ -27,12 +27,6 @@
TEST_COMPLETE
//
-//! @SYMTestCaseID MM-ICL-BTRANS-U-032-HP
-
-RUN_TEST_STEP -1, TSU_ICL_BTRANS_01, MM-ICL-BTRANS-U-032-HP
-TEST_COMPLETE
-
-//
//! @SYMTestCaseID MM-ICL-BTRANS-U-033-HP
RUN_TEST_STEP -1, TSU_ICL_BTRANS_01, MM-ICL-BTRANS-U-033-HP
@@ -46,3 +40,11 @@
RUN_TEST_STEP -1, TSU_ICL_BTRANS_01, MM-ICL-BTRANS-U-305-HP
TEST_COMPLETE
+
+//
+//! @SYMTestCaseID MM-ICL-BTRANS-U-032-HP
+
+RUN_TEST_STEP -1, TSU_ICL_BTRANS_01, MM-ICL-BTRANS-U-032-HP
+TEST_COMPLETE
+
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/src/TestStepBitmapTransforms.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/src/TestStepBitmapTransforms.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/src/TestStepBitmapTransforms.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -120,6 +120,7 @@
if (iConnectToFbs)
{
+ User::LeaveIfError(FbsStartup());
// [ connect to the bitmap server and check the error code]
TInt errCode = RFbsSession::Connect();
if( errCode != KErrNone )
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_cod_01/group/tsu_icl_cod_01.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_01/group/tsu_icl_cod_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_01/group/tsu_icl_cod_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,9 +13,9 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSU_ICL_COD_01.dll"-"c:\sys\bin\TSU_ICL_COD_01.dll"
+"\epoc32\release\armv5\udeb\TSU_ICL_COD_01.dll"-"c:\sys\bin\TSU_ICL_COD_01.dll"
-\\ REM test scripts
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_01\scripts\TSU_ICL_COD_01.script"-"c:\TSU_ICL_COD_01.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_01\scripts\TSU_ICL_COD_01_alloc.script"-"c:\TSU_ICL_COD_01_alloc.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_01\scripts\TSU_ICL_COD_01b_alloc.script"-"c:\TSU_ICL_COD_01b_alloc.script"
@@ -24,7 +24,7 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_01\scripts\TSU_ICL_COD_01.ini"-"c:\TSU_ICL_COD_01.ini"
-\\ TImage test files
+// TImage test files
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_01\timagetestfiles\mbm12bpp_8.mbm"-"c:\timage\mbm12bpp_8.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_01\timagetestfiles\mbm16bpp_1.mbm"-"c:\timage\mbm16bpp_1.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_01\timagetestfiles\mbm1bpp_2.mbm"-"c:\timage\mbm1bpp_2.mbm"
@@ -118,7 +118,7 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_01\timagetestfiles\ref\qvga_exif_thumb.mbm"-"c:\timage\ref\qvga_exif_thumb.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_01\timagetestfiles\ref\qvga_jfif_thumb.mbm"-"c:\timage\ref\qvga_jfif_thumb.mbm"
-\\ mm_testadta
+// mm_testadta
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_01\timagetestfiles\16bpp555.bmp"-"c:\timage\bmp\16bpp555.bmp"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_01\timagetestfiles\16bpp565.bmp"-"c:\timage\bmp\16bpp565.bmp"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_01\timagetestfiles\16bpp565_badmask.bmp"-"c:\timage\bmp\16bpp565_badmask.bmp"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_cod_01/scripts/TSU_ICL_COD_01b_alloc.script
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_01/scripts/TSU_ICL_COD_01b_alloc.script Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_01/scripts/TSU_ICL_COD_01b_alloc.script Mon Aug 23 18:56:36 2010 +0100
@@ -33,12 +33,6 @@
RUN_TEST_STEP -1, TSU_ICL_COD_01, MM-ICL-COD-U-10d1-HP, TSU_ICL_COD_01.ini
TEST_COMPLETE
-// alloc tests for decode using extensions (Image19)
-// On HW this is SMOKE_TEST testing one randomly selected file.
-//! @SYMTestCaseID MM-ICL-COD-U-1081-HP
-
-RUN_TEST_STEP -1, TSU_ICL_COD_01, MM-ICL-COD-U-1081-HP, TSU_ICL_COD_01.ini
-TEST_COMPLETE
// alloc tests for decode for codec without extensions (Image20)
//! @SYMTestCaseID MM-ICL-COD-U-1082-HP
@@ -63,3 +57,10 @@
RUN_TEST_STEP -1, TSU_ICL_COD_01, MM-ICL-COD-U-1085-HP, TSU_ICL_COD_01.ini
TEST_COMPLETE
+
+// alloc tests for decode using extensions (Image19)
+// On HW this is SMOKE_TEST testing one randomly selected file.
+//! @SYMTestCaseID MM-ICL-COD-U-1081-HP
+
+RUN_TEST_STEP -1, TSU_ICL_COD_01, MM-ICL-COD-U-1081-HP, TSU_ICL_COD_01.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/TSU_ICL_COD_02.iby
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/TSU_ICL_COD_02.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/TSU_ICL_COD_02.iby Mon Aug 23 18:56:36 2010 +0100
@@ -19,6 +19,7 @@
REM Test code
file=ABI_DIR\DEBUG_DIR\TSU_ICL_COD_02.dll System\Libs\TSU_ICL_COD_02.dll
+file=ABI_DIR\DEBUG_DIR\tsu_icl_cod_02_recog.dll System\Libs\tsu_icl_cod_02_recog.dll
REM Scripts
@@ -26,14 +27,5 @@
data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_02_Recog.script \TSU_ICL_COD_02_Recog.script
data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_02_Recog_ALLOC.script \TSU_ICL_COD_02_Recog_ALLOC.script
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\wolf.mbm \tsu_icl_cod_02\wolf.mbm
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\a.txt \tsu_icl_cod_02\a.txt
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\b.txt \tsu_icl_cod_02\b.txt
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\g.txt \tsu_icl_cod_02\g.txt
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\gif.txt \tsu_icl_cod_02\gif.txt
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\i.txt \tsu_icl_cod_02\i.txt
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\m.txt \tsu_icl_cod_02\m.txt
-data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\r.txt \tsu_icl_cod_02\r.txt
-
#endif __TSU_ICL_COD_02_IBY__
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/tsu_icl_cod_02.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/tsu_icl_cod_02.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/tsu_icl_cod_02.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and\or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// 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".
+// at the URL "http:\\www.eclipse.org\legal\epl-v10.html".
//
// Initial Contributors:
// Nokia Corporation - initial contribution.
@@ -13,15 +13,28 @@
// Description:
//
-"\epoc32\release\armv5\urel\tsu_icl_cod_02.dll"-"c:\sy\bin\tsu_icl_cod_02.dll"
-"\epoc32\release\armv5\urel\tsu_icl_cod_02_recog.dll"-"c:\sys\bin\tsu_icl_cod_02_recog.dll"
+"\epoc32\release\armv5\udeb\tsu_icl_cod_02.dll"-"c:\sys\bin\tsu_icl_cod_02.dll"
+"\epoc32\release\armv5\udeb\tsu_icl_cod_02_recog.dll"-"c:\sys\bin\tsu_icl_cod_02_recog.dll"
+"\epoc32\release\armv5\udeb\TestFrameworkRecognizer.exe"-"c:\TestFrameworkRecognizer.exe"
-\\ REM test scripts
+
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_02\scripts\TSU_ICL_COD_02.script"-"c:\TSU_ICL_COD_02.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_02\scripts\TSU_ICL_COD_02_Recog.script"-"c:\TSU_ICL_COD_02_Recog.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_COD_02\scripts\TSU_ICL_COD_02_Recog_ALLOC.script"-"c:\TSU_ICL_COD_02_Recog_ALLOC.script"
-\\ mm_testdata
+// testdata
+
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\wolf.mbm"-"c:\tsu_icl_cod_02\wolf.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\A.txt"-"c:\tsu_icl_cod_02\a.txt"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\B.txt"-"c:\tsu_icl_cod_02\b.txt"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\G.txt"-"c:\tsu_icl_cod_02\g.txt"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\Gif.txt"-"c:\tsu_icl_cod_02\gif.txt"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\I.txt"-"c:\tsu_icl_cod_02\i.txt"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\M.txt"-"c:\tsu_icl_cod_02\m.txt"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_cod_02\TestFiles\R.txt"-"c:\tsu_icl_cod_02\r.txt"
+
+// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_02\testfiles\00000064.png"-"c:\icl\validation\png\00000064.png"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_02\testfiles\00000316.png"-"c:\icl\validation\png\00000316.png"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_cod_02\testfiles\bmp1bpp_1.bmp"-"c:\tsu_icl_cod_02\bmp1bpp_1.bmp"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_cod_02/src/ICLCodecTestStep.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/src/ICLCodecTestStep.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/src/ICLCodecTestStep.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -221,6 +221,12 @@
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
return verdict;
}
@@ -228,10 +234,17 @@
{
delete iScheduler;
iScheduler = NULL;
+ RFbsSession::Disconnect();
}
TVerdict RPngWriteCodecTest::DoTestStepL()
{
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
switch (iPngTestId)
{
case ECOD_0201:
@@ -1005,6 +1018,7 @@
TPtrC file22(KFile22);
RFs fSession;
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(fSession.Connect());
CleanupClosePushL(fSession);
@@ -1412,6 +1426,12 @@
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install(iScheduler);
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
return verdict;
}
@@ -1419,6 +1439,7 @@
{
delete iScheduler;
iScheduler = NULL;
+ RFbsSession::Disconnect();
}
void RPngWriteSubCodecTest::SetTestFileNameL(TDes& aFileName, const TDesC& aPathNameAndExtn) const
@@ -2004,6 +2025,12 @@
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
// Connect to file server
User::LeaveIfError(iFs.Connect());
@@ -2129,6 +2156,7 @@
iPluginData[cnt].iInfoStrings.Reset();
iPluginData.Reset();
iFs.Close();
+ RFbsSession::Disconnect();
delete iScheduler;
}
@@ -2434,6 +2462,13 @@
// [Pop iScheduler ]
CleanupStack::Pop( iScheduler);
+// User::LeaveIfError(FbsStartup());
+// TInt errCode = RFbsSession::Connect();
+// if( errCode != KErrNone)
+// {
+// INFO_PRINTF1(_L("Shiva 5"));
+// User::LeaveIfError(errCode);
+// }
// Connect to file server
User::LeaveIfError(iFs.Connect());
@@ -2508,8 +2543,14 @@
__UHEAP_FAILNEXT(failCount);
__MM_HEAP_MARK;
+ User::LeaveIfError(FbsStartup());
err = RFbsSession::Connect();
-
+ if( err != KErrNone)
+ {
+
+ User::LeaveIfError(err);
+ }
+
if (err == KErrNone)
{
TRAP(err, VerifyMimeTypesL(iFileName, mimeType, confidenceLevel));
@@ -2604,6 +2645,12 @@
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
// Connect to file server
User::LeaveIfError(iFs.Connect());
@@ -2623,6 +2670,7 @@
{
iFileNames.Reset();
iFs.Close();
+ RFbsSession::Disconnect();
delete iScheduler;
}
@@ -2731,6 +2779,12 @@
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
// Connect to file server
User::LeaveIfError(iFs.Connect());
@@ -2740,6 +2794,7 @@
void RRecogNonStandardMimeTest::Close()
{
iFs.Close();
+ RFbsSession::Disconnect();
delete iScheduler;
}
@@ -2774,6 +2829,12 @@
iTestStepResult = EPass;
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
// Connect to file server
User::LeaveIfError(iFs.Connect());
return iTestStepResult;
@@ -2782,6 +2843,7 @@
void RRecogNonStandardWBMTest::Close()
{
iFs.Close();
+ RFbsSession::Disconnect();
delete iScheduler;
}
@@ -2933,6 +2995,12 @@
iTestStepResult = EPass;
iScheduler = new(ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
// Connect to file server
User::LeaveIfError(iFs.Connect());
return iTestStepResult;
@@ -2941,6 +3009,7 @@
void RRecogNonStandardWMFTest::Close()
{
iFs.Close();
+ RFbsSession::Disconnect();
delete iScheduler;
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/group/tsu_icl_frm_01.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/group/tsu_icl_frm_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/group/tsu_icl_frm_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,7 +13,7 @@
// Description:
//
-"\epoc32\release\armv5\urel\tsu_icl_frm_01.dll"-"c:\sys\bin\tsu_icl_frm_01.dll"
+"\epoc32\release\armv5\udeb\tsu_icl_frm_01.dll"-"c:\sys\bin\tsu_icl_frm_01.dll"
//REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_frm_01\scripts\TSU_ICL_FRM_01.script"-"c:\TSU_ICL_FRM_01.script"
@@ -36,6 +36,7 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_frm_01\TestFiles\Image.content"-"c:\tsu_icl_frm_01\Image.content"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_frm_01\TestFiles\Image.contentrights"-"c:\tsu_icl_frm_01\Image.contentrights"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_frm_01\TestFiles\operator.mbm"-"c:\tsu_icl_frm_01\operator.mbm"
+"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_frm_01\TestFiles\operator.otb"-"c:\tsu_icl_frm_01\operator.otb"
// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\clock.gif"-"c:\tsu_icl_frm_01/clock.gif"
@@ -43,7 +44,7 @@
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\gif87a.gif"-"c:/tsu_icl_frm_01/gif87a.gif"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\jfif422_4_ref.jpg"-"c:/tsu_icl_frm_01/jfif422_4_ref.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\jfif444.jpg"-"c:/tsu_icl_frm_01/jfif444.jpg"
-"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\jfif444.jpg"-"z:/resource/jfif444.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\jfif444.jpg"-"c:/resource/jfif444.jpg"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\png24bpp_1.png"-"c:/tsu_icl_frm_01/png24bpp_1.png"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\png4_8.png"-"c:/tsu_icl_frm_01/png4_8.png"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_frm_01\testfiles\simple_b.mng"-"c:/tsu_icl_frm_01/simple_b.mng"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/BufferedImageDecoderTest.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/BufferedImageDecoderTest.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/BufferedImageDecoderTest.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -70,6 +70,7 @@
void RCBufferedImageDecoderDecodeTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -265,6 +266,7 @@
void RCBufferedImageDecoderFunctionTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ICLFrameWorkTestStep.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ICLFrameWorkTestStep.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ICLFrameWorkTestStep.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -2470,6 +2470,7 @@
void RCImageDecoderPrivDecodeTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -2834,6 +2835,7 @@
void RCImageDecoderPrivCustomTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -3488,6 +3490,7 @@
void RCImageDecoderPrivAsyncDecodeTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -3702,6 +3705,7 @@
{
// don't need to push this to cleanup stack because we should
// always call Cleanup() if this function leaves
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
iSourceDataPtr.SetLength(0);
@@ -3850,6 +3854,7 @@
void RCImageEncoderAsyncEncodeTest::TestStepL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
iImageEncoder = CImageEncoder::DataNewL(
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageDecoderDRM.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageDecoderDRM.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageDecoderDRM.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -378,6 +378,7 @@
*/
TVerdict RTImageOpenAndDecode::OpenL()
{
+ User::LeaveIfError(FbsStartup());
TInt err = RFbsSession::Connect();
if (err != KErrNone)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageDecoderTest.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageDecoderTest.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageDecoderTest.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -141,6 +141,7 @@
void RCImageDecoderDecodeTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -438,6 +439,7 @@
void RCImageDecoderIntentTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -1247,6 +1249,7 @@
TVerdict RCImageDecoderMaskDecodeTest::OpenL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -1391,6 +1394,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -1522,6 +1526,7 @@
TMMFileSource fs(iFileName);
TInt err;
CImageDecoder* imageDecoder = NULL;
+ User::LeaveIfError(FbsStartup());
TInt error = RFbsSession::Connect();
if (error != KErrNone)
{
@@ -1709,6 +1714,13 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install(iScheduler);
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(iFileSession.Connect());
+ TInt error = RFbsSession::Connect();
+ if (error != KErrNone)
+ {
+ return EInconclusive;
+ }
if (iThreaded)
{
iOptions = CImageDecoder::EOptionAlwaysThread;
@@ -1717,7 +1729,7 @@
INFO_PRINTF2(_L("Testing PNG plugin: Implementation Uid = 0x%X"), KPNGDecoder);
// Check that the test file is there.
- User::LeaveIfError(iFileSession.Connect());
+
if (!CheckForFile(iFileSession, KTestPNGFile))
{
iTestStepResult = EFail;
@@ -2222,11 +2234,11 @@
TVerdict RFwExtDecSupportedTest::OpenL()
{
- User::LeaveIfError(RFbsSession::Connect());
-
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install(iScheduler);
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError(RFbsSession::Connect());
User::LeaveIfError(iFileSession.Connect());
if(iThreaded)
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageEncoderPrivTest.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageEncoderPrivTest.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageEncoderPrivTest.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -80,6 +80,7 @@
void RCImageEncoderPrivEncodeTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -216,6 +217,7 @@
void RCImageEncoderPrivCustomTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageEncoderTest.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageEncoderTest.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageEncoderTest.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -95,6 +95,7 @@
void RCImageEncoderEncodeTest::SetupL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -324,6 +325,7 @@
if(iTestNumber == 3)
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -390,6 +392,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -887,6 +890,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install(iScheduler);
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -1362,6 +1366,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -1462,6 +1467,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -1570,6 +1576,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
@@ -1649,6 +1656,7 @@
iScheduler = new (ELeave) CActiveScheduler;
CActiveScheduler::Install( iScheduler );
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(iFileSession.Connect());
User::LeaveIfError(RFbsSession::Connect());
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageProcessorTest.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageProcessorTest.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/src/ImageProcessorTest.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -54,6 +54,7 @@
TVerdict RCImageProcessorUtilityTest::OpenL()
{
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
iTestData.Reset();
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_gscal_01/src/TestStepGifscaler.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_gscal_01/src/TestStepGifscaler.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_gscal_01/src/TestStepGifscaler.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -131,7 +131,7 @@
{
//[ mark the heap and unmark at the end of postamble ]
__MM_HEAP_MARK;
-
+ User::LeaveIfError(FbsStartup());
// [ connect to the bitmap server and check the error code]
TInt errCode = RFbsSession::Connect();
if( errCode != KErrNone )
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_imageframe/group/tsu_icl_imageframe.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_imageframe/group/tsu_icl_imageframe.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_imageframe/group/tsu_icl_imageframe.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,7 +13,7 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSU_ICL_ImageFrame.dll"-"c:\sys\bin\TSU_ICL_ImageFrame.dll"
+"\epoc32\release\armv5\udeb\TSU_ICL_ImageFrame.dll"-"c:\sys\bin\TSU_ICL_ImageFrame.dll"
// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_imageframe\scripts\TSU_ICL_ImageFrame.script"-"c:\TSU_ICL_ImageFrame.script"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/group/tsu_icl_imgdisp_01.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/group/tsu_icl_imgdisp_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/group/tsu_icl_imgdisp_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,19 +13,19 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSU_ICL_ImgDisp_01.dll"-"c:\sys\bin\TSU_ICL_ImgDisp_01.dll"
+"\epoc32\release\armv5\udeb\TSU_ICL_ImgDisp_01.dll"-"c:\sys\bin\TSU_ICL_ImgDisp_01.dll"
-\\ REM test scripts
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_imgdisp\scripts\TSU_ICL_ImgDisp_01.script"-"c:\TSU_ICL_ImgDisp_01.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_imgdisp\scripts\TSU_ICL_ImgDisp_01_ALLOC.script"-"c:\TSU_ICL_ImgDisp_01_ALLOC.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_imgdisp\scripts\TSU_ICL_ImgDisp_01_Panic.script"-"c:\TSU_ICL_ImgDisp_01_Panic.script"
-\\ mm_testdata
+// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_imgdisp\testfiles\empty.mng"-"c:\tsu_icl_imgdisp_01\empty.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_imgdisp\testfiles\simple_b.mng"-"c:\tsu_icl_imgdisp_01\simple_b.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_imgdisp\testfiles\wolf.jpg"-"c:\tsu_icl_imgdisp_01\wolf.jpg"
-\\testfiles
+//testfiles
"\sf\os\\mm\imagingandcamerafws\imagingunittest\tsu_icl_imgdisp\TestFiles\ImgDispl.content"-"c:\tsu_icl_imgdisp_01\ImgDispl.content"
"\sf\os\\mm\imagingandcamerafws\imagingunittest\tsu_icl_imgdisp\TestFiles\ImgDispl.contentrights"-"c:\tsu_icl_imgdisp_01\ImgDispl.content"
"\sf\os\\mm\imagingandcamerafws\imagingunittest\tsu_icl_imgdisp\TestFiles\dummy.idp"-"c:\tsu_icl_imgdisp_01\dummy.idp"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/src/TestStepImageDisplay.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/src/TestStepImageDisplay.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/src/TestStepImageDisplay.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -83,6 +83,8 @@
//[ mark the heap and unmark at the end of postamble ]
__MM_HEAP_MARK;
+ User::LeaveIfError(FbsStartup());
+ User::LeaveIfError( RFbsSession::Connect() );
iScheduler = new(ELeave)CActiveScheduler;
//[ push the scheduler on the stack ]
CleanupStack::PushL( iScheduler );
@@ -410,6 +412,7 @@
{
// [ connect to the bitmap server and check the error code]
+ User::LeaveIfError(FbsStartup());
User::LeaveIfError(RFbsSession::Connect());
iFbsConnection = ETrue;
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/src/TestSuiteImageDisplay.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/src/TestSuiteImageDisplay.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/src/TestSuiteImageDisplay.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -675,7 +675,6 @@
*/
void CTestSuiteImageDisplay::InitialiseL( )
{
- User::LeaveIfError( RFbsSession::Connect() );
iFBSSession = ETrue;
//[ set the default path ]
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/group/tsu_icl_itfm_01.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/group/tsu_icl_itfm_01.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/group/tsu_icl_itfm_01.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,12 +13,7 @@
// Description:
//
-"\epoc32\release\armv5\urel\TSU_ICL_ITFM_01.dll"-"c:\sys\bin\TSU_ICL_ITFM_01.dll"
-"\epoc32\release\armv5\urel\TestTransformerExt.dll"-"c:\sys\bin\TestTransformerExt.dll"
-"\epoc32\release\armv5\urel\testtransformer.dll"-"c:\sys\bin\testtransformer.dll"
-
-
-// REM Scripts
-"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_ITFM_01\scripts\TSU_ICL_ITFM_01_nocap.script "-"c:\TSU_ICL_ITFM_01_nocap.script "
-"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_ITFM_01\scripts\TSU_ICL_ITFM_01_nocap_ALLOC.script "-"c:\TSU_ICL_ITFM_01_nocap_ALLOC.script "
-"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_ITFM_01\scripts\TSU_ICL_ITFM_01_panic_nocap.script"-"c:\TSU_ICL_ITFM_01_panic_nocap.script"
\ No newline at end of file
+"\epoc32\release\armv5\udeb\TSU_ICL_ITFM_01.dll"-"c:\sys\bin\TSU_ICL_ITFM_01.dll"
+"\epoc32\release\armv5\udeb\TestTransformerExt.dll"-"c:\sys\bin\TestTransformerExt.dll"
+"\epoc32\release\armv5\udeb\testtransformer.dll"-"c:\sys\bin\testtransformer.dll"
+"\epoc32\release\armv5\udeb\TestFrameworkNone.exe"-"c:\TestFrameworkNone.exe"
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/src/TestStepImageTransform.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/src/TestStepImageTransform.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/src/TestStepImageTransform.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -425,6 +425,7 @@
void CTestStepTransformGeneric::Cleanup()
{
+ RFbsSession::Disconnect();
delete iSourceBuf; iSourceBuf = NULL;
delete iDestBuf; iDestBuf = NULL;
}
@@ -478,6 +479,13 @@
}
else
{
+
+ User::LeaveIfError(FbsStartup());
+ TInt errCode = RFbsSession::Connect();
+ if( errCode != KErrNone)
+ {
+ User::LeaveIfError(errCode);
+ }
verdict = DoTestStepFbsL();
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/bld.inf
--- a/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -27,6 +27,11 @@
PRJ_TESTEXPORTS
+
+// iby
+tsu_icl_mediasvr.iby /epoc32/rom/include/tsu_icl_mediasvr.iby
+
+
// test scripts
../scripts/TSU_ICL_MediaSvr.script c:/tsu_icl_mediasvr.script
../scripts/TSU_ICL_MediaSvr_alloc.script c:/tsu_icl_mediasvr_alloc.script
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/tsu_icl_mediasvr.iby
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/tsu_icl_mediasvr.iby Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,28 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __TSU_ICL_MEDIA_SVR_IBY__
+#define __TSU_ICL_MEDIA_SVR_IBY__
+
+file=ABI_DIR\DEBUG_DIR\tsu_icl_mediasvr.dll System\Libs\tsu_icl_mediasvr.dll
+
+REM Scripts
+
+data=EPOCROOT##epoc32\data\c\TSU_ICL_MediaSvr.script \TSU_ICL_MediaSvr.script
+data=EPOCROOT##epoc32\data\c\TSU_ICL_MediaSvr_alloc.script \TSU_ICL_MediaSvr_alloc.script
+
+
+#endif __TSU_ICL_MEDIA_SVR_IBY__
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/tsu_icl_mediasvr.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/tsu_icl_mediasvr.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/tsu_icl_mediasvr.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -15,7 +15,7 @@
"\epoc32\release\armv5\urel\tsu_icl_mediasvr.dll"-"c:\sys\bin\tsu_icl_mediasvr.dll"
-\\ REM test scripts
+// REM test scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_mediasvr\scripts\TSU_ICL_MediaSvr.script"-"c:\TSU_ICL_MediaSvr.script"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_mediasvr\scripts\TSU_ICL_MediaSvr_alloc.script"-"c:\TSU_ICL_MediaSvr_alloc.script"
@@ -31,7 +31,7 @@
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_mediasvr\TestFiles\mbm8bppm.mbm"-"c:\mediasvrtest\mbm8bppm.mbm"
"\sf\os\mm\imagingandcamerafws\imagingunittest\tsu_icl_mediasvr\TestFiles\stress\mbm24bpp.mbm"-"c:\mediasvrtest\stress\mbm24bpp.mbm"
-\\ mm_testdata
+// mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mediasvr\testfiles\bmp1bpp.bmp"-"c:\mediasvrtest\bmp1bpp.bmp"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mediasvr\testfiles\bmp24bpp.bmp"-"c:\mediasvrtest\bmp24bpp.bmp"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_mediasvr\testfiles\bmp4bpp.bmp"-"c:\mediasvrtest\bmp4bpp.bmp"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/src/TestStepMediaSvr.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/src/TestStepMediaSvr.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/src/TestStepMediaSvr.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -70,6 +70,7 @@
TVerdict CTestStepMediaSvr::DoTestStepPreambleL()
{
// connect to the bitmap server and check the error code
+ User::LeaveIfError(FbsStartup());
TInt errCode = RFbsSession::Connect();
if( errCode != KErrNone )
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_pfm_01/src/TestStepIclPfm.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_pfm_01/src/TestStepIclPfm.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_pfm_01/src/TestStepIclPfm.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -112,6 +112,7 @@
{
//[ mark the heap and unmark at the end of postamble ]
__MM_HEAP_MARK;
+ User::LeaveIfError(FbsStartup());
// [ connect to the bitmap server and check the error code]
TInt errCode = RFbsSession::Connect();
if( errCode != KErrNone )
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/group/tsu_icl_pfm_02.pkg
--- a/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/group/tsu_icl_pfm_02.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/group/tsu_icl_pfm_02.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -15,10 +15,10 @@
"\epoc32\release\armv5\urel\tsu_icl_pfm_02.dll"-"c:\sys\bin\tsu_icl_pfm_02.dll"
-\\REM Scripts
+//REM Scripts
"\sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_PFM_02\scripts\TSU_ICL_PFM_02.script"-"c:\TSU_ICL_PFM_02.script"
-\\mm_testdata
+//mm_testdata
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_pfm_02\testfiles\gif256colours.gif"-"c:\tsu_icl_pfm_02\gif256colours.gif"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_pfm_02\testfiles\mng-16m.mng"-"c:\tsu_icl_pfm_02\mng-16m.mng"
"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\unittest\icl\tsu_icl_pfm_02\testfiles\mng-16ma.mng"-"c:\tsu_icl_pfm_02\mng-16ma.mng"
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/src/TestStepIclPfm.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/src/TestStepIclPfm.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/src/TestStepIclPfm.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -112,6 +112,7 @@
{
//[ mark the heap and unmark at the end of postamble ]
__MM_HEAP_MARK;
+ User::LeaveIfError(FbsStartup());
// [ connect to the bitmap server and check the error code]
TInt errCode = RFbsSession::Connect();
if( errCode != KErrNone )
diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/src/TestStepMeasurePfm.cpp
--- a/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/src/TestStepMeasurePfm.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/src/TestStepMeasurePfm.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -91,6 +91,8 @@
mulCoef = 1.0;
break;
+
+
default:
{
User::Leave(KErrGeneral);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1337,8 +1337,8 @@
User::Leave(KErrNotReady);
}
- if (aSize.iWidth <= KMinVBMInputWidth
- || aSize.iHeight <= KMinVBMInputHeight
+ if (aSize.iWidth < KMinVBMInputWidth
+ || aSize.iHeight < KMinVBMInputHeight
|| aSize.iWidth > iVBMBufferOptions.iBufferSize.iWidth
|| aSize.iHeight > iVBMBufferOptions.iBufferSize.iHeight)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/audio_routing_api/inc/AudioOutput.h
--- a/mm_plat/audio_routing_api/inc/AudioOutput.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/audio_routing_api/inc/AudioOutput.h Mon Aug 23 18:56:36 2010 +0100
@@ -25,7 +25,7 @@
#include
#include
#include
-#include
+#include
// FORWARD DECLARATIONS
class MAudioOutputObserver;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h
--- a/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h Mon Aug 23 18:56:36 2010 +0100
@@ -22,7 +22,7 @@
// INCLUDES
#include "AudioInput.h"
#include
-#include
+#include
// FORWARD DECLARATIONS
class CCustomCommandUtility;
class CCustomInterfaceUtility;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h
--- a/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h Mon Aug 23 18:56:36 2010 +0100
@@ -22,7 +22,7 @@
// INCLUDES
#include "AudioOutput.h"
#include
-#include
+#include
// FORWARD DECLARATIONS
class CCustomCommandUtility;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h
--- a/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h Mon Aug 23 18:56:36 2010 +0100
@@ -19,7 +19,7 @@
#define __CUSTOMINTERFACEPROXYFACTORY_H
#include
-#include
+#include
#include
class CCustomInterfaceProxyFactory
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h
--- a/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h Mon Aug 23 18:56:36 2010 +0100
@@ -20,7 +20,7 @@
#define __CUSTOMCOMMANDUTILITY_H
#include
-#include
+#include
//#include "CustomCommandTypes.h"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h
--- a/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h Mon Aug 23 18:56:36 2010 +0100
@@ -19,7 +19,7 @@
#define __CUSTOMINTERFACEUTILITY_H
#include
-#include
+#include
//#include "CustomCommandTypes.h"
#include
class CProxyCustomInterfaceUtility;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp
--- a/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp Mon Aug 23 18:56:36 2010 +0100
@@ -61,7 +61,7 @@
LIBRARY CustomInterfaceUtility.lib
LIBRARY CustomCommandUtility.lib
-LIBRARY ConfigurationComponentsFactory.lib
+LIBRARY RestrictedAudioOutputProxy.lib
LIBRARY RestrictedAudioOutput.lib
LIBRARY MmfDevSound.lib
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h
--- a/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h Mon Aug 23 18:56:36 2010 +0100
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#include
@@ -315,7 +314,6 @@
// reference to TestModuleIf
CTestModuleIf& iTestModuleIf;
- CConfigurationComponentsFactory* iFactory;
CMMFDevSound* iDevSound;
CRestrictedAudioOutput* iRestrictedAudioOutput;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp
--- a/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include "RestrictedAOTestClass.h"
#include "debug.h"
@@ -103,12 +104,6 @@
delete iDevSound;
iDevSound = NULL;
}
-
- if (iFactory)
- {
- delete iFactory;
- iFactory = NULL;
- }
REComSession::FinalClose();
}
@@ -128,8 +123,8 @@
// First string is the function name used in TestScripter script file.
// Second is the actual implementation member function.
- ENTRY( "CreateFactory", CRestrictedAOTestClass::CreateFactory ),
- ENTRY( "CreateRestrictedAO", CRestrictedAOTestClass::CreateRestrictedAO ),
+ ENTRY( "CreateFactory", CRestrictedAOTestClass::CreateFactory ),
+ ENTRY( "CreateRestrictedAO", CRestrictedAOTestClass::CreateRestrictedAO ),
ENTRY( "AppendAllowedOutput", CRestrictedAOTestClass::AppendAllowedOutput ),
ENTRY( "RemoveAllowedOutput", CRestrictedAOTestClass::RemoveAllowedOutput ),
ENTRY( "GetAllowedOutputCount", CRestrictedAOTestClass::GetAllowedOutputCount ),
@@ -769,10 +764,7 @@
iLog->Log(_L("CRestrictedAOTestClass::CreateFactory"));
TInt error = KErrNone;
- error = CConfigurationComponentsFactory::CreateFactoryL(iFactory);
-
- if (error == KErrNone)
- TRAP(error, iDevSound = CMMFDevSound::NewL()) ;
+ TRAP(error, iDevSound = CMMFDevSound::NewL()) ;
// AddExpectedEvent(EInitializeComplete, KMediumTimeout);
return error;
@@ -789,9 +781,9 @@
iLog->Log(_L("CRestrictedAOTestClass::CreateRestrictedAO"));
TInt error = KErrNone;
- if (iFactory != NULL && iDevSound != NULL)
+ if (iDevSound != NULL)
{
- error = iFactory->CreateRestrictedAudioOutput(*iDevSound, iRestrictedAudioOutput);
+ TRAP(error, iRestrictedAudioOutput = CRestrictedAudioOutputProxy::NewL(*iDevSound));
}
else
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/AudioEqualizerBase.h
--- a/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
const TUid KUidAudioEqualizerEffect = {0x1020382A};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/BassBoostBase.h
--- a/mm_pub/audio_effects_api/inc/BassBoostBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/BassBoostBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
const TUid KUidBassBoostEffect = {0x10203827};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h
--- a/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
const TUid KUidDistanceAttenuationEffect = {0x1020382C};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/DopplerBase.h
--- a/mm_pub/audio_effects_api/inc/DopplerBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/DopplerBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -25,7 +25,7 @@
#include
#include
#include
-#include
+#include
// CLASS DECLARATION
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h
--- a/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
const TUid KUidEnvironmentalReverbEffect = {0x10203837};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/ListenerDopplerBase.h
--- a/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
const TUid KUidListenerDopplerEffect = {0x10207B16};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/ListenerLocationBase.h
--- a/mm_pub/audio_effects_api/inc/ListenerLocationBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerLocationBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
const TUid KUidListenerLocationEffect = {0x1020382D};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/ListenerOrientationBase.h
--- a/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
const TUid KUidListenerOrientationEffect = {0x1020382E};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/LoudnessBase.h
--- a/mm_pub/audio_effects_api/inc/LoudnessBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/LoudnessBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
const TUid KUidLoudnessEffect = {0x10207AA8};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/OrientationBase.h
--- a/mm_pub/audio_effects_api/inc/OrientationBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/OrientationBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -25,7 +25,7 @@
#include
#include
#include
-#include
+#include
// CLASS DECLARATION
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/RoomLevelBase.h
--- a/mm_pub/audio_effects_api/inc/RoomLevelBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/RoomLevelBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
const TUid KUidRoomLevelEffect = {0x10207B3C};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/SourceDopplerBase.h
--- a/mm_pub/audio_effects_api/inc/SourceDopplerBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceDopplerBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
const TUid KUidSourceDopplerEffect = {0x10207B15};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/SourceLocationBase.h
--- a/mm_pub/audio_effects_api/inc/SourceLocationBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceLocationBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
const TUid KUidSourceLocationEffect = {0x10203835};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/SourceOrientationBase.h
--- a/mm_pub/audio_effects_api/inc/SourceOrientationBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceOrientationBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
const TUid KUidSourceOrientationEffect = {0x10203834};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/audio_effects_api/inc/StereoWideningBase.h
--- a/mm_pub/audio_effects_api/inc/StereoWideningBase.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/StereoWideningBase.h Mon Aug 23 18:56:36 2010 +0100
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
const TUid KUidStereoWideningEffect = {0x10203836};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp
--- a/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -21,7 +21,6 @@
#include
#include
#include
-#include
#include
using namespace ContentAccess;
@@ -34,6 +33,9 @@
const TInt CDRMAudioPlay::KDefaultPlayDelay = 3000000;
const TInt CDRMAudioPlay::KDefaultStopOpenPlayDelay = 1000000;
const TInt CDRMAudioPlay::KDefaultReportDelay = 500000;
+
+ // Taken from Oma2Agent.h
+ _LIT8(KOma1XmlRoContentType, "application/vnd.oma.drm.rights+xml");
//Cases
const TInt CDRMAudioPlay::KCaseImplementationInformation = 1001;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf
diff -r ae690a8c4a18 -r f7bf1ed8db72 mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmhais/dvbhunittest/hai/dvbh/group/custom/poststep_custom.xml
--- a/mmhais/dvbhunittest/hai/dvbh/group/custom/poststep_custom.xml Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
- fetch-log
-
-
-
-
-
-
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmhais/dvbhunittest/hai/dvbh/group/custom/prestep_custom.xml
--- a/mmhais/dvbhunittest/hai/dvbh/group/custom/prestep_custom.xml Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
- makedir
-
-
-
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/gsm610fr.cpp
--- a/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/gsm610fr.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/gsm610fr.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -22,7 +22,7 @@
// a pointer codec object - have been added to some original routines.
// - Global tables are now const C++ tables in tables.h header file.
// - VAD and DTX modules have been removed from the original routines.
-// - Due to bug in GNU tool chain all array indexes of type [i-1] in
+// - Due to error in GNU tool chain all array indexes of type [i-1] in
// rpeltp.cpp have been removed and changed to [j] type.
// - multr, L_add, L_mac from basicop.cpp inlined
// INCLUDES
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/rpeltp.cpp
--- a/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/rpeltp.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/rpeltp.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -802,7 +802,7 @@
L_result = 0;
for (k = 0; k <= 39; k++)
L_result = L_mac( L_result, wt[k], aEncoder->dp[k-lambda+120] );
- /* Borland C++ 3.1 Bug if -3 (386-instructions) are used.
+ /* Borland C++ 3.1 error if -3 (386-instructions) are used.
** The code makes error (compared to (L_result > L_max)
** comparison. The problem disapears if the result of L_sub
** is stored to variable, e.g.
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/MIDI/src/midiclientutilitybody.cpp
--- a/mmlibs/mmfw/MIDI/src/midiclientutilitybody.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/MIDI/src/midiclientutilitybody.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -909,7 +909,7 @@
}
else
{
- // FIXME - what do we do when we don't understand the error type?
+ // xxx - what do we do when we don't understand the error type?
}
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/MMPFiles/plugin_common/MmfAudioController.mmp
--- a/mmlibs/mmfw/MMPFiles/plugin_common/MmfAudioController.mmp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/MMPFiles/plugin_common/MmfAudioController.mmp Mon Aug 23 18:56:36 2010 +0100
@@ -19,13 +19,13 @@
@file
*/
-target mmfaudiocontroller.dll
+target mmfaudiowavtestcontroller.dll
CAPABILITY ALL -TCB
targettype plugin
UNPAGED
// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F55BF
+UID 0x10009D8D 0x2002C397
VENDORID 0x70000001
SOURCEPATH ../../src/Plugin/Controller/Audio
@@ -36,8 +36,8 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-start resource 101F55BF.rss
-target mmfaudiocontroller.rsc
+start resource 2002C397.rss
+target mmfaudiowavtestcontroller.rsc
end
LIBRARY euser.lib
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/group/bld.inf
--- a/mmlibs/mmfw/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -217,7 +217,6 @@
//plugin
../MMPFiles/plugin_common/MmfStdSourceAndSinkPlugin.mmp
-../MMPFiles/plugin_common/MmfAudioController.mmp //replaces wav controller
../MMPFiles/plugin_common/MMFLinearAudioCodecs.mmp
../MMPFiles/plugin_common/Gsm610.mmp
../MMPFiles/plugin_common/mmfaudiooutput.mmp
@@ -234,3 +233,8 @@
// Effects
#include "../Effect/group/Effect.inf"
+PRJ_TESTMMPFILES
+../MMPFiles/plugin_common/MmfAudioController.mmp //test wav controller
+
+PRJ_TESTEXPORTS
+../inc/mmfaudiowavtestcontroller.iby /epoc32/rom/include/mmfaudiowavtestcontroller.iby
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/group/release.txt
--- a/mmlibs/mmfw/group/release.txt Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/group/release.txt Mon Aug 23 18:56:36 2010 +0100
@@ -6,7 +6,7 @@
-- This is release note for release of MultimediaFramework from Nile to Symbian.
+- This is release note for release of MultimediaFramework to Symbian.
- Release Date (planned):
- Release Date (actual):
@@ -31,7 +31,7 @@
Files which have been added to Continuus and files which
have been deleted:
-New Files added by Nokia Dallas:
+New Files added by Dallas:
\Include\
MdaAudioOutputStream.h
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf.iby
--- a/mmlibs/mmfw/inc/mmf.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf.iby Mon Aug 23 18:56:36 2010 +0100
@@ -47,7 +47,6 @@
//RESOURCES
ECOM_PLUGIN(gsm610.dll,101f504a.rsc)
ECOM_PLUGIN(audiocodecs.dll,101f51d8.rsc)
-ECOM_PLUGIN(mmfaudiocontroller.dll,101f55bf.rsc)
ECOM_PLUGIN(mmfstdsourceandsinkplugin.dll,101f53ae.rsc)
ECOM_PLUGIN(mmfaudioinput.dll,101f53ba.rsc)
ECOM_PLUGIN(mmfaudiooutput.dll,101f53b8.rsc)
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframework.h
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframework.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframework.h Mon Aug 23 18:56:36 2010 +0100
@@ -394,7 +394,7 @@
TMMFMessageDestination iDestination;
/**
- Defines whether this object has yet to be completed.
+ Defines know about object completion state.
*/
TBool iAmCompleted;
};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframeworkclasses.h
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframeworkclasses.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframeworkclasses.h Mon Aug 23 18:56:36 2010 +0100
@@ -164,7 +164,7 @@
This method may leave with one of the system-wide error codes.
@param aMessage
- The message to be completed when an event occurs.
+ The message will be completed when an event occurs.
@return A pointer to the newly created event receiver.
@@ -196,14 +196,14 @@
Constructor.
@param aMessage
- The message to be completed when an event occurs.
+ The message will be completed when an event occurs.
@since 7.0s
*/
CMMFEventReceiver(const TMMFMessage& aMessage);
private:
/**
- The message to be completed when an event occurs.
+ The message will be completed when an event occurs.
*/
TMMFMessage iMessage;
};
@@ -429,7 +429,7 @@
@param aMessage
The request to be handled.
- @return ETrue if the message is to be completed now, EFalse if the message will be completed
+ @return ETrue if the message will be completed now, EFalse if the message will be completed
later.
*/
TBool ReceiveEventsL(TMMFMessage& aMessage);
@@ -442,7 +442,7 @@
@param aMessage
The request to be handled.
- @return ETrue if the message is to be completed now, EFalse if the message will be completed later.
+ @return ETrue if the message will be completed now, EFalse if the message will be completed later.
*/
TBool CancelReceiveEvents(TMMFMessage& aMessage);
@@ -454,7 +454,7 @@
@param aMessage
The request to be handled.
- @return ETrue if the message is to be completed now, EFalse if the message will be completed later.
+ @return ETrue if the message will be completed now, EFalse if the message will be completed later.
*/
TBool LoadControllerL(TMMFMessage& aMessage);
private:
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommands.h
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommands.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommands.h Mon Aug 23 18:56:36 2010 +0100
@@ -18,7 +18,7 @@
#include
-#include "mmf/common/mmcaf.h"
+#include
#include
#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommandsenum.h
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommandsenum.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommandsenum.h Mon Aug 23 18:56:36 2010 +0100
@@ -18,7 +18,7 @@
#include
-#include "mmf/common/mmcaf.h"
+#include
#include
/**
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdurationinfocustomcommands.h
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdurationinfocustomcommands.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdurationinfocustomcommands.h Mon Aug 23 18:56:36 2010 +0100
@@ -19,7 +19,7 @@
#ifdef SYMBIAN_CAF_V2
#include
-#include "mmf/common/mmcaf.h"
+#include
#include
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommands.h
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommands.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommands.h Mon Aug 23 18:56:36 2010 +0100
@@ -18,7 +18,7 @@
#include
#include
-#include "mmf/common/mmcaf.h"
+#include
class CMMFVideoFrameMessage;
class CFbsBitmap;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommandsimpl.h
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommandsimpl.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommandsimpl.h Mon Aug 23 18:56:36 2010 +0100
@@ -18,7 +18,7 @@
#include
#include
-#include "mmf/common/mmcaf.h"
+#include
class CMMFVideoFrameMessage;
class CFbsBitmap;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/server/MmfFile.h
--- a/mmlibs/mmfw/inc/mmf/server/MmfFile.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/server/MmfFile.h Mon Aug 23 18:56:36 2010 +0100
@@ -20,7 +20,7 @@
#include
#include
-#include "mmf/common/mmcaf.h"
+#include
class CReadWriteRequest;
class CTransferBufferCopy;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmf/server/mmfdatapath2.h
--- a/mmlibs/mmfw/inc/mmf/server/mmfdatapath2.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/server/mmfdatapath2.h Mon Aug 23 18:56:36 2010 +0100
@@ -115,7 +115,7 @@
TTimeIntervalMicroSeconds iTrailingSilenceLeftToPlay;
/**
- The time left for the play to be completed in a particular repeat
+ The time left for the play will be completed in a particular repeat
*/
TTimeIntervalMicroSeconds iTimeLeftToPlayComplete;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/inc/mmfaudiowavtestcontroller.iby
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/inc/mmfaudiowavtestcontroller.iby Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,22 @@
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef MMFAUDIOWAVTESTCONTROLLER.IBY
+#define MMFAUDIOWAVTESTCONTROLLER.IBY
+
+ECOM_PLUGIN(mmfaudiowavtestcontroller.dll,2002C397.rsc)
+
+#endif //MMFAUDIOWAVTESTCONTROLLER.IBY
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Client/Audio/mmfclientaudioplayer.cpp
--- a/mmlibs/mmfw/src/Client/Audio/mmfclientaudioplayer.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Audio/mmfclientaudioplayer.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1981,7 +1981,7 @@
MMMFDRMCustomCommand* CMMFMdaAudioPlayerUtility::GetDRMCustomCommand()
{
- // TODO: check controller supports MMMFDRMCustomCommandImplementor
+ // XXX: check controller supports MMMFDRMCustomCommandImplementor
if (iDRMCustomCommands.IsSupported())
{
return static_cast(&iDRMCustomCommands);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Client/Audio/mmfclientaudiorecorder.cpp
--- a/mmlibs/mmfw/src/Client/Audio/mmfclientaudiorecorder.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Audio/mmfclientaudiorecorder.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1530,7 +1530,7 @@
* ConvertDescriptor
* aParam aDescriptor
* This method converts a TDesC8 to a TDes8
-* and is here to fix an interface bug
+* and is here to fix an interface error
*
**/
void CMMFMdaAudioRecorderUtility::ConvertDescriptor(const TDesC8& aDescriptor )
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Client/Audio/mmfclienttoneplayer.cpp
--- a/mmlibs/mmfw/src/Client/Audio/mmfclienttoneplayer.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Audio/mmfclienttoneplayer.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -860,7 +860,7 @@
void CMMFMdaAudioToneUtility::CancelPrepare()
{
- // FIXME - do we need to cancel the callback? What if the callback is actually calling back another error? Probably best not to cancel...
+ // xxx - do we need to cancel the callback? What if the callback is actually calling back another error? Probably best not to cancel...
delete iToneConfig;
iToneConfig = NULL;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Client/Video/mediaclientvideodisplaybody.cpp
--- a/mmlibs/mmfw/src/Client/Video/mediaclientvideodisplaybody.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Video/mediaclientvideodisplaybody.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -945,7 +945,7 @@
else if (aWindowData.iAutoScaleType == EAutoScaleNone)
{
// for non-square pixels, reduce one dimension
- // TBD other option is to enlarge in the other dimension
+ // XXX other option is to enlarge in the other dimension
if(pixelAspectRatio > 1)
{
inputHeight /= pixelAspectRatio;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Client/Video/mmfclientvideoplayerbody.cpp
--- a/mmlibs/mmfw/src/Client/Video/mmfclientvideoplayerbody.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Video/mmfclientvideoplayerbody.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1007,7 +1007,7 @@
MMMFDRMCustomCommand* CVideoPlayerUtility::CBody::GetDRMCustomCommand()
{
- // TODO: check controller supports MMMFDRMCustomCommandImplementor
+ // XXX: check controller supports MMMFDRMCustomCommandImplementor
TInt error = iDRMCustomCommands.EvaluateIntent(ContentAccess::EPeek);
if (error==KErrNone)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Plugin/Controller/Audio/101F55BF.rss
--- a/mmlibs/mmfw/src/Plugin/Controller/Audio/101F55BF.rss Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Copied from... Registry file for the Example Interface Implementation Collection
-//
-//
-
-#include
-#include
-#include
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = 0x101F55BF;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = KMmfUidPluginInterfaceController ;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KMmfUidControllerAudio ;
- version_no = 1;
- display_name = "Symbian Audio controller";
- default_data = "?";
- opaque_data = "Symbianyes0x101F5D07";//All format support comes from Format Plugins //yes indicates controller has no url handling capability.
- }
- };
- }
- };
- }
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Plugin/Controller/Audio/2002C397.rss
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/src/Plugin/Controller/Audio/2002C397.rss Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,44 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Copied from... Registry file for the Example Interface Implementation Collection
+//
+//
+
+#include
+#include
+#include
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = 0x2002C397;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KMmfUidPluginInterfaceController ;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KMmfUidControllerAudio ;
+ version_no = 1;
+ display_name = "Symbian Audio Wav Test controller";
+ default_data = "?";
+ opaque_data = "Symbianyes0x101F5D07";//All format support comes from Format Plugins //yes indicates controller has no url handling capability.
+ }
+ };
+ }
+ };
+ }
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Plugin/StdSourceAndSink/FileAccess.h
--- a/mmlibs/mmfw/src/Plugin/StdSourceAndSink/FileAccess.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/StdSourceAndSink/FileAccess.h Mon Aug 23 18:56:36 2010 +0100
@@ -18,7 +18,7 @@
#include
#include
-#include "mmf/common/mmcaf.h"
+#include
// Abstract class providing generic file access
class MGenericFile
@@ -130,8 +130,9 @@
HBufC* iFilePath;
ContentAccess::CData* iData;
- RFile iLegacyFile;
- TBool iLegacyFileOpen;
+ RFile iLegacyFile;
+ RFile64 iFile64; //For defect EASA-84ZC6J
+ TBool iLegacyFileOpen;
};
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Plugin/StdSourceAndSink/Mmffile.cpp
--- a/mmlibs/mmfw/src/Plugin/StdSourceAndSink/Mmffile.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/StdSourceAndSink/Mmffile.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -211,7 +211,7 @@
}
else
{
-// TODO If the UID is unknown we should reject, but currently
+// XXX If the UID is unknown we should reject, but currently
// code also used for older calls that just supply filename.
// User::Leave(KErrNotSupported);
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/Plugin/StdSourceAndSink/fileaccess.cpp
--- a/mmlibs/mmfw/src/Plugin/StdSourceAndSink/fileaccess.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/StdSourceAndSink/fileaccess.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -14,6 +14,7 @@
//
#include
+#include
#include
#include
#include
@@ -147,9 +148,10 @@
CContentFile::~CContentFile()
{
delete iData;
-
- if (iLegacyFileOpen)
- iLegacyFile.Close();
+
+ iLegacyFile.Close();
+ iFile64.Close(); //For defect EASA-84ZC6J
+
delete iFilePath;
}
@@ -269,12 +271,35 @@
RFile& CContentFile::FileL()
{
if (!iLegacyFileOpen)
- {
- User::LeaveIfError(iLegacyFile.Open(*iSession, *iFilePath, EFileRead | EFileStream | EFileShareReadersOrWriters));
- iLegacyFileOpen = ETrue;
+ {//For defect EASA-84ZC6J
+ TInt error = iLegacyFile.Open(*iSession, *iFilePath, EFileRead | EFileStream | EFileShareReadersOrWriters);
+ if ( error == KErrTooBig )
+ {
+ User::LeaveIfError(iFile64.Open(*iSession, *iFilePath, EFileRead | EFileStream | EFileShareReadersOrWriters));
+ iLegacyFileOpen = ETrue;
+ return iFile64;
+ }
+
+ else if (error == KErrNone)
+ {
+ iLegacyFileOpen = ETrue;
+ return iLegacyFile;
+ }
+
+ else
+ {
+ User::Leave(error);
+ }
}
- return iLegacyFile;
- }
+ if(iLegacyFile.SubSessionHandle())
+ {
+ return iLegacyFile;
+ }
+ else
+ {
+ return iFile64;
+ }
+}
TInt CContentFile::Data(CData*& aData)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/src/utils/audioutils/rateconvert.cpp
--- a/mmlibs/mmfw/src/utils/audioutils/rateconvert.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/src/utils/audioutils/rateconvert.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -219,7 +219,7 @@
TInt rawValue = aBufferLength;
ASSERT(iFromRate < iToRate); // should not be called otherwise
// upsample - will generate more data. use floats to avoid extra round error
- rawValue = TInt(rawValue * TReal(iToRate) / TReal(iFromRate) + 0.5) + 4*sizeof(TInt16); // add some fudge factor just in case
+ rawValue = TInt(rawValue * TReal(iToRate) / TReal(iFromRate) + 0.5) + 4*sizeof(TInt16); // add some buffer extra buffer
rawValue = NextPowerUp(rawValue); // when upscaling always give nice power
return rawValue;
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/group/char_mmf_audioplay_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/group/char_mmf_audioplay_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/group/char_mmf_audioplay_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -21,41 +21,10 @@
// scripts
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_none.script" - "c:\char_mmf_audioplay_none.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_wav.script" - "c:\char_mmf_audioplay_wav.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_ogg.script" - "c:\char_mmf_audioplay_ogg.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_panic_debug.script" - "c:\char_mmf_audioplay_panic_debug.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_amr.script" - "c:\char_mmf_audioplay_amr.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_mp3.script" - "c:\char_mmf_audioplay_mp3.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_aac.script" - "c:\char_mmf_audioplay_aac.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_amr_notification.script" - "c:\char_mmf_audioplay_amr_notification.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_mp3_notification.script" - "c:\char_mmf_audioplay_mp3_notification.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_aac_notification.script" - "c:\char_mmf_audioplay_aac_notification.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_wav_notification.script" - "c:\char_mmf_audioplay_wav_notification.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_ogg_notification.script" - "c:\char_mmf_audioplay_ogg_notification.script"
//Data
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.wav"-"c:\char\mmf\data\maintst.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\Corrupt.wav"-"c:\char\mmf\data\Corrupt.wav"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\NoExist.wav"-"c:\char\mmf\data\NoExist.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst2.wav"-"c:\char\mmf\data\maintst2.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst3.wav"-"c:\char\mmf\data\maintst3.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\OneSample.wav"-"c:\char\mmf\data\OneSample.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.wma"-"c:\char\mmf\data\maintst.wma"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.ogg"-"c:\char\mmf\data\maintst.ogg"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst2.ogg"-"c:\char\mmf\data\maintst2.ogg"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\corrupt.ogg"-"c:\char\mmf\data\corrupt.ogg"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\small.ogg"-"c:\char\mmf\data\small.ogg"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\metadata.ogg"-"c:\char\mmf\data\metadata.ogg"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\amrnb_8k_13kbps_mono.amr"-"c:\char\mmf\data\amrnb_8k_13kbps_mono.amr"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\amrnb_8k_13kbps_mono_small_corrupt.amr"-"c:\char\mmf\data\amrnb_8k_13kbps_mono_small_corrupt.amr"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\amrnb_8k_13kbps_mono_small.amr"-"c:\char\mmf\data\amrnb_8k_13kbps_mono_small.amr"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\mp3_44.1k_128kbps_st.mp3"-"c:\char\mmf\data\mp3_44.1k_128kbps_st.mp3"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\mp3_44.1k_128kbps_st_small_corrupt.mp3"-"c:\char\mmf\data\mp3_44.1k_128kbps_st_small_corrupt.mp3"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\aac_22k05_32kbps_st_adts.aac"-"c:\char\mmf\data\aac_22k05_32kbps_st_adts.aac"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\aac_22k05_32kbps_st_adts_small.aac"-"c:\char\mmf\data\aac_22k05_32kbps_st_adts_small.aac"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\aac_22k05_32kbps_st_adts_small_corrupt.aac"-"c:\char\mmf\data\aac_22k05_32kbps_st_adts_small_corrupt.aac"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\jfif10_4.jpg"-"c:\char\mmf\data\jfif10_4.jpg"
-
-//PV Resource files
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\data\hwdev0x2000e911mp3decopt.rsc"-"c:\resource\a3f\hwdev0x2000e911.rsc"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\data\hwdev0x10272909amrdecopt.rsc"-"c:\resource\a3f\hwdev0x10272909.rsc"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\data\hwdev0x2000e90faacdecopt.rsc"-"c:\resource\a3f\hwdev0x2000e90f.rsc"
\ No newline at end of file
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.wma"-"c:\char\mmf\data\maintst.wma"
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_none.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_none.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_none.script Mon Aug 23 18:56:36 2010 +0100
@@ -25,8 +25,8 @@
//!@SYMTestPriority 4
//!@SYMTestActions 1. Create audio player utility 2. Open an audio file with no controller to support the audio file format.
//!@SYMTestExpectedResults The MapcInitComplete() callback function should pass KErrNotSupported.
-RUN_TEST_STEP -1 char_mmf_audioplay MM-MMF-APLCLNT-CHRTZ-NONE-I-0003 \char\mmf\char_mmf_audioplay.ini
-TEST_COMPLETE
+//RUN_TEST_STEP -1 char_mmf_audioplay MM-MMF-APLCLNT-CHRTZ-NONE-I-0003 \char\mmf\char_mmf_audioplay.ini
+//TEST_COMPLETE
//!@SYMTestCaseID MM-MMF-APLCLNT-CHRTZ-NONE-I-0004
//!@SYMTestCaseDesc Open an audio file providing the incorrect path i.e. no such file exists in that path.
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -23,6 +23,8 @@
../group/char_mmf_audiorec.iby /epoc32/rom/include/char_mmf_audiorec.iby
../scripts/char_mmf_audiorec_wav.script c:/char/mmf/char_mmf_audiorec_wav.script
+../scripts/char_mmf_audiorec_wav_1.script c:/char/mmf/char_mmf_audiorec_wav_1.script
+../scripts/char_mmf_audiorec_wav_2.script c:/char/mmf/char_mmf_audiorec_wav_2.script
../scripts/char_mmf_audiorec_ogg.script c:/char/mmf/char_mmf_audiorec_ogg.script
#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/char_mmf_audiorec_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/char_mmf_audiorec_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/char_mmf_audiorec_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -20,10 +20,12 @@
// scripts
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav.script" - "c:\char_mmf_audiorec_wav.script"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_1.script" - "c:\char_mmf_audiorec_wav_1.script"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_2.script" - "c:\char_mmf_audiorec_wav_2.script"
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg.script" - "c:\char_mmf_audiorec_ogg.script"
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg_overflow.script" - "c:\char_mmf_audiorec_ogg_overflow.script"
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_panic_emu_debug.script" - "c:\char_mmf_audiorec_panic_emu_debug.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_notification.script" - "c:\char_mmf_audiorec_wav_notification.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_notification.script" - "c:\char_mmf_audiorec_wav_notification.script"
//#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg_notification.script" - "c:\char_mmf_audiorec_ogg_notification.script"
@@ -32,6 +34,9 @@
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_amr_notification.script" - "c:\char_mmf_audiorec_amr_notification.script"
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_aac_notification.script" - "c:\char_mmf_audiorec_aac_notification.script"
+//Data
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst2.wav"-"c:\char\mmf\data\maintst2.wav"
+
//PV Resource files
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\data\hwdev0x1027290aamrencopt.rsc"-"c:\resource\a3f\hwdev0x1027290a.rsc"
//#endif // SYMBIAN_MULTIMEDIA_A3FDEVSOUND
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav.script Mon Aug 23 18:56:36 2010 +0100
@@ -1,5 +1,5 @@
@file char_mmf_audiorec_wav.script
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -863,173 +863,4 @@
//! should Get the format of the audio clip and leave with KErrNone. 4.Recording state : SetDestinationNumberOfChannelsL should Get the format of the
//! audio clip and leave with KErrNotReady
RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0096 \char\mmf\char_mmf_audiorec.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0097
-//!@SYMTestCaseDesc SetDestinationNumberOfChannelsL() / DestinationNumberOfChannelsL() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Check the call back MoscoStateChangeEvent code after Set and Get the number of channels
-//! for the audio clip to be recorded before Open an Audio file.
-//!@SYMTestExpectedResults 1. ENotReady State: SetDestinationNumberOfChannelsL should leave with KErrNotSupported. 2.ENotReady State: DestinationNumberOfChannelsL
-//! should leave with KErrNotSupported.
-RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0097 \char\mmf\char_mmf_audiorec.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0098
-//!@SYMTestCaseDesc GetSupportedNumberOfChannelsL() in EOpen State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3.Check the call back MoscoStateChangeEvent code after get a list
-//! of supported number of channels for recording.
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. GetSupportedNumberOfChannelsL : It should get a list of supported number of
-//! channels for recording.
-RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0098 \char\mmf\char_mmf_audiorec.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0099
-//!@SYMTestCaseDesc GetSupportedNumberOfChannelsL() in ERecording State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4.Check the call back MoscoStateChangeEvent
-//! code after get a list of supported number of channels for recording while in Recording state.
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. RecordL : Should not leave. 3.Recording state : GetSupportedNumberOfChannelsL
-//! should get a list of supported number of channels for recording.
-RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0099 \char\mmf\char_mmf_audiorec.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0100
-//!@SYMTestCaseDesc GetSupportedNumberOfChannelsL() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after get a list of supported number
-//! of channels for recording before Open an Audio file.
-//!@SYMTestExpectedResults 1.ENotReady state : GetSupportedNumberOfChannelsL should leave with KErrNotSupported.
-RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0100 \char\mmf\char_mmf_audiorec.ini
-TEST_COMPLETE
-
-// KNOWN FAILURES
-//SetDestinationBitRateL() not supported
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0077
-//!@SYMTestCaseDesc SetDestinationBitRateL() / DestinationBitRateL() in Eopen State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3.Check the call back MoscoStateChangeEvent code after Set and
-//! Get the bit rate of the data sink (Currently audio controller is not supported this feature).
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. SetDestinationBitRateL / DestinationBitRateL : should leave with KErrNotSupported,
-//! and test result should EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0077 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//SetDestinationBitRateL() not supported
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0078
-//!@SYMTestCaseDesc SetDestinationBitRateL() / DestinationBitRateL() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Set and Get the bit rate of the
-//! data sink (Currently audio controller is not supported this feature) before Open an Audio file.
-//!@SYMTestExpectedResults 1. SetDestinationBitRateL : should leave with KErrNotSupported and test result should EKnownFailure. 2. DestinationBitRateL
-//! :should leave with KErrNotSupported and test result should EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0078 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//GetNumberOfMetaDataEntries support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0102
-//!@SYMTestCaseDesc GetNumberOfMetaDataEntries() in Eplaying and ERecording State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Playing. 4.Check the call back MoscoStateChangeEvent
-//! code after Get the number of Meta data entries associated with the clip while in Playing state.
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. PlayL : Should not leave. 3.RecordL : Should not Leave 4.Playing state : GetNumberOfMetaDataEntries
-//! should return KErrNotSupported and test result should be EKnownFailure 5.Recording state : GetNumberOfMetaDataEntries should leave with KErrNotReady
-//! and test result should be EKnownFailure
-//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0102 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//GetNumberOfMetaDataEntries support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0103
-//!@SYMTestCaseDesc GetNumberOfMetaDataEntries() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Get the number of Meta data entries
-//! associated with the clip before Open an Audio file.
-//!@SYMTestExpectedResults 1. ENotReady State : GetNumberOfMetaDataEntries should return KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0103 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//GetMetaDataEntryL support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0105
-//!@SYMTestCaseDesc GetMetaDataEntryL() in Eplaying and Erecording State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Playing. 4.Check the call back MoscoStateChangeEvent
-//! code after get the specified Meta data entry from the current audio clip while in Playing state.
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2.PlayL : Play should not leave. 3.RecordL : Record Should not leave. 4.Recording
-//! state : GetMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure. 5.Playing state : GetMetaDataEntryL should
-//! leave with KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0105 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//GetMetaDataEntryL support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0106
-//!@SYMTestCaseDesc GetMetaDataEntryL() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after get the specified Meta data entry
-//! from the current audio clip before Open an Audio file.
-//!@SYMTestExpectedResults 1.ENotReady State : GetMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure..
-//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0106 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//AddMetaDataEntry support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0108
-//!@SYMTestCaseDesc AddMetaDataEntryL() in Erecording State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4.Check the call back MoscoStateChangeEvent
-//! code after Add a Meta data entry to the audio clip while in recording state.
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2.RecordL : should not leave. 3.Recording state : AddMetaDataEntryL should leave
-//! with KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0108 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//AddMetaDataEntry support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0109
-//!@SYMTestCaseDesc AddMetaDataEntryL() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Add a Meta data entry to the audio
-//! clip before Open an Audio file.
-//!@SYMTestExpectedResults 1.ENotReady state : AddMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0109 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//RemoveMetaDataEntry support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0111
-//!@SYMTestCaseDesc RemoveMetaDataEntryL() in ERecording State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4. Check the call back MoscoStateChangeEvent
-//! code after Remove a specified Meta data entry from the audio clip while in recording state.
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. RecordL : should not leave. 3.Recording state : RemoveMetaDataEntryL should
-//! leave with KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0111 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//RemoveMetaDataEntry support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0112
-//!@SYMTestCaseDesc RemoveMetaDataEntryL() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Remove a specified Meta data entry
-//! from the audio clip before Open an Audio file.
-//!@SYMTestExpectedResults 1. ENotReady state : RemoveMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0112 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//ReplaceMetaDataEntryL support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0114
-//!@SYMTestCaseDesc ReplaceMetaDataEntryL() in Erecording State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4.Check the call back MoscoStateChangeEvent
-//! code after Replace a specified Meta data entry from the audio clip while in recording state.
-//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. RecordL : should not leave. 3. Recording state : ReplaceMetaDataEntryL should
-//! should leave with KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0114 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
-
-//ReplaceMetaDataEntryL support is not provided
-//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0115
-//!@SYMTestCaseDesc ReplaceMetaDataEntryL() in ENotReady State
-//!@SYMTestPriority 4
-//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Replace a specified Meta data
-//! entry from the audio clip before Open an Audio file.
-//!@SYMTestExpectedResults 1. ENotReady State : ReplaceMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure.
-//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0115 \char\mmf\char_mmf_audiorec.ini
-//TEST_COMPLETE
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav_1.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav_1.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,170 @@
+@file char_mmf_audiorec_wav_1.script
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+///////////////////////////////////////////////////////////////////
+PRINT
+LOAD_SUITE char_mmf_audiorec.dll
+# wait for ring.wav to finish playing
+delay 1000
+
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0099
+//!@SYMTestCaseDesc GetSupportedNumberOfChannelsL() in ERecording State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4.Check the call back MoscoStateChangeEvent
+//! code after get a list of supported number of channels for recording while in Recording state.
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. RecordL : Should not leave. 3.Recording state : GetSupportedNumberOfChannelsL
+//! should get a list of supported number of channels for recording.
+RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0099 \char\mmf\char_mmf_audiorec.ini
+TEST_COMPLETE
+
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0100
+//!@SYMTestCaseDesc GetSupportedNumberOfChannelsL() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after get a list of supported number
+//! of channels for recording before Open an Audio file.
+//!@SYMTestExpectedResults 1.ENotReady state : GetSupportedNumberOfChannelsL should leave with KErrNotSupported.
+RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0100 \char\mmf\char_mmf_audiorec.ini
+TEST_COMPLETE
+
+// KNOWN FAILURES
+//SetDestinationBitRateL() not supported
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0077
+//!@SYMTestCaseDesc SetDestinationBitRateL() / DestinationBitRateL() in Eopen State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3.Check the call back MoscoStateChangeEvent code after Set and
+//! Get the bit rate of the data sink (Currently audio controller is not supported this feature).
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. SetDestinationBitRateL / DestinationBitRateL : should leave with KErrNotSupported,
+//! and test result should EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0077 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//SetDestinationBitRateL() not supported
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0078
+//!@SYMTestCaseDesc SetDestinationBitRateL() / DestinationBitRateL() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Set and Get the bit rate of the
+//! data sink (Currently audio controller is not supported this feature) before Open an Audio file.
+//!@SYMTestExpectedResults 1. SetDestinationBitRateL : should leave with KErrNotSupported and test result should EKnownFailure. 2. DestinationBitRateL
+//! :should leave with KErrNotSupported and test result should EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0078 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//GetNumberOfMetaDataEntries support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0102
+//!@SYMTestCaseDesc GetNumberOfMetaDataEntries() in Eplaying and ERecording State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Playing. 4.Check the call back MoscoStateChangeEvent
+//! code after Get the number of Meta data entries associated with the clip while in Playing state.
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. PlayL : Should not leave. 3.RecordL : Should not Leave 4.Playing state : GetNumberOfMetaDataEntries
+//! should return KErrNotSupported and test result should be EKnownFailure 5.Recording state : GetNumberOfMetaDataEntries should leave with KErrNotReady
+//! and test result should be EKnownFailure
+//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0102 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//GetNumberOfMetaDataEntries support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0103
+//!@SYMTestCaseDesc GetNumberOfMetaDataEntries() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Get the number of Meta data entries
+//! associated with the clip before Open an Audio file.
+//!@SYMTestExpectedResults 1. ENotReady State : GetNumberOfMetaDataEntries should return KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0103 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//GetMetaDataEntryL support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0105
+//!@SYMTestCaseDesc GetMetaDataEntryL() in Eplaying and Erecording State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Playing. 4.Check the call back MoscoStateChangeEvent
+//! code after get the specified Meta data entry from the current audio clip while in Playing state.
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2.PlayL : Play should not leave. 3.RecordL : Record Should not leave. 4.Recording
+//! state : GetMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure. 5.Playing state : GetMetaDataEntryL should
+//! leave with KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0105 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//GetMetaDataEntryL support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0106
+//!@SYMTestCaseDesc GetMetaDataEntryL() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after get the specified Meta data entry
+//! from the current audio clip before Open an Audio file.
+//!@SYMTestExpectedResults 1.ENotReady State : GetMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure..
+//RUN_TEST_STEP 600000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0106 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//AddMetaDataEntry support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0108
+//!@SYMTestCaseDesc AddMetaDataEntryL() in Erecording State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4.Check the call back MoscoStateChangeEvent
+//! code after Add a Meta data entry to the audio clip while in recording state.
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2.RecordL : should not leave. 3.Recording state : AddMetaDataEntryL should leave
+//! with KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0108 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//AddMetaDataEntry support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0109
+//!@SYMTestCaseDesc AddMetaDataEntryL() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Add a Meta data entry to the audio
+//! clip before Open an Audio file.
+//!@SYMTestExpectedResults 1.ENotReady state : AddMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0109 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//RemoveMetaDataEntry support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0111
+//!@SYMTestCaseDesc RemoveMetaDataEntryL() in ERecording State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4. Check the call back MoscoStateChangeEvent
+//! code after Remove a specified Meta data entry from the audio clip while in recording state.
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. RecordL : should not leave. 3.Recording state : RemoveMetaDataEntryL should
+//! leave with KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0111 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//RemoveMetaDataEntry support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0112
+//!@SYMTestCaseDesc RemoveMetaDataEntryL() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Remove a specified Meta data entry
+//! from the audio clip before Open an Audio file.
+//!@SYMTestExpectedResults 1. ENotReady state : RemoveMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0112 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//ReplaceMetaDataEntryL support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0114
+//!@SYMTestCaseDesc ReplaceMetaDataEntryL() in Erecording State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3. Starts Recording. 4.Check the call back MoscoStateChangeEvent
+//! code after Replace a specified Meta data entry from the audio clip while in recording state.
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. RecordL : should not leave. 3. Recording state : ReplaceMetaDataEntryL should
+//! should leave with KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0114 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
+
+//ReplaceMetaDataEntryL support is not provided
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0115
+//!@SYMTestCaseDesc ReplaceMetaDataEntryL() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2.Check the call back MoscoStateChangeEvent code after Replace a specified Meta data
+//! entry from the audio clip before Open an Audio file.
+//!@SYMTestExpectedResults 1. ENotReady State : ReplaceMetaDataEntryL should leave with KErrNotSupported and test result should be EKnownFailure.
+//RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0115 \char\mmf\char_mmf_audiorec.ini
+//TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav_2.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav_2.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,41 @@
+@file char_mmf_audiorec_wav_2.script
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+///////////////////////////////////////////////////////////////////
+PRINT
+LOAD_SUITE char_mmf_audiorec.dll
+# wait for ring.wav to finish playing
+delay 1000
+
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0098
+//!@SYMTestCaseDesc GetSupportedNumberOfChannelsL() in EOpen State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Open an Audio file. 3.Check the call back MoscoStateChangeEvent code after get a list
+//! of supported number of channels for recording.
+//!@SYMTestExpectedResults 1.Opening an Audio file should not leave. 2. GetSupportedNumberOfChannelsL : It should get a list of supported number of
+//! channels for recording.
+RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0098 \char\mmf\char_mmf_audiorec.ini
+TEST_COMPLETE
+
+//!@SYMTestCaseID MM-MMF-ARCLNT-CHRTZ-I-0097
+//!@SYMTestCaseDesc SetDestinationNumberOfChannelsL() / DestinationNumberOfChannelsL() in ENotReady State
+//!@SYMTestPriority 4
+//!@SYMTestActions 1. Create audio recorder utility. 2. Check the call back MoscoStateChangeEvent code after Set and Get the number of channels
+//! for the audio clip to be recorded before Open an Audio file.
+//!@SYMTestExpectedResults 1. ENotReady State: SetDestinationNumberOfChannelsL should leave with KErrNotSupported. 2.ENotReady State: DestinationNumberOfChannelsL
+//! should leave with KErrNotSupported.
+RUN_TEST_STEP 300000 CHAR_MMF_AUDIOREC MM-MMF-ARCLNT-CHRTZ-I-0097 \char\mmf\char_mmf_audiorec.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/Invalid
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/Invalid has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/aud_vid.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/aud_vid.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/invalidcodecavi.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/invalidcodecavi.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/jfif10_4.jpg
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/jfif10_4.jpg has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/longvideoplay.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/longvideoplay.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/maintst3.wav
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/maintst3.wav has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/text.avi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/text.avi Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,1 @@
+junk video file
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/xvidmp3.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/xvidmp3.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/xvidonly.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/data/xvidonly.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -25,3 +25,15 @@
../group/char_mmf_videoplay.iby /epoc32/rom/include/char_mmf_videoplay.iby
../group/char_mmf_videoplay_excl_test.iby /epoc32/rom/include/char_mmf_videoplay_excl_test.iby
+
+// Data files for video player utility
+../data/longvideoplay.avi c:/char/mmf/data/longvideoplay.avi
+../data/xvidonly.avi c:/char/mmf/data/xvidonly.avi
+../data/aud_vid.avi c:/char/mmf/data/aud_vid.avi
+../data/invalidcodecavi.avi c:/char/mmf/data/invalidcodecavi.avi
+../data/jfif10_4.jpg c:/char/mmf/data/jfif10_4.jpg
+../data/maintst3.wav c:/char/mmf/data/maintst3.wav
+../data/Invalid c:/char/mmf/data/invalid
+../data/text.avi c:/char/mmf/data/text.avi
+../data/xvidmp3.avi c:/char/mmf/data/xvidmp3.avi
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/Invalid
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/Invalid has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/aud_vid.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/aud_vid.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/invalidcodecavi.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/invalidcodecavi.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/jfif10_4.jpg
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/jfif10_4.jpg has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/longvideoplay.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/longvideoplay.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/maintst3.wav
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/maintst3.wav has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/text.avi
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/text.avi Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-junk video file
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/xvidmp3.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/xvidmp3.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/xvidonly.avi
Binary file mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/data/xvidonly.avi has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -55,15 +55,3 @@
// Data files for Audio Controller
-
-// Data files for video player utility
-../data/longvideoplay.avi c:/char/mmf/data/longvideoplay.avi
-../data/xvidonly.avi c:/char/mmf/data/xvidonly.avi
-../data/aud_vid.avi c:/char/mmf/data/aud_vid.avi
-../data/invalidcodecavi.avi c:/char/mmf/data/invalidcodecavi.avi
-../data/jfif10_4.jpg c:/char/mmf/data/jfif10_4.jpg
-../data/maintst3.wav c:/char/mmf/data/maintst3.wav
-../data/Invalid c:/char/mmf/data/invalid
-../data/text.avi c:/char/mmf/data/text.avi
-../data/xvidmp3.avi c:/char/mmf/data/xvidmp3.avi
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7805.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7805.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7805.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -59,7 +59,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // TODO check?? assume pass
+ iAllocTestStepResult = EPass; // XXX check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
aPlayer->UseSharedHeap(); //-Enable UseSharedHeap to test controller alloc failures
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7806.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7806.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7806.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -57,7 +57,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // TODO check?? assume pass
+ iAllocTestStepResult = EPass; // XXX check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
for(;;)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7908.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7908.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7908.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -67,7 +67,7 @@
TInt failCount = 0;//total fail count for all the steps = sum of fail counts in each step
TInt stepFailCount; //fail count in each step
- TVerdict iAllocTestStepResult = EPass; // TODO check?? assume pass
+ TVerdict iAllocTestStepResult = EPass; // XXX check?? assume pass
err = PerformTestStep(1, stepFailCount);
failCount += stepFailCount;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -177,7 +177,7 @@
INFO_PRINTF1( _L("Convert CMdaAudioConvertUtility"));
CActiveScheduler::Start();
- // TODO Improve test. e.g. check that a valid AU file is written
+ // XXX Improve test. e.g. check that a valid AU file is written
if(iError == KErrNone)
{
ret = EPass;
@@ -192,7 +192,7 @@
{
CActiveScheduler::Start();
- // TODO Improve test. e.g. check that a valid AU file is written
+ // XXX Improve test. e.g. check that a valid AU file is written
if(iError == KErrNone)
{
ret = EPass;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestPlayerUtils.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestPlayerUtils.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestPlayerUtils.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1423,7 +1423,7 @@
INFO_PRINTF2( _L("Volume: Max Volume = %d"),iVolume);
//on device & emulator KMaxVolume have different values
- //if(iVolume != KMaxVolume) // TODO: how to cross ref. this appears to be random values at the moment
+ //if(iVolume != KMaxVolume) // XXX: how to cross ref. this appears to be random values at the moment
// {
// INFO_PRINTF3( _L("Expected volume: %d, received volume : %d"),
// KMaxVolume, iVolume);
@@ -2111,8 +2111,8 @@
// what code should/might look like.
//CMdaAudioType* type = aPlayer->TypeL();
- // CMdaAudioType class incomplete:
- // TODO check data returned is valid???
+ // CMdaAudioType class not complete:
+ // XXX check data returned is valid???
return ret;
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1303,7 +1303,7 @@
TUint sampleRate = recUtil->DestinationSampleRateL();
TUint bitRate = recUtil->DestinationBitRateL();
- // hack for GSM which returns zero as the bit rate because internally
+ //xxx work around for GSM which returns zero as the bit rate because internally
// BitsPerSample is zero
if (bitRate==0)
{
@@ -5698,7 +5698,7 @@
}
- //try cotinuing playing and get positions while playing if there is more time. TBD
+ //xxx try cotinuing playing and get positions while playing if there is more time.
INFO_PRINTF1(_L("finished with this test step"));
// test steps return a result
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+//Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -25,8 +25,6 @@
// Server for Capability testing
../mmpfiles/DSCapTestServer.mmp
../CapTestServer/group/CapTestServer.mmp
-../../SDevSound/SDSCapTestServer/group/SDSCapTestServer.mmp
-../../SDevSound/SDSCapTestServer/group/SDSMMDDTestServer.mmp
// TSI_WP5 files
@@ -43,6 +41,9 @@
// ACLNT scripts
../scripts/TSI_MMF_ACLNT_00.script c:/tsi_mmf_aclnt_00.script
../scripts/TSI_MMF_ACLNT_01.script c:/tsi_mmf_aclnt_01.script
+../scripts/TSI_MMF_ACLNT_01_POS_1.script c:/TSI_MMF_ACLNT_01_POS_1.script
+../scripts/TSI_MMF_ACLNT_01_POS_2.script c:/TSI_MMF_ACLNT_01_POS_2.script
+../scripts/TSI_MMF_ACLNT_01_NEG.script c:/TSI_MMF_ACLNT_01_NEG.script
../scripts/TSI_MMF_ACLNT_02.script c:/tsi_mmf_aclnt_02.script
../scripts/TSI_MMF_ACLNT_03.script c:/tsi_mmf_aclnt_03.script
../scripts/TSI_MMF_ACLNT_04.script c:/tsi_mmf_aclnt_04.script
@@ -51,6 +52,7 @@
../scripts/tsi_mmf_aclnt_00_not_ne.script c:/tsi_mmf_aclnt_00_not_ne.script
../scripts/tsi_mmf_aclnt_00_not_ne_1.script c:/tsi_mmf_aclnt_00_not_ne_1.script
../scripts/tsi_mmf_aclnt_00_not_ne_2.script c:/tsi_mmf_aclnt_00_not_ne_2.script
+../scripts/tsi_mmf_aclnt_00_not_ne_3.script c:/tsi_mmf_aclnt_00_not_ne_3.script
../scripts/TSI_MMF_ACLNT_00_PREEMPTION.script c:/tsi_mmf_aclnt_00_preemption.script
../scripts/TSI_MMF_ACLNT_01_PREEMPTION.script c:/tsi_mmf_aclnt_01_preemption.script
../scripts/TSI_MMF_ACLNT_03_PREEMPTION.script c:/tsi_mmf_aclnt_03_preemption.script
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/inttest_aclnt_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/inttest_aclnt_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/inttest_aclnt_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -14,28 +14,37 @@
//*Files (scripts, data, etc.) To Copy...
"\epoc32\release\armv5\udeb\tsi_mmfaclnt.dll"-"c:\sys\bin\tsi_mmfaclnt.dll"
+
"\epoc32\release\armv5\urel\tsi_mmfuseoldcodecaudiocontroller.dll"-"c:\sys\bin\tsi_mmfuseoldcodecaudiocontroller.dll"
+"\epoc32\localisation\101F7D39\rsc\101F7D39.rpp"-"c:\localisation\101F7D39\rsc\101F7D39.rpp"
+"\epoc32\localisation\group\101F7D39.info"-"c:\localisation\group\101F7D39.info"
+"\epoc32\data\z\resource\plugins\tsi_mmfuseoldcodecaudiocontroller.rsc"-"c:\resource\plugins\tsi_mmfuseoldcodecaudiocontroller.rsc"
+
"\epoc32\release\armv5\urel\dscaptestserver.exe"-"c:\sys\bin\dscaptestserver.exe"
//"\epoc32\release\armv5\urel\MmfDummyPolicyProxy.dll"-"c:\sys\bin\MmfDummyPolicyProxy.dll"
// script files
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_00.script"-"c:\TSI_MMF_ACLNT_00.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_nona3f.script"-"c:\tsi_mmf_aclnt_00_nona3f.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_nona3f.script"-"c:\tsi_mmf_aclnt_00_nona3f.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne.script"-"c:\tsi_mmf_aclnt_00_not_ne.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_1.script"-"c:\tsi_mmf_aclnt_00_not_ne_1.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_2.script"-"c:\tsi_mmf_aclnt_00_not_ne_2.script"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_3.script"-"c:\tsi_mmf_aclnt_00_not_ne_3.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_00_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_00_PREEMPTION.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_truepause.script"-"c:\tsi_mmf_aclnt_00_truepause.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_truepause.script"-"c:\tsi_mmf_aclnt_00_truepause.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01.script"-"c:\TSI_MMF_ACLNT_01.script"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_POS_1.script"-"c:\TSI_MMF_ACLNT_01_POS_1.script"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_POS_2.script"-"c:\TSI_MMF_ACLNT_01_POS_2.script"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_NEG.script"-"c:\TSI_MMF_ACLNT_01_NEG.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_01_PREEMPTION.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_02.script"-"c:\TSI_MMF_ACLNT_02.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_03.script"-"c:\TSI_MMF_ACLNT_03.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_03_nona3f.script"-"c:\tsi_mmf_aclnt_03_nona3f.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_03_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_03_PREEMPTION.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_03_truepause.script"-"c:\tsi_mmf_aclnt_03_truepause.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_03_truepause.script"-"c:\tsi_mmf_aclnt_03_truepause.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_04.script"-"c:\TSI_MMF_ACLNT_04.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN.script"-"c:\TSI_MMF_ACLNT_ARN.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"-"c:\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN.script"-"c:\TSI_MMF_ACLNT_ARN.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"-"c:\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_DRM.script"-"c:\TSI_MMF_ACLNT_DRM.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_FS.script"-"c:\TSI_MMF_ACLNT_FS.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_OF.script"-"c:\TSI_MMF_ACLNT_OF.script"
@@ -64,6 +73,7 @@
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCMU16BE.wav"-"c:\aclntitestdata\PCMU16BE.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCMU16.wav"-"c:\aclntitestdata\PCMU16.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst.wav"-"c:\aclntitestdata\mainTst.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst.ogg"-"c:\aclntitestdata\mainTst.ogg"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\small.wav"-"c:\aclntitestdata\small.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\small.au"-"c:\aclntitestdata\small.au"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test.wav"-"c:\aclntitestdata\test.wav"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01.script Mon Aug 23 18:56:36 2010 +0100
@@ -134,364 +134,4 @@
//! @SYMTestCaseID MM-MMF-ACLNT-I-5011-HP
RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5011-HP \audio.ini
-TEST_COMPLETE
-
-#DEF036641
-# record to an existing IMAD .wav file
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5013-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5013-HP \audio.ini
-TEST_COMPLETE
-
-#DEF036640
-# record to an existing .wav file with a different sample rate
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5014-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5014-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test
-# Set and enquire gain.
-RUN_UTILS CopyFile c:\AclntITestData\explo.wav c:\AclntITestData\explo.$$$
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5015-HP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-5015-HP \audio.ini
-TEST_COMPLETE
-
-#INC038043 Play a file with a different sample rate/number of channels
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5016-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5016-HP \audio.ini
-TEST_COMPLETE
-
-#DEF039308 - No integration test to test playback of recorded raw file
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5017-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5017-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6001-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6001-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6002-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6002-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6003-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6003-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6004-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6004-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6005-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6005-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6006-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6006-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6007-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6007-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6008-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6008-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6009-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6009-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.7
-# Open a URL
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0054-LP
-
-#RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-0054-LP \audio.ini
-#TEST_COMPLETE
-
-#Req. under test REQ172.1.28.14
-# Set and enquire position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0055-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0055-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.13
-# enquire duration
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0056-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0056-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.19
-# set meta information
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0057-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0057-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.22 REQ172.1.28.23
-# Set and enquire balance
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0059-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0059-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.10
-# Set maximum length of file in bytes and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0060-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0060-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.2 REQ172.1.2.1
-# Query recordable formats
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0061-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0061-LP \audio.ini
-TEST_COMPLETE
-
-
-#Sierra REQ2870 Audio Bitrate
-# Query audio bitrate
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0062-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0062-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0063-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0063-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0064-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0064-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0065-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0065-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0066-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0066-LP \audio.ini
-TEST_COMPLETE
-
-################ NEGATIVE TESTS ###############
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8
-# Record audio to unsupported file.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1200-CP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1200-CP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Record utility - Delete object before record operation has completed.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1201-HP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1201-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.16 REQ172.1.28.17 REQ172.1.28.18
-# set gain to invalid gain value
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1204-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1204-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.16 REQ172.1.28.17 REQ172.1.28.18
-# set gain to invalid gain value
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1208-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1208-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.14
-# Set invalid position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1205-HP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1205-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.14
-# Set invalid position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1209-HP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1209-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.22 REQ172.1.28.23
-# Set invalid balance
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1206-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1206-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.22 REQ172.1.28.23
-# Set invalid balance
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1210-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1210-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.10
-# Set invalid maximum length of file in bytes and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1207-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1207-LP \audio.ini
-TEST_COMPLETE
-
-
-
-
-
-
-
-
-
-//These tests have been written to prove CMdaAudioRecorderUtility when only one
-//controller has been identified (recorder or playback) INC25475
-//They use the wav format and the standard audio controller; but require the
-//wav interface (101F53C0.rss) to be edited to remove support for playback/record.
-//When conducting tests 5100-5105, remove the DEcode format interface.
-//When conducting tests 5110-5115, remove the ENcode format interface.
-
-//Due to the need to edit the wav format resource file, only one block of tests can be run
-//at a time 5100-5105 or 5110-5115.
-
-//Also, CMdaAudioRecorderUtility is written to try the record controller as the playback
-//controller if a playback controller has not been specified; this must be disabled.
-//Edit the methods CMMFMdaAudioRecorderUtility::DoOpenFile and DoOpenDes() as follows.
-//
-// if(aPlaybackControllerUid == KNullUid)
-// {
-// PlaybackControllerUidSupplied = EFalse;
-// aPlaybackControllerUid = aControllerUid;
-
-// add
-// -->> TUid tmpid = {0x9999};
-// -->> aPlaybackControllerUid = tmpid;
-// }
-
-
-//These tests confirm operation where no playback controller has been identified
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5100-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5100-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5101-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5101-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5102-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5102-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5103-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5103-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5104-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5104-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5105-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5105-HP \audio.ini
-//TEST_COMPLETE
-
-
-
-//These tests confirm operation where no record controller has been identified
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5110-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5110-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5111-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5111-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5112-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5112-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5113-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5113-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5114-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5114-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5115-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5115-HP \audio.ini
-//TEST_COMPLETE
-
-//This test for DEF039893 Call GetBalance when SetBalance has not been set
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6050-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6050-LP \audio.ini
-TEST_COMPLETE
-
-//This test for DEF039850 An MMF format plugin with empty header tag results in any file being recognized
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6051-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6051-LP \audio.ini
-TEST_COMPLETE
-
-//CR1566
-//!@SYMTestCaseID MM-MMF-ACLNT-I-5018-HP
-//!@SYMTestCaseDesc Record-Stop-Record audio
-//!@SYMREQ
-//!@SYMPREQ
-//!@SYMTestPriority
-//!@SYMTestActions 1. Open a WAV file for recording
-//! 2. Start recording
-//! 3. After 2 seconds stop recording
-//! 4. Start recording again
-//!@SYMTestExpectedResults Check transitions correspond to the performed operations
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5018-HP \audio.ini
TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01_NEG.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01_NEG.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,202 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+LOAD_SUITE TSI_MMFACLNT.DLL
+#PAUSE_AT_END
+
+# wait for ring.wav to finish playing
+delay 1000
+
+################ NEGATIVE TESTS ###############
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8
+# Record audio to unsupported file.
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1200-CP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1200-CP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Record utility - Delete object before record operation has completed.
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1201-HP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1201-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.16 REQ172.1.28.17 REQ172.1.28.18
+# set gain to invalid gain value
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1204-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1204-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.16 REQ172.1.28.17 REQ172.1.28.18
+# set gain to invalid gain value
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1208-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1208-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.14
+# Set invalid position
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1205-HP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1205-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.14
+# Set invalid position
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1209-HP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1209-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.22 REQ172.1.28.23
+# Set invalid balance
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1206-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1206-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.22 REQ172.1.28.23
+# Set invalid balance
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1210-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1210-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.10
+# Set invalid maximum length of file in bytes and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-1207-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1207-LP \audio.ini
+TEST_COMPLETE
+
+//These tests have been written to prove CMdaAudioRecorderUtility when only one
+//controller has been identified (recorder or playback) INC25475
+//They use the wav format and the standard audio controller; but require the
+//wav interface (101F53C0.rss) to be edited to remove support for playback/record.
+//When conducting tests 5100-5105, remove the DEcode format interface.
+//When conducting tests 5110-5115, remove the ENcode format interface.
+
+//Due to the need to edit the wav format resource file, only one block of tests can be run
+//at a time 5100-5105 or 5110-5115.
+
+//Also, CMdaAudioRecorderUtility is written to try the record controller as the playback
+//controller if a playback controller has not been specified; this must be disabled.
+//Edit the methods CMMFMdaAudioRecorderUtility::DoOpenFile and DoOpenDes() as follows.
+//
+// if(aPlaybackControllerUid == KNullUid)
+// {
+// PlaybackControllerUidSupplied = EFalse;
+// aPlaybackControllerUid = aControllerUid;
+
+// add
+// -->> TUid tmpid = {0x9999};
+// -->> aPlaybackControllerUid = tmpid;
+// }
+
+
+//These tests confirm operation where no playback controller has been identified
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5100-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5100-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5101-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5101-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5102-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5102-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5103-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5103-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5104-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5104-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5105-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5105-HP \audio.ini
+//TEST_COMPLETE
+
+
+
+//These tests confirm operation where no record controller has been identified
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5110-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5110-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5111-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5111-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5112-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5112-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5113-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5113-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5114-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5114-HP \audio.ini
+//TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5115-HP
+
+//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5115-HP \audio.ini
+//TEST_COMPLETE
+
+//This test for DEF039893 Call GetBalance when SetBalance has not been set
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6050-LP
+
+RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6050-LP \audio.ini
+TEST_COMPLETE
+
+//This test for DEF039850 An MMF format plugin with empty header tag results in any file being recognized
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6051-LP
+
+RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6051-LP \audio.ini
+TEST_COMPLETE
+
+//CR1566
+//!@SYMTestCaseID MM-MMF-ACLNT-I-5018-HP
+//!@SYMTestCaseDesc Record-Stop-Record audio
+//!@SYMREQ
+//!@SYMPREQ
+//!@SYMTestPriority
+//!@SYMTestActions 1. Open a WAV file for recording
+//! 2. Start recording
+//! 3. After 2 seconds stop recording
+//! 4. Start recording again
+//!@SYMTestExpectedResults Check transitions correspond to the performed operations
+RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5018-HP \audio.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01_POS_1.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01_POS_1.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,112 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+LOAD_SUITE TSI_MMFACLNT.DLL
+#PAUSE_AT_END
+
+# wait for ring.wav to finish playing
+delay 1000
+
+###################### POSITIVE TEST ###############
+
+#DEF036641
+# record to an existing IMAD .wav file
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5013-HP
+
+RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5013-HP \audio.ini
+TEST_COMPLETE
+
+#DEF036640
+# record to an existing .wav file with a different sample rate
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5014-HP
+
+RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5014-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test
+# Set and enquire gain.
+RUN_UTILS CopyFile c:\AclntITestData\explo.wav c:\AclntITestData\explo.$$$
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5015-HP
+
+RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-5015-HP \audio.ini
+TEST_COMPLETE
+
+#INC038043 Play a file with a different sample rate/number of channels
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5016-HP
+
+RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5016-HP \audio.ini
+TEST_COMPLETE
+
+#DEF039308 - No integration test to test playback of recorded raw file
+//! @SYMTestCaseID MM-MMF-ACLNT-I-5017-HP
+
+RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5017-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6001-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6001-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6002-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6002-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6003-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6003-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6004-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6004-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6005-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6005-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6006-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6006-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6007-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6007-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
+# Open a descriptor based clip and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-6008-HP
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6008-HP \audio.ini
+TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01_POS_2.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_01_POS_2.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,99 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+LOAD_SUITE TSI_MMFACLNT.DLL
+#PAUSE_AT_END
+
+# wait for ring.wav to finish playing
+delay 1000
+
+###################### POSITIVE TEST ###############
+
+
+RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6009-HP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.7
+# Open a URL
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0054-LP
+
+#RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-0054-LP \audio.ini
+#TEST_COMPLETE
+
+#Req. under test REQ172.1.28.14
+# Set and enquire position
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0055-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0055-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.13
+# enquire duration
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0056-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0056-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.19
+# set meta information
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0057-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0057-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.22 REQ172.1.28.23
+# Set and enquire balance
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0059-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0059-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.10
+# Set maximum length of file in bytes and record
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0060-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0060-LP \audio.ini
+TEST_COMPLETE
+
+#Req. under test REQ172.1.28.2 REQ172.1.2.1
+# Query recordable formats
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0061-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0061-LP \audio.ini
+TEST_COMPLETE
+
+
+#Sierra REQ2870 Audio Bitrate
+# Query audio bitrate
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0062-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0062-LP \audio.ini
+TEST_COMPLETE
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0063-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0063-LP \audio.ini
+TEST_COMPLETE
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0064-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0064-LP \audio.ini
+TEST_COMPLETE
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0065-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0065-LP \audio.ini
+TEST_COMPLETE
+//! @SYMTestCaseID MM-MMF-ACLNT-I-0066-LP
+
+RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0066-LP \audio.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_not_ne_1.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_not_ne_1.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_not_ne_1.script Mon Aug 23 18:56:36 2010 +0100
@@ -43,22 +43,4 @@
TEST_COMPLETE
RUN_TEST_STEP 500000,ACLNT, MM-MMF-ACLNT-I-0082-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0083-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0084-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0087-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 2000000,ACLNT, MM-MMF-ACLNT-I-0088-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0086-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0085-HP \audio.ini
TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_not_ne_3.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_not_ne_3.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,37 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+LOAD_SUITE TSI_MMFACLNT.DLL
+delay 1000
+
+#For CR1424 For player test(AudioController)
+
+RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0083-HP \audio.ini
+TEST_COMPLETE
+
+RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0084-HP \audio.ini
+TEST_COMPLETE
+
+RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0087-HP \audio.ini
+TEST_COMPLETE
+
+RUN_TEST_STEP 2000000,ACLNT, MM-MMF-ACLNT-I-0088-HP \audio.ini
+TEST_COMPLETE
+
+RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0086-HP \audio.ini
+TEST_COMPLETE
+
+RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0085-HP \audio.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/TSI_MmfCtlfrmNeg.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/TSI_MmfCtlfrmNeg.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/TSI_MmfCtlfrmNeg.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -278,7 +278,7 @@
TVerdict RTestMmfCtlfrmI0513::DoTestStepL()
{
- // *** TODO : we may have problems here. the only controller we have is the
+ //XXX : we may have problems here. the only controller we have is the
// Audio Controller and this does not yet support removal of sources/sinks,
// whether it's playing or not...
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/group/inttest_ctlfrm_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/group/inttest_ctlfrm_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/group/inttest_ctlfrm_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -13,13 +13,40 @@
// Description:
//*Files (scripts, data, etc.) To Copy...
+"\epoc32\release\armv5\udeb\tsi_mmfctlfrm.dll"-"c:\sys\bin\tsi_mmfctlfrm.dll"
+
+"\epoc32\release\armv5\udeb\tsi_mmfcustomcommands.dll"-"c:\sys\bin\tsi_mmfcustomcommands.dll"
+
"\epoc32\release\armv5\urel\tsi_mmfcontroller.dll"-"c:\sys\bin\tsi_mmfcontroller.dll"
+"\epoc32\localisation\101f7bf9\rsc\101f7bf9.rpp"-"c:\localisation\101f7bf9\rsc\101f7bf9.rpp"
+"\epoc32\localisation\group\101f7bf9.info"-"c:\localisation\group\101f7bf9.info"
+"\epoc32\data\z\resource\plugins\tsi_mmfcontroller.rsc"-"c:\resource\plugins\tsi_mmfcontroller.rsc"
+
"\epoc32\release\armv5\urel\tsi_mmfcontroller2.dll"-"c:\sys\bin\tsi_mmfcontroller2.dll"
-"\epoc32\release\armv5\urel\tsi_mmfctlfrm.dll"-"c:\sys\bin\tsi_mmfctlfrm.dll"
-"\epoc32\release\armv5\urel\tsi_mmfcustomcommands.dll"-"c:\sys\bin\tsi_mmfcustomcommands.dll"
+"\epoc32\localisation\101f7bfb\rsc\101f7bfb.rpp"-"c:\localisation\101f7bfb\rsc\101f7bfb.rpp"
+"\epoc32\localisation\group\101f7bfb.info"-"c:\localisation\group\101f7bfb.info"
+"\epoc32\data\z\resource\plugins\tsi_mmfcontroller2.rsc"-"c:\resource\plugins\tsi_mmfcontroller2.rsc"
+
"\epoc32\release\armv5\urel\tsi_mmfdatasink.dll"-"c:\sys\bin\tsi_mmfdatasink.dll"
+"\epoc32\localisation\101f7bfd\rsc\101f7bfd.rpp"-"c:\localisation\101f7bfd\rsc\101f7bfd.rpp"
+"\epoc32\localisation\group\101f7bfd.info"-"c:\localisation\group\101f7bfd.info"
+"\epoc32\data\z\resource\plugins\tsi_mmfdatasink.rsc"-"c:\resource\plugins\tsi_mmfdatasink.rsc"
+
"\epoc32\release\armv5\urel\tsi_mmfdatasource.dll"-"c:\sys\bin\tsi_mmfdatasource.dll"
+"\epoc32\localisation\101f7bff\rsc\101f7bff.rpp"-"c:\localisation\101f7bff\rsc\101f7bff.rpp"
+"\epoc32\localisation\group\101f7bff.info"-"c:\localisation\group\101f7bff.info"
+"\epoc32\data\z\resource\plugins\tsi_mmfdatasource.rsc"-"c:\resource\plugins\tsi_mmfdatasource.rsc"
+
"\epoc32\release\armv5\urel\tsi_mmfformat.dll"-"c:\sys\bin\tsi_mmfformat.dll"
+"\epoc32\localisation\101ffa10\rsc\101ffa10.rpp"-"c:\localisation\101ffa10\rsc\101ffa10.rpp"
+"\epoc32\localisation\group\101ffa10.info"-"c:\localisation\group\101ffa10.info"
+"\epoc32\data\z\resource\plugins\tsi_mmfformat.rsc"-"c:\resource\plugins\tsi_mmfformat.rsc"
+
+"\epoc32\release\armv5\urel\custommmfaudiocontroller.dll"-"c:\sys\bin\custommmfaudiocontroller.dll"
+"\epoc32\localisation\101f7d29\rsc\101f7d29.rpp"-"c:\localisation\101f7d29\rsc\101f7d29.rpp"
+"\epoc32\localisation\group\101f7d29.info"-"c:\localisation\group\101f7d29.info"
+"\epoc32\data\z\resource\plugins\custommmfaudiocontroller.rsc"-"c:\resource\plugins\custommmfaudiocontroller.rsc"
+
//"\epoc32\release\armv5\urel\tsi_mmfrecog.dll"-"c:\sys\bin\tsi_mmfrecog.dll"
// script files
@@ -36,4 +63,4 @@
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\test.wav"-"c:\tsimmfctlfrmdata\test.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\test2.wav"-"c:\tsimmfctlfrmdata\test2.wav"
//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.abc"-"c:\tsimmfctlfrmdata\Test.abc"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.xyz"-"c:\tsimmfctlfrmdata\Test.xyz"
\ No newline at end of file
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.xyz"-"c:\tsimmfctlfrmdata\Test.xyz"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/IntTest_SDevsound_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/IntTest_SDevsound_data.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/IntTest_SDevsound_data.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,6 @@
"\epoc32\release\armv5\urel\tsi_mmf_sdevsound.dll"-"c:\sys\bin\tsi_mmf_sdevsound.dll"
+"\epoc32\release\armv5\urel\sdsmmddtestserver.exe"-"c:\sys\bin\sdsmmddtestserver.exe"
+"\epoc32\release\armv5\urel\sdscaptestserver.exe"-"c:\sys\bin\sdscaptestserver.exe"
// script files
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\scriptFiles\TSI_MMF_SDEVSOUND_01.script"-"c:\TSI_MMF_SDEVSOUND_01.script"
@@ -7,8 +9,9 @@
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\scriptFiles\TSI_MMF_SDEVSOUND_MMDDCAP.script"-"c:\TSI_MMF_SDEVSOUND_MMDDCAP.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\scriptFiles\TSI_MMF_SDEVSOUND_NOCAP.script"-"c:\TSI_MMF_SDEVSOUND_NOCAP.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\scriptFiles\TSI_MMF_SDEVSOUND_UECAP.script"-"c:\TSI_MMF_SDEVSOUND_UECAP.script"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\scriptFiles\sdevsound_audio.ini"-"c:\sdevsound_audio.ini"
// Data files
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\data\8bitmPcm.wav"-"c:\sdevsoundinttestdata\8bitmPcm.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\data\mainTst.wav"-"c:\sdevsoundinttestdata\mainTst.wav"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\data\PCM_08_16_m.raw"-"c:\sdevsoundinttestdata\PCM_08_16_m.raw"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\data\PCM_08_16_m.raw"-"c:\sdevsoundinttestdata\PCM_08_16_m.raw"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_01.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_01.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_01.script Mon Aug 23 18:56:36 2010 +0100
@@ -26,7 +26,7 @@
//!@SYMTestPriority 2
//!@SYMTestActions audioRec[0] call OpenFileL and RecordL. audioRec[0] has MultimediaDD & UserEnvironment capability.
//!@SYMTestExpectedResults Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP 440000 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0023-HP \audio.ini
+RUN_TEST_STEP 440000 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0023-HP \sdevsound_audio.ini
TEST_COMPLETE
//!@SYMTestCaseID MM-MMF-SDEVSOUND-I-0037-HP
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script Mon Aug 23 18:56:36 2010 +0100
@@ -25,5 +25,5 @@
//!@SYMTestPriority 2
//!@SYMTestActions audioRec[0] call OpenFileL and RecordL. audioRec[0] has MultimediaDD capability.
//!@SYMTestExpectedResults Check whether KErrPermissionDenied is returned.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0021-HP \audio.ini
+RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0021-HP \sdevsound_audio.ini
TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script Mon Aug 23 18:56:36 2010 +0100
@@ -61,7 +61,7 @@
//!@SYMTestPriority 2
//!@SYMTestActions audioUtil[0] call PlayFileL. audioUtil[0] has no MultimediaDD capability
//!@SYMTestExpectedResults Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0011-HP \audio.ini
+RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0011-HP \sdevsound_audio.ini
TEST_COMPLETE
//!@SYMTestCaseID MM-MMF-SDEVSOUND-I-0013-HP
@@ -70,7 +70,7 @@
//!@SYMTestPriority 2
//!@SYMTestActions audioRec[0] call OpenFileL and RecordL. audioRec[0] has no UserEnv capability (NONE capability).
//!@SYMTestExpectedResults Check whether KErrPermissionDenied is returned. (Earlier returned no errors as recording behaviour has changed)
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0013-HP \audio.ini
+RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0013-HP \sdevsound_audio.ini
TEST_COMPLETE
//!@SYMTestCaseID MM-MMF-SDEVSOUND-I-0035-HP
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script Mon Aug 23 18:56:36 2010 +0100
@@ -25,5 +25,5 @@
//!@SYMTestPriority 2
//!@SYMTestActions audioRec[0] call OpenFileL and RecordL. audioRec[0] has UserEnvironment capability.
//!@SYMTestExpectedResults Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0022-HP \audio.ini
+RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0022-HP \sdevsound_audio.ini
TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/sdevsound_audio.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/scriptFiles/sdevsound_audio.ini Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,177 @@
+[SectionOne]
+sectionNum= 1
+playerAudioFile = \AclntITestData\mainTst.wav
+playerAudioFile2 = \AclntITestData\mainTst2.wav
+sequenceFile= \AclntITestData\test.sqn
+PCM8 = \AclntITestData\8bitmPcm.wav
+PCM8-6144bytes = \AclntITestData\8bitmPcm-6144bytes.wav
+PCM8output = \AclntITestData\8bitmPcmOutput.wav
+ALAW = \AclntITestData\8bitmAlaw.wav
+PCM16 = \AclntITestData\16bitmPcm.wav
+PCMU8 = \AclntITestData\8bitmUPCM.wav
+PCMU16BE = \AclntITestData\PCMU16BE.wav
+PCMU16 = \AclntITestData\PCMU16.wav
+MULAW = \AclntITestData\8bitmuLaw.wav
+IMAD = \AclntITestData\IMAD.wav
+IMAS = \AclntITestData\IMAS.wav
+GSM610 = \AclntITestData\Gsm610.wav
+cropAudioFile = \AclntITestData\CropMe.wav
+Pcm8Mono44khz = \AclntITestData\pcm8mono44khz.wav
+Pcm16Mono44khz = \AclntITestData\pcm16mono44khz.wav
+PCMU8_22254Hz_ALF = \AclntITestData\alf-noproblem.wav
+Pcm16Mono48khz = \AclntITestData\pcm16mono48khz.wav
+100khzSRate1KhzTone = \AclntITestData\100khzSRate1KhzTone.wav
+7.33khzSRate1KhzTone = \AclntITestData\7.33khzSRate1KhzTone.wav
+Sequence1 = \AclntITestData\sequence1.sqn
+Sequence2 = \AclntITestData\sequence2.sqn
+PCM16WrongExtension1 = \AclntITestData\16bitmPcm.xxx
+PCM16WrongExtension2 = \AclntITestData\explo.$$$
+Pcm16Mono12khz = \AclntITestData\pcm16mono12khz.wav
+Pcm16Mono24khz = \AclntITestData\pcm16mono24khz.wav
+inputTextFile = \AclntITestData\textInput.wav
+
+[SectionTwo]
+sectionNum = 2
+playerAudioFile = \AclntITestData\small.wav
+
+[SectionThree]
+OneSampleFile = \AclntITestData\OneSample.wav
+outputAudioFile = \AclntITestData\ouput.wav
+outputAudioFileRaw = \AclntITestData\ouput.raw
+outputTextFile = \AclntITestData\textOutput.wav
+playerAudioFile = \AclntITestData\mainTst.wav
+cropAudioFile = \AclntITestData\CropMe.wav
+
+[SectionFour]
+auAudioFile = \AclntITestData\Gsm610.wav
+wavAudioFile = \AclntITestData\mainTest.wav
+configAudio = c:\AclntITestData\testOut.wav
+configAudio2 = c:\AclntTestData\testOut2.wav
+configAudio3 = c:\AclntTestData\testOut3.wav
+configAudio4 = c:\AclntTestData\testOut4.wav
+configAudio5 = c:\AclntTestData\testOut5.wav
+configAudio6 = c:\AclntTestData\testOut6.wav
+configAudio7 = c:\AclntTestData\testOut7.wav
+configAudio8 = c:\AclntTestData\testOut8.wav
+configAudio9 = c:\AclntTestData\testOut9.wav
+configAudio10 = c:\AclntTestData\testOut10.wav
+configAudio11 = c:\AclntTestData\testOut.au
+configAudio12 = c:\AclntITestData\testOut2.wav
+
+
+PCM16_out = c:\AclntITestData\16bitmPcm_out.wav
+PCM8_out = c:\AclntITestData\8bitmPcm_out.wav
+
+PCM16_out_au = c:\AclntITestData\16bitPcm_out.au
+PCM8_out_au = c:\AclntITestData\8bitPcm_out.au
+
+[SectionFive]
+playerAudioFile = \AclntITestData\unsupported.wav
+outputAudioFile = \AclntITestData\output5.wav
+
+[SectionSix]
+playerAudioFile = \AclntITestData\noexist.wav
+outputAudioFile = c:\AclntITestData\output6.wav
+
+[SectionSeven]
+toneSequence = \AclntITestData\test.sqn
+
+[SectionEight]
+playerAudioFile = \AclntITestData\small.wav
+playerAudioFileAU = \AclntITestData\small.au
+
+[SectionNine]
+PCM8bitMonoWav = \AclntITestData\PCM8BitMono.wav
+PCM8bitStereoWav = \AclntITestData\PCM8BitStereo.wav
+PCM8bitMonoAu = \AclntITestData\PCM8BitMono.au
+PCM8bitStereoAu = \AclntITestData\PCM8BitStereo.au
+bitrate64 = 64000
+bitrate128 = 128000
+bitrate256 = 256000
+WAV128 = \AclntITestData\PCM16BitMono.wav
+WAV256 = \AclntITestData\PCM16BitStereo.wav
+AU128 = \AclntITestData\PCM16BitMono.au
+AU256 = \AclntITestData\PCM16BitStereo.au
+
+[SectionTen]
+PCM8 = \sdevsoundinttestdata\8bitmPcm.wav
+outputAudioFile = \sdevsoundinttestdata\ouput.wav
+
+[SectionDRM]
+AudioContent = \AclntITestData\Audio.content
+AudioContentRights = \AclntITestData\Audio.contentrights
+
+;Deprecated - Phase 1
+DRMWavFile = \AclntITestData\drmwavfile.drm
+DRMWavMime = audio/wav
+TestConvertFile = \AclntITestData\testout.wav
+
+[SectionARN]
+playerAudioFile1 = \AclntITestData\mainTst.wav
+playerAudioFile2 = \AclntITestData\mainTst2.wav
+playerAudioFile3 = \AclntITestData\mainTst3.wav
+
+[SectionOgg]
+playerAudioFile = \AclntITestData\mainTst.ogg
+playerAudioFile2 = \AclntITestData\mainTst2.ogg
+cropAudioFile = \AclntITestData\CropMe.ogg
+
+[SectionOggSmall]
+playerAudioFile = \AclntITestData\small.ogg
+
+[SectionOggRec]
+outputAudioFile = \AclntITestData\ouput.ogg
+playerAudioFile = \AclntITestData\small.ogg
+cropAudioFile = \AclntITestData\CropMe.ogg
+
+[SectionOggRecState]
+outputAudioFile = c:\AclntITestData\output6.ogg
+
+[SectionOggAPR]
+playerAudioFile1 = \AclntITestData\mainTst.ogg
+playerAudioFile2 = \AclntITestData\mainTst2.ogg
+playerAudioFile3 = \AclntITestData\mainTst3.ogg
+
+[SectionOggDRM]
+AudioContent = \AclntITestData\AudioOgg.content
+AudioContentRights = \AclntITestData\AudioOgg.contentrights
+
+[SectionRepeatCount]
+numOfRepeat = 2
+newRepeatValue = 4
+maxRepeatValue = 15
+
+[SectionSilence]
+silence = 0
+[SectionTruePause]
+Sequence = \AclntITestData\sequence2.sqn
+Volume = 77
+Balance = 77
+Duration = 17000000
+Pause = 2
+
+[SectionTruePauseAOS]
+RawFile = \AclntITestData\test.raw
+OggFile = \AclntITestData\maintst.ogg
+Pause = 1
+Volume = 77
+Balance = 77
+
+[SectionPlayTrue]
+FilenameWAV = \aclntitestdata\main.wav
+FilenameSQN = \aclntitestdata\sequence1.sqn
+FilenamePCM8 = \AclntITestData\8bitmPcm.wav
+FilenamePCM16 = \AclntITestData\16bitmPcm.wav
+FilenamePCMU8 = \AclntITestData\8bitmUPCM.wav
+FilenamePCMU16 = \AclntITestData\PCMU16.wav
+FilenameAlaw = \AclntITestData\8bitmAlaw.wav
+FilenameMulaw = \AclntITestData\8bitmuLaw.wav
+FilenameIMAD = \aclntitestdata\imad2.wav
+FilenameGSM610 = \AclntITestData\Gsm610.wav
+FilenameOGG = \aclntitestdata\maintst.ogg
+FilenamePCMU16BE = \AclntITestData\PCMU16BE.wav
+Volume = 77
+Balance = 77
+Duration1 = 2
+DurationMiliSec = 700
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -25,7 +25,7 @@
../data/audiorights2.xml c:/securedrm/audiorights2.xml
../data/small.wav c:/securedrm/small.wav
../scripts/securedrm_testdata.ini c:/securedrm_testdata.ini
-../scripts/TSI_MMF_SECUREDRM_TESTDATA.script c:/tsi_mmf_securedrm_testdata.script
+../scripts/te_tsi_mmf_securedrm_testdata.script c:/te_tsi_mmf_securedrm_testdata.script
// SecureDRM scripts
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/inttest_securedrm_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/inttest_securedrm_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/inttest_securedrm_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -15,9 +15,19 @@
"\epoc32\release\armv5\urel\tsi_mmfaclnt.dll"-"c:\sys\bin\tsi_mmfaclnt.dll"
"\epoc32\release\armv5\urel\RTAUtils.exe"-"c:\sys\bin\RTAUtils.exe"
+"\epoc32\release\armv5\urel\rtaserver.exe"-"c:\sys\bin\rtaserver.exe"
+"\epoc32\release\armv5\urel\rtaarchive.dll"-"c:\sys\bin\rtaarchive.dll"
+"\epoc32\release\armv5\urel\rtaclient.dll"-"c:\sys\bin\rtaclient.dll"
+"\epoc32\release\armv5\urel\rtaparser.dll"-"c:\sys\bin\rtaparser.dll"
+"\epoc32\release\armv5\urel\rtavirtualfile.dll"-"c:\sys\bin\rtavirtualfile.dll"
+"\epoc32\release\armv5\urel\caf.dll"-"c:\sys\bin\caf.dll"
+"\epoc32\release\armv5\urel\cafutils.dll"-"c:\sys\bin\cafutils.dll"
+"\epoc32\release\armv5\urel\apgrfx.dll"-"c:\sys\bin\apgrfx.dll"
+"\epoc32\release\armv5\urel\apmime.dll"-"c:\sys\bin\apmime.dll"
+
// script files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\TSI_MMF_SECUREDRM_TESTDATA.script"-"c:\TSI_MMF_SECUREDRM_TESTDATA.script"
+
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\TSI_MMF_SECUREDRM_AUDIO.script"-"c:\TSI_MMF_SECUREDRM_AUDIO.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script"-"c:\TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script"
@@ -30,3 +40,6 @@
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\audiocontent2.xml"-"c:\securedrm\audiocontent2.xml"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\audiorights2.xml"-"c:\securedrm\audiorights2.xml"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\small.wav"-"c:\securedrm\small.wav"
+
+//script file for secure drm test data
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\te_tsi_mmf_securedrm_testdata.script"-"c:\testdata\scripts\te_tsi_mmf_securedrm_testdata.script"
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/scripts/TSI_MMF_SECUREDRM_TESTDATA.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/scripts/TSI_MMF_SECUREDRM_TESTDATA.script Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// <>
-//
-//
-
-# Run using TestExecute as a non-automated utility to create
-# DRM protected content data files:
-#
-# %EPOCROOT%Epoc32\RELEASE\WINSCW\UDEB\testexecute \tsi_mmf_securedrm_testdata.script
-#
-# The output data files are then used as input by the automated TestFramework scripts.
-#
-# Results can be found in %EPOCROOT%Epoc32\winscw\c\Logs\TestExecute
-
-LOAD_SUITE RTAUtils
-
-RUN_TEST_STEP 1000 RTAUtils CreateDrmArchive \securedrm_testdata.ini CreateDrmArchiveAudio
-RUN_TEST_STEP 1000 RTAUtils ImportDrmArchive \securedrm_testdata.ini ImportDrmArchiveAudio
-
-
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/scripts/te_tsi_mmf_securedrm_testdata.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/scripts/te_tsi_mmf_securedrm_testdata.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,33 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// <>
+//
+//
+
+# Run using TestExecute as a non-automated utility to create
+# DRM protected content data files:
+#
+# %EPOCROOT%Epoc32\RELEASE\WINSCW\UDEB\testexecute \tsi_mmf_securedrm_testdata.script
+#
+# The output data files are then used as input by the automated TestFramework scripts.
+#
+# Results can be found in %EPOCROOT%Epoc32\winscw\c\Logs\TestExecute
+
+LOAD_SUITE RTAUtils
+
+RUN_TEST_STEP 1000 RTAUtils CreateDrmArchive \securedrm_testdata.ini CreateDrmArchiveAudio
+RUN_TEST_STEP 1000 RTAUtils ImportDrmArchive \securedrm_testdata.ini ImportDrmArchiveAudio
+
+
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group/integration_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group/integration_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group/integration_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -17,7 +17,6 @@
"\epoc32\release\armv5\udeb\tsi_mmf_devsound.dll"-"c:\sys\bin\tsi_mmf_devsound.dll"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\devsound\scripts\tsi_mmf_devsound_debug.script"-"c:\tsi_mmf_devsound_debug.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\devsound\scripts\tsi_mmf_devsound_alloc.script"-"c:\tsi_mmf_devsound_alloc.script"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\devsound\scripts\tsi_mmf_devsound.ini"-"c:\mm\tsi_mmf_devsound.ini"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\devsound\data\small.ogg"-"c:\tsi_mmf_devsound\small.ogg"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby Mon Aug 23 18:56:36 2010 +0100
@@ -20,7 +20,8 @@
#include
//ini
-data=EPOCROOT##epoc32\data\c\audio.ini \audio.ini
+data=EPOCROOT##epoc32\data\c\audio.ini \audio.ini
+data=EPOCROOT##epoc32\data\c\sdevsound_audio.ini \sdevsound_audio.ini
data=EPOCROOT##epoc32\data\c\securedrm_testdata.ini \securedrm_testdata.ini
data=EPOCROOT##epoc32\data\c\securedrm_audio.ini \securedrm_audio.ini
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -35,7 +35,7 @@
../data/textInput.dummy c:/vclntitestdata/textinput.dummy
//iby files
-../group/tsu_mmf_vclnt.iby /epoc32/rom/include/tsu_mmf_vclnt.iby
-../group/tsu_mmf_vclnt_excl_test.iby /epoc32/rom/include/tsu_mmf_vclnt_excl_test.iby
+../group/tsi_mmf_vclnt.iby /epoc32/rom/include/tsi_mmf_vclnt.iby
+../group/tsi_mmf_vclnt_excl_test.iby /epoc32/rom/include/tsi_mmf_vclnt_excl_test.iby
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsi_mmf_vclnt.iby
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsi_mmf_vclnt.iby Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,38 @@
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef TSI_MMF_VCLNT_IBY
+#define TSI_MMF_VCLNT_IBY
+#include
+
+
+data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_WM.script \TSI_MMF_VCLNT_WM.script
+data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_OF.script \TSI_MMF_VCLNT_OF.script
+data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_OF_ALLOC.script \TSI_MMF_VCLNT_OF_ALLOC.script
+data=EPOCROOT##epoc32\data\c\video.ini \video.ini
+
+// Test files
+data=EPOCROOT##epoc32\data\c\vclntitestdata\longvideo.dummy \vclntitestdata\longvideo.dummy
+data=EPOCROOT##epoc32\data\c\vclntitestdata\shortvideo.dummy \vclntitestdata\shortvideo.dummy
+data=EPOCROOT##epoc32\data\c\vclntitestdata\drmvideo.drm \vclntitestdata\drmvideo.drm
+data=EPOCROOT##epoc32\data\c\vclntitestdata\textoutput.dummy \vclntitestdata\textoutput.dummy
+data=EPOCROOT##epoc32\data\c\vclntitestdata\textInput.dummy \vclntitestdata\textinput.dummy
+
+// SYMBIAN_CAF_V2
+data=EPOCROOT##epoc32\data\c\VclntITestData\Video.contentrights \VclntITestData\Video.contentrights
+data=EPOCROOT##epoc32\data\c\VclntITestData\Video.content \VclntITestData\Video.content
+
+#endif // TSI_MMF_VCLNT_IBY
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsi_mmf_vclnt_data.pkg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsi_mmf_vclnt_data.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2005-2010 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 "Symbian Foundation License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+//ini
+"\epoc32\data\c\video.ini" - "c:\video.ini"
+
+// scripts
+"\epoc32\data\c\TSI_MMF_VCLNT_WM.script" - "c:\TSI_MMF_VCLNT_WM.script"
+"\epoc32\data\c\TSI_MMF_VCLNT_OF.script" - "c:\TSI_MMF_VCLNT_OF.script"
+"\epoc32\data\c\TSI_MMF_VCLNT_OF_ALLOC.script" - "c:\TSI_MMF_VCLNT_OF_ALLOC.script"
+
+// data files
+"\epoc32\data\c\VclntITestData\longvideo.dummy" - "c:\VclntITestData\longvideo.dummy"
+"\epoc32\data\c\VclntITestData\shortvideo.dummy" - "c:\VclntITestData\shortvideo.dummy"
+"\epoc32\data\c\VclntITestData\drmvideo.drm" - "c:\VclntITestData\drmvideo.drm"
+"\epoc32\data\c\VclntITestData\textInput.dummy" - "c:\VclntITestData\textInput.dummy"
+"\epoc32\data\c\VclntITestData\textOutput.dummy" - "c:\VclntITestData\textOutput.dummy"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsi_mmf_vclnt_excl_test.iby
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsi_mmf_vclnt_excl_test.iby Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,29 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef TSI_MMF_VCLNT_EXCL_TEST_IBY
+#define TSI_MMF_VCLNT_EXCL_TEST_IBY
+
+file=ABI_DIR\BUILD_DIR\TSI_MMFVCLNT.DLL System\Libs\TSI_MMFVCLNT.DLL
+
+// plugins for VCLNT
+#ifndef TSU_MMF_VCLNT_EXCL_TEST_IBY
+file=ABI_DIR\BUILD_DIR\TS_CMMFVideoTestCustomCommands.dll System\Libs\TS_CMMFVideoTestCustomCommands.dll
+ECOM_PLUGIN(TS_VideoInput.dll,101f7f8c.rsc)
+ECOM_PLUGIN(TS_VideoOutput.dll,101f7f8d.rsc)
+#endif
+
+#endif // TSI_MMF_VCLNT_EXCL_TEST_IBY
+
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsu_mmf_vclnt.iby
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsu_mmf_vclnt.iby Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef TSU_MMF_VCLNT_IBY
-#define TSU_MMF_VCLNT_IBY
-#include
-
-
-data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_WM.script \TSI_MMF_VCLNT_WM.script
-data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_OF.script \TSI_MMF_VCLNT_OF.script
-data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_OF_ALLOC.script \TSI_MMF_VCLNT_OF_ALLOC.script
-data=EPOCROOT##epoc32\data\c\video.ini \video.ini
-
-// Test files
-data=EPOCROOT##epoc32\data\c\vclntitestdata\longvideo.dummy \vclntitestdata\longvideo.dummy
-data=EPOCROOT##epoc32\data\c\vclntitestdata\shortvideo.dummy \vclntitestdata\shortvideo.dummy
-data=EPOCROOT##epoc32\data\c\vclntitestdata\drmvideo.drm \vclntitestdata\drmvideo.drm
-data=EPOCROOT##epoc32\data\c\vclntitestdata\textoutput.dummy \vclntitestdata\textoutput.dummy
-data=EPOCROOT##epoc32\data\c\vclntitestdata\textInput.dummy \vclntitestdata\textinput.dummy
-
-// SYMBIAN_CAF_V2
-data=EPOCROOT##epoc32\data\c\VclntITestData\Video.contentrights \VclntITestData\Video.contentrights
-data=EPOCROOT##epoc32\data\c\VclntITestData\Video.content \VclntITestData\Video.content
-
-#endif // TSU_MMF_VCLNT_IBY
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsu_mmf_vclnt_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsu_mmf_vclnt_data.pkg Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-;
-; Copyright (c) 2005-2010 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 "Symbian Foundation License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-//ini
-"\epoc32\data\c\video.ini" - "c:\video.ini"
-
-// scripts
-"\epoc32\data\c\TSI_MMF_VCLNT_WM.script" - "c:\TSI_MMF_VCLNT_WM.script"
-"\epoc32\data\c\TSI_MMF_VCLNT_OF.script" - "c:\TSI_MMF_VCLNT_OF.script"
-"\epoc32\data\c\TSI_MMF_VCLNT_OF_ALLOC.script" - "c:\TSI_MMF_VCLNT_OF_ALLOC.script"
-
-// data files
-"\epoc32\data\c\VclntITestData\longvideo.dummy" - "c:\VclntITestData\longvideo.dummy"
-"\epoc32\data\c\VclntITestData\shortvideo.dummy" - "c:\VclntITestData\shortvideo.dummy"
-"\epoc32\data\c\VclntITestData\drmvideo.drm" - "c:\VclntITestData\drmvideo.drm"
-"\epoc32\data\c\VclntITestData\textInput.wav" - "c:\VclntITestData\textInput.wav"
-"\epoc32\data\c\VclntITestData\textOutput.wav" - "c:\VclntITestData\textOutput.wav"
-
-// SYMBIAN_CAF_V2
-"\epoc32\data\c\VclntITestData\Video.contentrights" - "c:\VclntITestData\Video.contentrights"
-"\epoc32\data\c\VclntITestData\Video.content" - "c:\VclntITestData\Video.content"
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsu_mmf_vclnt_excl_test.iby
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclnt/group/tsu_mmf_vclnt_excl_test.iby Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef TSU_MMF_VCLNT_EXCL_TEST_IBY
-#define TSU_MMF_VCLNT_EXCL_TEST_IBY
-
-file=ABI_DIR\BUILD_DIR\TSI_MMFVCLNT.DLL System\Libs\TSI_MMFVCLNT.DLL
-
-// plugins for VCLNT
-
-file=ABI_DIR\BUILD_DIR\TS_CMMFVideoTestCustomCommands.dll System\Libs\TS_CMMFVideoTestCustomCommands.dll
-ECOM_PLUGIN(TS_VideoInput.dll,101f7f8c.rsc)
-ECOM_PLUGIN(TS_VideoOutput.dll,101f7f8d.rsc)
-ECOM_PLUGIN(TS_VideoTestFormat.dll,101f7f89.rsc)
-
-#endif // TSU_MMF_VCLNT_EXCL_TEST_IBY
-
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi.iby
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi.iby Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_data.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_data.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -16,6 +16,7 @@
//ini
"\epoc32\data\c\vclntavi\video_avi.ini" - "c:\vclntavi\video_avi.ini"
+"\epoc32\data\c\vclntavi\video_avi_bc.ini" - "c:\vclntavi\video_avi_bc.ini"
//scripts
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_play.script" - "c:\tsi_mmf_vclntavi_play.script"
@@ -40,12 +41,14 @@
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_alloc_bc.script" - "c:\tsi_mmf_vclntavi_alloc_bc.script"
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_apr_bc.script" - "c:\tsi_mmf_vclntavi_apr_bc.script"
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_apr_alloc_bc.script" - "c:\tsi_mmf_vclntavi_apr_alloc_bc.script"
-"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_play_secdisp_bc.script" - "c:\tsi_mmf_vclntavi_play_secdisp_bc.script"
+// For winscw use only
+// "\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_play_secdisp_bc.script" - "c:\tsi_mmf_vclntavi_play_secdisp_bc.script"
// Old BC controller
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_surf_noGCE.script" - "c:\tsi_mmf_vclntavi_surf_noGCE.script"
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_subtitles.script" - "c:\tsi_mmf_vclntavi_subtitles.script"
-"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_subtitles_udeb.script" - "c:\tsi_mmf_vclntavi_subtitles_udeb.script"
+// For winscw use only
+// "\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_subtitles_udeb.script" - "c:\tsi_mmf_vclntavi_subtitles_udeb.script"
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_subtitles_urel.script" - "c:\tsi_mmf_vclntavi_subtitles_urel.script"
"\epoc32\data\c\vclntavi\tsi_mmf_vclntavi_subtitles_alloc.script" - "c:\tsi_mmf_vclntavi_subtitles_alloc.script"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_excl_test.iby
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_excl_test.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_excl_test.iby Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -22,13 +22,6 @@
#ifdef SYMBIAN_GRAPHICS_USE_GCE
#include
#endif
-// include regardless if using gce or not
-#ifndef SAMPLEGRAPHICSURFACE_DLL
-file=ABI_DIR\BUILD_DIR\samplegraphicsurface.dll sys\bin\samplegraphicsurface.dll
-ECOM_PLUGIN(10285C4A.dll, 10285C4A.rsc)
-#define SAMPLEGRAPHICSURFACE_DLL
-#endif // SAMPLEGRAPHICSURFACE_DLL
-
//data files
//exported using copydatatocf.bat and usbldr.pm, so removed from iby file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_play.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_play.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_play.script Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -29,6 +29,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0001-CP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 10000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0002-CP
@@ -39,6 +40,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0002-CP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0003-CP
@@ -49,6 +51,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0003-CP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0004-HP
@@ -59,6 +62,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0004-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 10000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0005-HP
@@ -69,6 +73,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0005-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0007-HP
@@ -79,6 +84,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0007-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0008-HP
@@ -90,6 +96,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0008-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0009-HP
@@ -100,6 +107,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0009-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0010-HP
@@ -111,6 +119,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0010-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0011-HP
@@ -121,6 +130,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0011-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0012-HP
@@ -132,6 +142,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0012-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0013-HP
@@ -142,6 +153,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0013-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0014-HP
@@ -152,6 +164,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0014-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0015-HP
@@ -162,6 +175,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0015-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0016-HP
@@ -172,6 +186,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0016-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0017-HP
@@ -182,6 +197,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0017-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0018-HP
@@ -192,6 +208,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0018-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0019-HP
@@ -202,6 +219,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0019-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0020-HP
@@ -212,6 +230,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0020-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0021-HP
@@ -222,6 +241,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0021-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0022-HP
@@ -232,6 +252,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0022-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0030-HP
@@ -242,6 +263,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0030-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0032-HP
@@ -252,6 +274,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0032-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0034-HP
@@ -262,6 +285,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0034-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-0036-HP
@@ -272,6 +296,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0036-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
/////////////////////////////// NEGATIVE TESTS /////////////////////////////////////
@@ -284,6 +309,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1001-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1002-HP
@@ -294,6 +320,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1002-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 10000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1003-HP
@@ -304,6 +331,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1003-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1004-HP
@@ -314,6 +342,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1004-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1005-HP
@@ -325,6 +354,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1005-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1006-HP
@@ -336,6 +366,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1006-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1007-HP
@@ -347,6 +378,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1007-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1008-HP
@@ -358,6 +390,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1008-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1009-HP
@@ -368,6 +401,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1009-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1010-HP
@@ -378,6 +412,7 @@
//!@SYMTestExpectedResults KErrCorrupt
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1010-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1011-HP
@@ -388,6 +423,7 @@
//!@SYMTestExpectedResults KErrCorrupt
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1011-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1012-HP
@@ -398,6 +434,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1012-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
+DELAY 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-1013-HP
@@ -408,4 +445,4 @@
//!@SYMTestExpectedResults KErrNotFound
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1013-HP c:\vclntavi\video_avi.ini
TEST_COMPLETE
-
+DELAY 5000
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_play_bc.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_play_bc.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_play_bc.script Mon Aug 23 18:56:36 2010 +0100
@@ -30,6 +30,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9001-CP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9002-CP
@@ -40,6 +41,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9002-CP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9003-CP
@@ -50,6 +52,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9003-CP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9004-HP
@@ -60,6 +63,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9004-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9005-HP
@@ -70,6 +74,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9005-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9006-HP
@@ -80,6 +85,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9006-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9007-HP
@@ -90,6 +96,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9007-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9008-HP
@@ -101,6 +108,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9008-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9009-HP
@@ -111,6 +119,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9009-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9010-HP
@@ -122,6 +131,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9010-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9011-HP
@@ -132,6 +142,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9011-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9012-HP
@@ -143,6 +154,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9012-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9013-HP
@@ -153,6 +165,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9013-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9014-HP
@@ -163,6 +176,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9014-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9015-HP
@@ -173,6 +187,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9015-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9016-HP
@@ -183,6 +198,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9016-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9017-HP
@@ -193,6 +209,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9017-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9018-HP
@@ -203,6 +220,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9018-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9019-HP
@@ -213,6 +231,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0019-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9020-HP
@@ -223,6 +242,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0020-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9021-HP
@@ -233,6 +253,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0021-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9022-HP
@@ -243,6 +264,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0022-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
/////////////////////////////// NEGATIVE TESTS /////////////////////////////////////
@@ -255,6 +277,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9101-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9102-HP
@@ -265,6 +288,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9102-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9103-HP
@@ -275,6 +299,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9103-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9104-HP
@@ -285,6 +310,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-1004-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9105-HP
@@ -296,6 +322,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9105-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9106-HP
@@ -307,6 +334,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9106-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9107-HP
@@ -318,6 +346,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9107-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9108-HP
@@ -329,6 +358,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9108-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9109-HP
@@ -339,6 +369,7 @@
//!@SYMTestExpectedResults KErrNone
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9109-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9110-HP
@@ -349,6 +380,7 @@
//!@SYMTestExpectedResults KErrCorrupt
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9110-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9111-HP
@@ -359,6 +391,7 @@
//!@SYMTestExpectedResults KErrCorrupt
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9111-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9112-HP
@@ -369,6 +402,7 @@
//!@SYMTestExpectedResults KErrNotSupported
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9112-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
//
//!@SYMTestCaseID MM-MMF-VCLNTAVI-I-9113-HP
@@ -379,3 +413,4 @@
//!@SYMTestExpectedResults KErrNotFound
RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-9113-HP c:\vclntavi\video_avi_bc.ini
TEST_COMPLETE
+Delay 5000
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1819,7 +1819,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // TODO check?? assume pass
+ iAllocTestStepResult = EPass; // XXX check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
for(;;)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1628,7 +1628,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // TODO check?? assume pass
+ iAllocTestStepResult = EPass; // XXX check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
for(;;)
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_stepbase.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_stepbase.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_stepbase.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -491,7 +491,7 @@
iWindow->SetRequiredDisplayMode(EColor16MA); // Need to use alpha.
iWindow->SetSizeErr(iScreen->SizeInPixels());
- // TODO: This will not be needed when surfaces are displayed above the window background colour.
+ // XXX: This will not be needed when surfaces are displayed above the window background colour.
iWindow->SetBackgroundColor(TRgb(0x000000, 0)); // use transparent black as the background colour.
iWindow->BeginRedraw();
iWindow->EndRedraw();
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT.h
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT.h Mon Aug 23 18:56:36 2010 +0100
@@ -191,7 +191,7 @@
void CreateEncodeObjectL(TBool aIsFile, const TDesC& aFilename, TInt aUid);
//from MAsyncEventHandler
- virtual TInt SendEventToClient(const TMMFEvent& /*aEvent*/) {return KErrNone;}//FIXME - can we do better here?
+ virtual TInt SendEventToClient(const TMMFEvent& /*aEvent*/) {return KErrNone;}//XXX - can we do better here?
protected:
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_TestSteps.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_TestSteps.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_TestSteps.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1566,7 +1566,7 @@
User::Leave(KErrCorrupt); //should never get here
}
- // pretty sure the process is incomplete but we do not care since
+ // pretty sure the process is not completed but we do not care since
// we are interested in writing one good buffer of data to the sink
CleanupStack::Pop(dstBuffer);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -91,7 +91,7 @@
return NULL;
}
- //[TBD] optimal source buffer size creation may depend on the sink buffer & vice versa
+ //XXX optimal source buffer size creation may depend on the sink buffer & vice versa
CMMFBuffer* MMFTestDataSource::CreateSourceBufferL(TMediaId aMediaId, CMMFBuffer& /*aSinkBuffer*/, TBool &aReference)
{
return CreateSourceBufferL(aMediaId, aReference);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.h
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.h Mon Aug 23 18:56:36 2010 +0100
@@ -55,7 +55,7 @@
virtual TBool CanCreateSourceBuffer();
virtual CMMFBuffer* CreateSourceBufferL(TMediaId /*aMediaId*/, TBool &aReference);
- //[TBD] optimal source buffer size creation may depend on the sink buffer & vice versa
+ //XXX optimal source buffer size creation may depend on the sink buffer & vice versa
virtual CMMFBuffer* CreateSourceBufferL(TMediaId aMediaId, CMMFBuffer& /*aSinkBuffer*/, TBool &aReference);
virtual TInt SourceThreadLogon(MAsyncEventHandler& /*aEventHandler*/);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlPlay.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlPlay.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlPlay.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -187,7 +187,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -287,7 +287,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -436,7 +436,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -600,7 +600,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -768,7 +768,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1041,7 +1041,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlRecord.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlRecord.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlRecord.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -225,7 +225,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -364,7 +364,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -579,7 +579,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -700,7 +700,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -829,7 +829,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -999,7 +999,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1338,7 +1338,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1425,7 +1425,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1659,7 +1659,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepController.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepController.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepController.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -212,7 +212,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -367,7 +367,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -524,7 +524,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -585,7 +585,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepsGetSet.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepsGetSet.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepsGetSet.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -132,7 +132,7 @@
}
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is an error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -274,7 +274,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -383,7 +383,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -474,7 +474,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -575,7 +575,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -682,7 +682,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -820,7 +820,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -923,7 +923,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1001,7 +1001,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1131,7 +1131,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1228,7 +1228,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1322,7 +1322,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1456,7 +1456,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1595,7 +1595,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1737,7 +1737,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1866,7 +1866,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1958,7 +1958,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2045,7 +2045,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2159,7 +2159,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2348,7 +2348,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2480,7 +2480,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2584,7 +2584,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2721,7 +2721,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2850,7 +2850,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is a bug in this code and the stop followed by reset
+ // There is error in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/Actrl/group/unittest_actrl_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/group/unittest_actrl_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/group/unittest_actrl_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -30,6 +30,22 @@
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Five11khz.au"-"c:\mm\mmf\testfiles\actrl\five11khz.au"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Five.wav"-"c:\mm\mmf\testfiles\actrl\five.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\16bitmPcm.wav"-"c:\mm\mmf\testfiles\actrl\16bitmpcm.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzADPCMMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzadpcmmono1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\11khzpcm16mono1khztone.raw"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereo1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALawMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzalawmono1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALAWStereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\22khzalawstereo1khztone.raw"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\22khzpcm16mono1khztone.au"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm16stereo1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM8Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm8mono1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.au"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.raw"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.raw"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\8khzpcm16mono1khztone.au"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzpcm16stereo1khztone.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\mainTst.wav"-"c:\mm\mmf\testfiles\actrl\maintst.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzADPCMMonoWAVTo8KHzPCM16Mono.raw"-"c:\mm\mmf\testfiles\actrl\11khzadpcmmonowavto8khzpcm16mono.raw"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16MonoRAWTo8KHzGSM610Mono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16monorawto8khzgsm610mono.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo8KHzMuLAWMono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto8khzmulawmono.wav"
@@ -46,22 +62,5 @@
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCMU8MonoAUTo8KHzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcmu8monoauto8khzpcm16mono.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo11KHzADPCMMono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto11khzadpcmmono.wav"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo11KHzADPCMMono.raw"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto11khzadpcmmono.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\NoReferenceFile"-"c:\mm\mmf\testfiles\actrl/noreferencefile"
-
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzADPCMMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzadpcmmono1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\11khzpcm16mono1khztone.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereo1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALawMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzalawmono1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALAWStereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\22khzalawstereo1khztone.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\22khzpcm16mono1khztone.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm16stereo1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM8Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm8mono1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\8khzpcm16mono1khztone.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzpcm16stereo1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\mainTst.wav"-"c:\mm\mmf\testfiles\actrl\maintst.wav"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\NoReferenceFile"-"c:\mm\mmf\testfiles\actrl\NoReferenceFile"
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface/TSU_MMF_DEVSOUND_TestInterface.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface/TSU_MMF_DEVSOUND_TestInterface.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface/TSU_MMF_DEVSOUND_TestInterface.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -195,7 +195,7 @@
void CMMF_TSU_DEVSOUND_TestInterfaceMux::DoCancel()
{
- // TODO - do we need to send a cancel message to the DeMux plugin?
+ // XXX - do we need to send a cancel message to the DeMux plugin?
if (iClientStatus->Int() == KRequestPending)
{
User::RequestComplete(iClientStatus, KErrCancel);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface1/TSU_MMF_DEVSOUND_TestInterface1.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface1/TSU_MMF_DEVSOUND_TestInterface1.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface1/TSU_MMF_DEVSOUND_TestInterface1.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -196,7 +196,7 @@
void CMMF_TSU_DEVSOUND_TestInterface1Mux::DoCancel()
{
- // TODO - do we need to send a cancel message to the DeMux plugin?
+ // XXX - do we need to send a cancel message to the DeMux plugin?
if (iClientStatus->Int() == KRequestPending)
{
User::RequestComplete(iClientStatus, KErrCancel);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/TSU_MMF_DEVSOUND_SUITE.iby
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/TSU_MMF_DEVSOUND_SUITE.iby Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/TSU_MMF_DEVSOUND_SUITE.iby Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -31,7 +31,10 @@
#ifndef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_nona3f.script \tsu_mmf_devsound_suite_nona3f.script
#else
-data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_truepause.script \tsu_mmf_devsound_suite_truepause.script
+data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_truepause.script \tsu_mmf_devsound_suite_truepause.script
+data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_truepause_ogg.script \tsu_mmf_devsound_suite_truepause_ogg.script
+data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_truepause_preemption.script \tsu_mmf_devsound_suite_truepause_preemption.script
+data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_truepause_neg.script \tsu_mmf_devsound_suite_truepause_neg.script
#endif
data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_manual.script \tsu_mmf_devsound_suite_manual.script
data=EPOCROOT##epoc32\data\c\tsu_mmf_devsound_play_tone.ini \tsu_mmf_devsound_play_tone.ini
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/bld.inf Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -32,6 +32,9 @@
#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
../scripts/tsu_mmf_devsound_suite_truepause.script c:/mm/tsu_mmf_devsound_suite_truepause.script
+../scripts/tsu_mmf_devsound_suite_truepause_ogg.script c:/mm/tsu_mmf_devsound_suite_truepause_ogg.script
+../scripts/tsu_mmf_devsound_suite_truepause_preemption.script c:/mm/tsu_mmf_devsound_suite_truepause_preemption.script
+../scripts/tsu_mmf_devsound_suite_truepause_neg.script c:/mm/tsu_mmf_devsound_suite_truepause_neg.script
#else
../scripts/tsu_mmf_devsound_suite_nona3f.script c:/mm/tsu_mmf_devsound_suite_nona3f.script
#endif
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause.script Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -49,82 +49,6 @@
RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0081-HP, c:\tsu_mmf_truepause_devsound.ini
TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0082-HP
-//! @SYMREQ REQ11453
-//! REQ11455
-//! @SYMPREQ 1540
-//! @SYMTestCaseDec Resume Audio Playback Rejection - Rejection scenario is between 2 instances that play audio
-//! @SYMTestPriority Normal
-//! @SYMTestType Normal Usecase
-//! @SYMTestActions 1. Create a DevSound instance.
-//! 2. Open files to be played by DevSound instances.
-//! 3. Create a CPeriodic instance.
-//! 4. Create a second DevSound instance to play audio using low priority settings.
-//! 5. Initialise the first devsound instance to play audio and set its priority using a high value.
-//! 5.1 Wait for InitializeComplete(KErrNone) callback response.
-//! 6. Call PlayInitL() method for first DevSound instance and star timer events each 2 seconds.
-//! 7. Wait for BufferToBeFilled(..) callback of first DevSound instance to fill the buffer with data.
-//! To continue receiving BTBF callbacks, is mandatory to call PlayData() method.
-//! 8. On timer event call Pause() method.
-//! 9. Wait for another timer event set the second devsound's priority to the lowest value, call IsResumeSupported() then Resume().
-//! @SYMTestExpectedResults Second DevSound instance PlayError() callback shall return aError = KErrInUse, KErrDied or KErrAccessDenied
-//! First DevSound IsResumeSupported() will return ETrue.
-//! First DevSound Resume()(will return KErrNone) is supported for PCM.
-//!
-PRINT Resume Audio Playback Rejection - Rejection scenario is between 2 instances that play audio
-RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0082-HP, c:\tsu_mmf_truepause_devsound.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0083-HP
-//! @SYMREQ REQ11453
-//! REQ11455
-//! @SYMPREQ 1540
-//! @SYMTestCaseDec Resume Audio Playback Pre-emption - Pre-emption scenario is between 2 instances that play audio
-//! @SYMTestPriority Normal
-//! @SYMTestType Normal Usecase
-//! @SYMTestActions 1. Create a DevSound instance.
-//! 2. Open files to be played by DevSound instances.
-//! 3. Create a CPeriodic instance.
-//! 4. Create a second DevSound instance to play audio using high priority settings.
-//! 5. Initialise the first devsound instance to play audio and set its priority using a low value.
-//! 6. Call PlayInitL() method for first DevSound instance and star timer events each 2 seconds.
-//! 7. Wait for BufferToBeFilled(..) callback of first DevSound instance to fill the buffer with data.
-//! To continue receiving BTBF callbacks, is mandatory to call PlayData() method.
-//! 8. On timer event call Pause() method.
-//! 9. Wait for another timer event set the second devsound's priority to the highest value, call IsResumeSupported() then Resume().
-//! @SYMTestExpectedResults First DevSound instance PlayError() callback shall return aError = KErrInUse, KErrDied or KErrAccessDenied.
-//! First DevSound IsResumeSupported() will return ETrue.
-//! First DevSound Resume must return with KErrNotReady.
-//!
-PRINT Resume Audio Playback Pre-emption - Pre-emption scenario is between 2 instances that play audio
-RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0083-HP, c:\tsu_mmf_truepause_devsound.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0084-HP
-//! @SYMREQ REQ11453
-//! REQ11455
-//! @SYMPREQ 1540
-//! @SYMTestCaseDec Resume Audio Playback - When stop() is called after pause(), BufferToBeFilled() callback does not receive anymore.
-//! @SYMTestPriority Normal
-//! @SYMTestType Alternative Usecase
-//! @SYMTestActions 1. Create a DevSound instance.
-//! 2. Open files to be played by DevSound instance (must be PCM).
-//! 3. Create a CPeriodic instance.
-//! 4. Initialise a DevSound instance to play audio.
-//! 4.1 Wait for InitializeComplete(KErrNone) callback response.
-//! 5. Call PlayInitL() method for DevSound instance and star timer events each 2 seconds.
-//! 6. Wait for BufferToBeFilled(..) callback of DevSound instance to fill the buffer with data. To continue receiving BTBF callbacks, is mandatory to call PlayData() method.
-//! 7. On timer event call Pause() method.
-//! 8. Wait for another timer event call Stop() method.
-//! 9. Wait for last timer event, then call IsResumeSupported() and Resume().
-//! @SYMTestExpectedResults After call Stop() method, BufferToBeFilled() must never occurr.
-//! DevSound IsResumeSupported() will return ETrue.
-//! DevSound Resume must return with KErrNotReady.
-//!
-PRINT Resume Audio Playback - When stop() is called after pause(), BufferToBeFilled() callback does not receive anymore.
-RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0084-HP, c:\tsu_mmf_truepause_devsound.ini
-TEST_COMPLETE
-
//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0085-HP
//! @SYMREQ REQ11453
//! REQ11455
@@ -309,31 +233,6 @@
RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0089-HP, c:\tsu_mmf_truepause_devsound.ini
TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0090-HP
-//! @SYMREQ REQ11453
-//! REQ11455
-//! @SYMPREQ 1540
-//! @SYMTestCaseDec Resume Record audio - Pause and resume for non PCM.
-//! @SYMTestPriority Normal
-//! @SYMTestType Exception Usecase
-//! @SYMTestActions 1. Create a Devsound instance.
-//! 2. Create a CPeriodic instance.
-//! 3. Open the audio files to be recorded and initialize the Devsound instance to record audio(non PCM).
-//! 3.1 Wait for InitializeComplete(KErrNone) callback response.
-//! 4. Start the CPeriodic instance.
-//! 5. Call RecodInitL() to start the recording process.
-//! 6. Wait for BufferToBeEmptied(..) callback to retrieve the buffered data from DevSound. To continue receiving BTBE callbacks, is mandatory to call RecordData() method.
-//! 7. On the CPeriodic timer event, use Pause() to temporarily stop the record process.
-//! 7.1 Continue RecordData()/BufferToBeEmptied() loop until last buffer flag is set.
-//! 8. After last buffer is received, call IsResumeSupported() and Resume().
-//! 10. Close file session.
-//! @SYMTestExpectedResults IsResumeSupported() will return EFalse.
-//! Resume()(will return KErrNotSupported) is supported for non PCM.
-//! Output is recorded at c:\mm\mmf\testfiles\truepause_devsound_test_data\record_3.ogg
-PRINT Resume Record audio - Pause and resume for non PCM.
-RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0090-HP, c:\tsu_mmf_truepause_devsound.ini
-TEST_COMPLETE
-
//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0091-HP
//! @SYMREQ REQ11453
//! REQ11455
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause_neg.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause_neg.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,51 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT
+PRINT
+PRINT IMPORTANT NOTE: THIS SCRIPT SHOULD ONLY BE RUN IN A3F. SCRIPT CREATED AS PART OF CR1566.
+PRINT
+PRINT
+
+
+LOAD_SUITE TSU_MMF_DEVSOUND_SUITE.dll
+
+delay 1000
+
+//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0084-HP
+//! @SYMREQ REQ11453
+//! REQ11455
+//! @SYMPREQ 1540
+//! @SYMTestCaseDec Resume Audio Playback - When stop() is called after pause(), BufferToBeFilled() callback does not receive anymore.
+//! @SYMTestPriority Normal
+//! @SYMTestType Alternative Usecase
+//! @SYMTestActions 1. Create a DevSound instance.
+//! 2. Open files to be played by DevSound instance (must be PCM).
+//! 3. Create a CPeriodic instance.
+//! 4. Initialise a DevSound instance to play audio.
+//! 4.1 Wait for InitializeComplete(KErrNone) callback response.
+//! 5. Call PlayInitL() method for DevSound instance and star timer events each 2 seconds.
+//! 6. Wait for BufferToBeFilled(..) callback of DevSound instance to fill the buffer with data. To continue receiving BTBF callbacks, is mandatory to call PlayData() method.
+//! 7. On timer event call Pause() method.
+//! 8. Wait for another timer event call Stop() method.
+//! 9. Wait for last timer event, then call IsResumeSupported() and Resume().
+//! @SYMTestExpectedResults After call Stop() method, BufferToBeFilled() must never occurr.
+//! DevSound IsResumeSupported() will return ETrue.
+//! DevSound Resume must return with KErrNotReady.
+//!
+PRINT Resume Audio Playback - When stop() is called after pause(), BufferToBeFilled() callback does not receive anymore.
+RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0084-HP, c:\tsu_mmf_truepause_devsound.ini
+TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause_ogg.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause_ogg.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,51 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT
+PRINT
+PRINT IMPORTANT NOTE: THIS SCRIPT SHOULD ONLY BE RUN IN A3F. SCRIPT CREATED AS PART OF CR1566.
+PRINT
+PRINT
+
+
+LOAD_SUITE TSU_MMF_DEVSOUND_SUITE.dll
+
+delay 1000
+
+//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0090-HP
+//! @SYMREQ REQ11453
+//! REQ11455
+//! @SYMPREQ 1540
+//! @SYMTestCaseDec Resume Record audio - Pause and resume for non PCM.
+//! @SYMTestPriority Normal
+//! @SYMTestType Exception Usecase
+//! @SYMTestActions 1. Create a Devsound instance.
+//! 2. Create a CPeriodic instance.
+//! 3. Open the audio files to be recorded and initialize the Devsound instance to record audio(non PCM).
+//! 3.1 Wait for InitializeComplete(KErrNone) callback response.
+//! 4. Start the CPeriodic instance.
+//! 5. Call RecodInitL() to start the recording process.
+//! 6. Wait for BufferToBeEmptied(..) callback to retrieve the buffered data from DevSound. To continue receiving BTBE callbacks, is mandatory to call RecordData() method.
+//! 7. On the CPeriodic timer event, use Pause() to temporarily stop the record process.
+//! 7.1 Continue RecordData()/BufferToBeEmptied() loop until last buffer flag is set.
+//! 8. After last buffer is received, call IsResumeSupported() and Resume().
+//! 10. Close file session.
+//! @SYMTestExpectedResults IsResumeSupported() will return EFalse.
+//! Resume()(will return KErrNotSupported) is supported for non PCM.
+//! Output is recorded at c:\mm\mmf\testfiles\truepause_devsound_test_data\record_3.ogg
+PRINT Resume Record audio - Pause and resume for non PCM.
+RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0090-HP, c:\tsu_mmf_truepause_devsound.ini
+TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause_preemption.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause_preemption.script Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,77 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT
+PRINT
+PRINT IMPORTANT NOTE: THIS SCRIPT SHOULD ONLY BE RUN IN A3F. SCRIPT CREATED AS PART OF CR1566.
+PRINT
+PRINT
+
+
+LOAD_SUITE TSU_MMF_DEVSOUND_SUITE.dll
+
+delay 1000
+
+//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0082-HP
+//! @SYMREQ REQ11453
+//! REQ11455
+//! @SYMPREQ 1540
+//! @SYMTestCaseDec Resume Audio Playback Rejection - Rejection scenario is between 2 instances that play audio
+//! @SYMTestPriority Normal
+//! @SYMTestType Normal Usecase
+//! @SYMTestActions 1. Create a DevSound instance.
+//! 2. Open files to be played by DevSound instances.
+//! 3. Create a CPeriodic instance.
+//! 4. Create a second DevSound instance to play audio using low priority settings.
+//! 5. Initialise the first devsound instance to play audio and set its priority using a high value.
+//! 5.1 Wait for InitializeComplete(KErrNone) callback response.
+//! 6. Call PlayInitL() method for first DevSound instance and star timer events each 2 seconds.
+//! 7. Wait for BufferToBeFilled(..) callback of first DevSound instance to fill the buffer with data.
+//! To continue receiving BTBF callbacks, is mandatory to call PlayData() method.
+//! 8. On timer event call Pause() method.
+//! 9. Wait for another timer event set the second devsound's priority to the lowest value, call IsResumeSupported() then Resume().
+//! @SYMTestExpectedResults Second DevSound instance PlayError() callback shall return aError = KErrInUse, KErrDied or KErrAccessDenied
+//! First DevSound IsResumeSupported() will return ETrue.
+//! First DevSound Resume()(will return KErrNone) is supported for PCM.
+//!
+PRINT Resume Audio Playback Rejection - Rejection scenario is between 2 instances that play audio
+RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0082-HP, c:\tsu_mmf_truepause_devsound.ini
+TEST_COMPLETE
+
+//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0083-HP
+//! @SYMREQ REQ11453
+//! REQ11455
+//! @SYMPREQ 1540
+//! @SYMTestCaseDec Resume Audio Playback Pre-emption - Pre-emption scenario is between 2 instances that play audio
+//! @SYMTestPriority Normal
+//! @SYMTestType Normal Usecase
+//! @SYMTestActions 1. Create a DevSound instance.
+//! 2. Open files to be played by DevSound instances.
+//! 3. Create a CPeriodic instance.
+//! 4. Create a second DevSound instance to play audio using high priority settings.
+//! 5. Initialise the first devsound instance to play audio and set its priority using a low value.
+//! 6. Call PlayInitL() method for first DevSound instance and star timer events each 2 seconds.
+//! 7. Wait for BufferToBeFilled(..) callback of first DevSound instance to fill the buffer with data.
+//! To continue receiving BTBF callbacks, is mandatory to call PlayData() method.
+//! 8. On timer event call Pause() method.
+//! 9. Wait for another timer event set the second devsound's priority to the highest value, call IsResumeSupported() then Resume().
+//! @SYMTestExpectedResults First DevSound instance PlayError() callback shall return aError = KErrInUse, KErrDied or KErrAccessDenied.
+//! First DevSound IsResumeSupported() will return ETrue.
+//! First DevSound Resume must return with KErrNotReady.
+//!
+PRINT Resume Audio Playback Pre-emption - Pre-emption scenario is between 2 instances that play audio
+RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0083-HP, c:\tsu_mmf_truepause_devsound.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+ // Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -8662,111 +8662,125 @@
INFO_PRINTF1(_L("Calling CMMFDevSound::IsResumeSupported"));
TBool isResumeSupported = iMMFDevSound->IsResumeSupported();
#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
- if(isResumeSupported)
- {
- TInt err;
-
- if(iInitAfterPauseClause)
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::PlayInitL"));
+
+ TInt err;
+
+ if(iInitAfterPauseClause)
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::PlayInitL"));
+ TRAP(err,iMMFDevSound->PlayInitL());
+ }
+ else
+ {
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::PlayInitL"));
TRAP(err,iMMFDevSound->PlayInitL());
- }
- else
- {
+ }
+ else //resume is supported
+ {
INFO_PRINTF1(_L("Calling CMMFDevSound::Resume"));
err=iMMFDevSound->Resume();
- }
- if (err == iErrExpected)
- {
- INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err);
- if(iCompletePlayBack)
- {
- iDevSoundState = EStatePlaying;
- iTimer->Cancel();
- if(iVolumeBalanceClause)
- {
- INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying."));
- if (iVolume == iMMFDevSound->Volume())
- {
- INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected"));
- }
- else
- {
- ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume);
- StopTest (KErrGeneral);
- break;
- }
- // Check the low-level a3f volume. Should have been applied by now
- MTestSetVolIf *volIf = static_cast(iMMFDevSound->CustomInterface(KUidTestSetVolIf));
- if (volIf)
- {
- TInt vol = volIf->Vol(iMMFDevSound->MaxVolume());
- if (vol == iVolume)
- {
- INFO_PRINTF1(_L("Low-level volume returned equal previous set value as expected"));
- }
- else
- {
- ERR_PRINTF3(_L("Low-level volume returned different set value = %d (expect %d)"), vol, iVolume);
- StopTest (KErrGeneral);
- break;
- }
- }
-
- INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying."));
- TInt getLSpeakerBalance = 0;
- TInt getRSpeakerBalance = 0;
- TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance));
- if (err != KErrNone)
- {
- ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err);
- StopTest(err);
- break;
- }
- if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance))
- {
- INFO_PRINTF1(_L("Balance configuration returned previous set values as expected"));
- }
- else
- {
- ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"),
- getLSpeakerBalance, getRSpeakerBalance);
- StopTest(KErrGeneral);
- break;
- }
- }
- if (iConfigClause)
- {
- if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate &&
- iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels)
- {
- INFO_PRINTF1(_L("CMMFDevSound::Config does not change as expected"));
- }
- else
- {
- ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value"));
- StopTest (KErrGeneral);
- }
- }
- }
- else
- {
- StopTest();
- }
- }
- else
- {
- ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err);
- ERR_PRINTF2(_L("Expected error %d"), iErrExpected);
- StopTest(KErrGeneral , EFail);
- }
- }
- else
- {
- ERR_PRINTF1(_L("Devsound is expected to support resume"));
- ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue);
- StopTest(KErrNotSupported,EFail);
- }
+ }
+ }
+ if (err == iErrExpected)
+ {
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF2(_L("CMMFDevSound::PlayInitL returned %d as expected"), err);
+ }
+ else //resume is supported
+ {
+ INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err);
+ }
+ if(iCompletePlayBack)
+ {
+ iDevSoundState = EStatePlaying;
+ iTimer->Cancel();
+ if(iVolumeBalanceClause)
+ {
+ INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying."));
+ if (iVolume == iMMFDevSound->Volume())
+ {
+ INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected"));
+ }
+ else
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume);
+ StopTest (KErrGeneral);
+ break;
+ }
+ // Check the low-level a3f volume. Should have been applied by now
+ MTestSetVolIf *volIf = static_cast(iMMFDevSound->CustomInterface(KUidTestSetVolIf));
+ if (volIf)
+ {
+ TInt vol = volIf->Vol(iMMFDevSound->MaxVolume());
+ if (vol == iVolume)
+ {
+ INFO_PRINTF1(_L("Low-level volume returned equal previous set value as expected"));
+ }
+ else
+ {
+ ERR_PRINTF3(_L("Low-level volume returned different set value = %d (expect %d)"), vol, iVolume);
+ StopTest (KErrGeneral);
+ break;
+ }
+ }
+
+ INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying."));
+ TInt getLSpeakerBalance = 0;
+ TInt getRSpeakerBalance = 0;
+ TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance));
+ if (err != KErrNone)
+ {
+ ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err);
+ StopTest(err);
+ break;
+ }
+ if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance))
+ {
+ INFO_PRINTF1(_L("Balance configuration returned previous set values as expected"));
+ }
+ else
+ {
+ ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"),
+ getLSpeakerBalance, getRSpeakerBalance);
+ StopTest(KErrGeneral);
+ break;
+ }
+ }
+ if (iConfigClause)
+ {
+ if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate &&
+ iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels)
+ {
+ INFO_PRINTF1(_L("CMMFDevSound::Config does not change as expected"));
+ }
+ else
+ {
+ ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value"));
+ StopTest (KErrGeneral);
+ }
+ }
+ }
+ else
+ {
+ StopTest();
+ }
+ }
+ else
+ if (!isResumeSupported)
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::PlayInitL failed with %d"), err);
+ ERR_PRINTF2(_L("Expected error %d"), iErrExpected);
+ StopTest(KErrGeneral , EFail);
+ }
+ else //resume is supported
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err);
+ ERR_PRINTF2(_L("Expected error %d"), iErrExpected);
+ StopTest(KErrGeneral , EFail);
+ }
#else
if(!isResumeSupported)
{
@@ -9016,30 +9030,49 @@
{
INFO_PRINTF1(_L("Checking if resume is supported before receiving last buffer"));
TBool isResumeSupported = iMMFDevSound->IsResumeSupported();
- if(isResumeSupported)
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::Resume"));
- iMMFDevSound->RecordData();
- TInt err = iMMFDevSound->Resume();
- if (err == KErrNone)
- {
- INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err);
- iDevSoundState = EStateRecording;
- isSecondTimeRecording = ETrue;
- }
- else
- {
- ERR_PRINTF2(_L("CMMFDevSound::Resume before last buffer flag failed with %d"), err);
- ERR_PRINTF2(_L("Expected value %d"), KErrNone);
- StopTest(err, EFail);
- }
- }
- else
- {
- ERR_PRINTF1(_L("Devsound is expected to support resume"));
- ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue);
- StopTest(KErrNotSupported,EFail);
- }
+ TInt err = KErrNone;
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::RecordInitL()"));
+ iMMFDevSound->RecordData();
+ TRAP(err,iMMFDevSound->RecordInitL());
+ }
+ else
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::Resume"));
+ iMMFDevSound->RecordData();
+ err = iMMFDevSound->Resume();
+ }
+ if (err == KErrNone)
+ {
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF2(_L("CMMFDevSound::RecordInitL returned %d as expected"), err);
+ iDevSoundState = EStateRecording;
+ isSecondTimeRecording = ETrue;
+ }
+ else
+ {
+ INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err);
+ iDevSoundState = EStateRecording;
+ isSecondTimeRecording = ETrue;
+ }
+ }
+ else
+ {
+ if (!isResumeSupported)
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::RecordInitL before last buffer flag failed with %d"), err);
+ ERR_PRINTF2(_L("Expected value %d"), KErrNone);
+ StopTest(err, EFail);
+ }
+ else
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::Resume before last buffer flag failed with %d"), err);
+ ERR_PRINTF2(_L("Expected value %d"), KErrNone);
+ StopTest(err, EFail);
+ }
+ }
isSecondTimeRecording = ETrue;
}
}
@@ -9068,11 +9101,15 @@
{
if(iGainBalanceClause)
{
+ if (iGain > iMMFDevSound->MaxGain())
+ {
+ iGain = iMMFDevSound->MaxGain();
+ }
INFO_PRINTF2(_L("Setting DevSound gain = %d"), iGain);
iMMFDevSound->SetGain(iGain);
if (iGain != iMMFDevSound->Gain())
{
- ERR_PRINTF2(_L("CMMFDevSound::Gain returned different set value = %d"), iGain);
+ ERR_PRINTF3(_L("CMMFDevSound::Gain returned different set value = %d, expected value = %d"), iGain, iMMFDevSound->Gain());
StopTest (KErrGeneral);
break;
}
@@ -9125,112 +9162,135 @@
TBool isResumeSupported = iMMFDevSound->IsResumeSupported();
if(iPCMFormatClause)
{
- if(isResumeSupported)
- {
- if (iRecordDataPriorToResume)
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()"));
- iMMFDevSound->RecordData();
- }
- TInt err = KErrNone;
- if(iInitAfterPauseClause)
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::RecordInit()"));
- iMMFDevSound->RecordInitL();
- }
- else
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()"));
- err = iMMFDevSound->Resume();
- }
- if(iResumeAfterResume)
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()"));
- err = iMMFDevSound->Resume();
- }
- if (iTestStepName != _L("MM-MMF-DEVSOUND-U-0088-HP"))
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()"));
- iMMFDevSound->RecordData();
- }
- if (err == KErrNone)
- {
- INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err);
- iDevSoundState = EStateRecording;
- iFollowingResume = ETrue;
- isSecondTimeRecording = ETrue;
- if (iRecordDataFollowingResume)
- {
- INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()"));
- iMMFDevSound->RecordData();
- }
- if (iCheckForNoDataAfterResume)
- {
- INFO_PRINTF1(_L("Wait for a while and check we get no extra buffer requests"));
- iTimer->Cancel(); // just in case cancel current timeout
- StartTimer(2000000); // wait for 2s
- }
- if(iGainBalanceClause)
- {
- INFO_PRINTF1(_L("Call iMMFDevSound::Gain for verifying."));
- if (iGain == iMMFDevSound->Gain())
- {
- INFO_PRINTF1(_L("CMMFDevSound::Gain returned equal previous set value as expected"));
- }
- else
- {
- ERR_PRINTF2(_L("CMMFDevSound::Gain returned different set value = %d"), iGain);
- StopTest (KErrGeneral);
- break;
- }
- INFO_PRINTF1(_L("Call GetRecordBalanceL for verifying."));
- TInt getLRecordBalance = 0;
- TInt getRRecordBalance = 0;
- TRAP(err,iMMFDevSound->GetRecordBalanceL(getLRecordBalance, getRRecordBalance));
- if (err != KErrNone)
- {
- ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err);
- StopTest(err);
- break;
- }
- if ((iLRecordBalance == getLRecordBalance) && (iRRecordBalance == getRRecordBalance))
- {
- INFO_PRINTF1(_L("Balance configuration returned previous set values as expected"));
- }
- else
- {
- ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"),
- getLRecordBalance, getRRecordBalance);
- StopTest(KErrGeneral);
- }
- }
- if (iConfigClause)
- {
- if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate &&
- iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels)
- {
- INFO_PRINTF1(_L("CMMFDevSound::Config returned as expected"));
- }
- else
- {
- ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value"));
- StopTest (KErrGeneral);
- }
- }
- }
- else
- {
- ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err);
- ERR_PRINTF2(_L("Expected error %d"), KErrNone);
- StopTest(err, EFail);
- }
- }
- else
- {
- ERR_PRINTF1(_L("Devsound::IsResumeSupported did not return as expected"));
- ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue);
- StopTest(KErrGeneral,EFail);
- }
+ if (iRecordDataPriorToResume)
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()"));
+ iMMFDevSound->RecordData();
+ }
+ TInt err = KErrNone;
+ if(iInitAfterPauseClause)
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::RecordInit()"));
+ iMMFDevSound->RecordInitL();
+ }
+ else
+ {
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::RecordInitL()"));
+ TRAP(err,iMMFDevSound->RecordInitL());
+ }
+ else //resume is supported
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()"));
+ err = iMMFDevSound->Resume();
+ }
+ }
+ if(iResumeAfterResume)
+ {
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::RecordInitL()"));
+ TRAP(err,iMMFDevSound->RecordInitL());
+ }
+ else
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()"));
+ err = iMMFDevSound->Resume();
+ }
+ }
+ if (iTestStepName != _L("MM-MMF-DEVSOUND-U-0088-HP"))
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()"));
+ iMMFDevSound->RecordData();
+ }
+ if (err == KErrNone)
+ {
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF2(_L("CMMFDevSound::RecordInitL returned %d as expected"), err);
+ }
+ else
+ {
+ INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err);
+ }
+ iDevSoundState = EStateRecording;
+ iFollowingResume = ETrue;
+ isSecondTimeRecording = ETrue;
+ if (iRecordDataFollowingResume)
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()"));
+ iMMFDevSound->RecordData();
+ }
+ if (iCheckForNoDataAfterResume)
+ {
+ INFO_PRINTF1(_L("Wait for a while and check we get no extra buffer requests"));
+ iTimer->Cancel(); // just in case cancel current timeout
+ StartTimer(2000000); // wait for 2s
+ }
+ if(iGainBalanceClause)
+ {
+ INFO_PRINTF1(_L("Call iMMFDevSound::Gain for verifying."));
+ if (iGain == iMMFDevSound->Gain())
+ {
+ INFO_PRINTF1(_L("CMMFDevSound::Gain returned equal previous set value as expected"));
+ }
+ else
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::Gain returned different set value = %d"), iGain);
+ StopTest (KErrGeneral);
+ break;
+ }
+ INFO_PRINTF1(_L("Call GetRecordBalanceL for verifying."));
+ TInt getLRecordBalance = 0;
+ TInt getRRecordBalance = 0;
+ TRAP(err,iMMFDevSound->GetRecordBalanceL(getLRecordBalance, getRRecordBalance));
+ if (err != KErrNone)
+ {
+ ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err);
+ StopTest(err);
+ break;
+ }
+ if ((iLRecordBalance == getLRecordBalance) && (iRRecordBalance == getRRecordBalance))
+ {
+ INFO_PRINTF1(_L("Balance configuration returned previous set values as expected"));
+ }
+ else
+ {
+ ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"),
+ getLRecordBalance, getRRecordBalance);
+ StopTest(KErrGeneral);
+ }
+ }
+ if (iConfigClause)
+ {
+ if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate &&
+ iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels)
+ {
+ INFO_PRINTF1(_L("CMMFDevSound::Config returned as expected"));
+ }
+ else
+ {
+ ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value"));
+ StopTest (KErrGeneral);
+ }
+ }
+ }
+ else
+ {
+ if (!isResumeSupported)
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::RecordInitL failed with %d"), err);
+ ERR_PRINTF2(_L("Expected error %d"), KErrNone);
+ StopTest(err , EFail);
+ }
+ else //resume is supported
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err);
+ ERR_PRINTF2(_L("Expected error %d"), KErrNone);
+ StopTest(err, EFail);
+ }
+ }
}
else
{
@@ -9541,71 +9601,62 @@
}
INFO_PRINTF1(_L("Checking if resume is supported"));
TBool isResumeSupported = iMMFDevSound->IsResumeSupported();
- if(isResumeSupported)
- {
- INFO_PRINTF2(_L("CMMFDevSound::IsResumeSupported returned %d as expected"),isResumeSupported);
- INFO_PRINTF1(_L("Calling CMMFDevSound::Resume"));
- TInt expectedErr = KErrNotSupported;
- if(iPlayToneType == EPlayToneSequence)
- {
- expectedErr = KErrNone;
- }
- TInt err = iMMFDevSound->Resume();
- if(err == expectedErr)
- {
- if(iPlayToneType != EPlayToneSequence)
- {
- StopTest();
- }
- INFO_PRINTF2(_L("CMMFDevSound::Resume returned = %d as expected"), err);
- if(iVolumeBalanceClause)
- {
- INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying."));
- if (iVolume == iMMFDevSound->Volume())
- {
- INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected"));
- }
- else
- {
- ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume);
- StopTest (KErrGeneral);
- break;
- }
- INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying."));
- TInt getLSpeakerBalance = 0;
- TInt getRSpeakerBalance = 0;
- TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance));
- if (err != KErrNone)
- {
- ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err);
- StopTest(err);
- break;
- }
- if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance))
- {
- INFO_PRINTF1(_L("Balance configuration returned previous set values as expected"));
- }
- else
- {
- ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"),
- getLSpeakerBalance, getRSpeakerBalance);
- StopTest(KErrGeneral);
- break;
- }
- }
- }
- else
- {
- ERR_PRINTF3(_L("CMMFDevSound::Resume returned with error = %d, when the expected error is = %d"), err, expectedErr);
- StopTest (KErrGeneral, EFail);
- }
- }
- else
- {
- ERR_PRINTF1(_L("CMMFDevSound did not support resume"));
- ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue);
- StopTest(KErrGeneral,EFail);
- }
+ INFO_PRINTF2(_L("CMMFDevSound::IsResumeSupported returned %d as expected"),isResumeSupported);
+ INFO_PRINTF1(_L("Calling CMMFDevSound::Resume"));
+ TInt expectedErr = KErrNotSupported;
+ if(iPlayToneType == EPlayToneSequence)
+ {
+ expectedErr = KErrNone;
+ }
+ TInt err = iMMFDevSound->Resume();
+ if(err == expectedErr)
+ {
+ if(iPlayToneType != EPlayToneSequence)
+ {
+ StopTest();
+ }
+ INFO_PRINTF2(_L("CMMFDevSound::Resume returned = %d as expected"), err);
+ if(iVolumeBalanceClause)
+ {
+ INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying."));
+ if (iVolume == iMMFDevSound->Volume())
+ {
+ INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected"));
+ }
+ else
+ {
+ ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume);
+ StopTest (KErrGeneral);
+ break;
+ }
+ INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying."));
+ TInt getLSpeakerBalance = 0;
+ TInt getRSpeakerBalance = 0;
+ TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance));
+ if (err != KErrNone)
+ {
+ ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err);
+ StopTest(err);
+ break;
+ }
+ if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance))
+ {
+ INFO_PRINTF1(_L("Balance configuration returned previous set values as expected"));
+ }
+ else
+ {
+ ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"),
+ getLSpeakerBalance, getRSpeakerBalance);
+ StopTest(KErrGeneral);
+ break;
+ }
+ }
+ }
+ else
+ {
+ ERR_PRINTF3(_L("CMMFDevSound::Resume returned with error = %d, when the expected error is = %d"), err, expectedErr);
+ StopTest (KErrGeneral, EFail);
+ }
}
else
{
@@ -11182,7 +11233,7 @@
{
iBuffer->SetLastBuffer (ETrue);
}
- INFO_PRINTF1(_L("CMMFDevSound::PlayData")); //todo tidy up
+ INFO_PRINTF1(_L("CMMFDevSound::PlayData")); //XXX tidy up
iMMFDevSound->PlayData();
}
else if ((aDevSoundEvent == EEventTimerComplete) && (aError == KErrNone))
@@ -11218,7 +11269,18 @@
//Stage 4 DevSound halted correctly, resuming playback
INFO_PRINTF1(_L("Stage 4: No calls to BufferToBeFilled during paused stage, resuming playback to ensure it completes properly"));
iDevSoundState = EStatePlaying;
- iMMFDevSound->Resume();
+ INFO_PRINTF1(_L("Calling CMMFDevSound::IsResumeSupported"));
+ TBool isResumeSupported = iMMFDevSound->IsResumeSupported();
+ if (!isResumeSupported)
+ {
+ INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::PlayInitL"));
+ iMMFDevSound->PlayInitL();
+ }
+ else // resume is supported
+ {
+ INFO_PRINTF1(_L("Calling CMMFDevSound::Resume"));
+ iMMFDevSound->Resume();
+ }
}
else
{
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/GEF/scripts/TSU_MMF_GEF_01.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/GEF/scripts/TSU_MMF_GEF_01.script Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/GEF/scripts/TSU_MMF_GEF_01.script Mon Aug 23 18:56:36 2010 +0100
@@ -21,8 +21,8 @@
//! @SYMTestCaseID MM-MMF-GEF-U-001
-RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-001
-TEST_COMPLETE
+//RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-001
+//TEST_COMPLETE
//! @SYMTestCaseID MM-MMF-GEF-U-002
@@ -31,11 +31,11 @@
//! @SYMTestCaseID MM-MMF-GEF-U-003
-RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-003
-TEST_COMPLETE
+//RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-003
+//TEST_COMPLETE
//! @SYMTestCaseID MM-MMF-GEF-U-004
-RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-004
-TEST_COMPLETE
+//RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-004
+//TEST_COMPLETE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -148,7 +148,8 @@
{
}
-void CMMFMidiTestController::ResetL() //FIXME - replacement for RemoveSourceSink()
+
+void CMMFMidiTestController::ResetL() //XXX - replacement for RemoveSourceSink()
{
}
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.h
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.h Mon Aug 23 18:56:36 2010 +0100
@@ -48,7 +48,7 @@
virtual void RemoveDataSourceL(MDataSource& aDataSource);
virtual void RemoveDataSinkL(MDataSink& aDataSink);
virtual void RemoveSourceSinkL();
- virtual void ResetL();//FIXME - replacement for RemoveSourceSink()
+ virtual void ResetL();//XXX - replacement for RemoveSourceSink()
virtual void PrimeL();
virtual void PlayL();
virtual void PauseL();
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TSU_MMFMIDICLNT.h
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TSU_MMFMIDICLNT.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TSU_MMFMIDICLNT.h Mon Aug 23 18:56:36 2010 +0100
@@ -40,7 +40,7 @@
#include
#include
-// Uncomment this line for Jetstream project
+// Uncomment this line for Jet-stream project
//#define JETSTREAM_TESTS 1
class CTestSuite ;
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestMidiClientUtility.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestMidiClientUtility.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestMidiClientUtility.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -962,7 +962,7 @@
break;
case ETestBeatsHighOutOfRange:
expErr = KErrArgument;
- //microBeatsPerMinute = 1000001*1000000; FIXME overflow warning
+ //microBeatsPerMinute = 1000001*1000000; XXX overflow warning
microBeatsPerMinute = 1000001;
break;
default:
@@ -1342,8 +1342,8 @@
return EInconclusive;
}
- //TRAPD(err, TDesC8 mimeType = aMidi->MimeTypeL());//FIXME: TDesC8 mimeType has to be define above
- TRAPD(err, aMidi->MimeTypeL());//FIXME: TDesC8 mimeType has to be define above
+ //TRAPD(err, TDesC8 mimeType = aMidi->MimeTypeL());//XXX: TDesC8 mimeType has to be define above
+ TRAPD(err, aMidi->MimeTypeL());//XXX: TDesC8 mimeType has to be define above
if (expErr != err)
{
ERR_PRINTF3(_L("MimeTypeL gave error %d (expected %d)"),err, expErr);
@@ -1772,7 +1772,7 @@
break;
case ETestUnsupported:
- // TODO : values defined as unsupported?
+ // XXX : values defined as unsupported?
mipEntry1.iChannel = 0;
mipEntry1.iMIPValue = 0;
mipEntry2.iChannel = 0;
@@ -1783,7 +1783,7 @@
break;
case ETestCorrupt:
- // TODO : values defined as corrupt?
+ // XXX : values defined as corrupt?
mipEntry1.iChannel = -1;
mipEntry1.iMIPValue = -1;
mipEntry2.iChannel = -1;
@@ -3055,7 +3055,7 @@
// we modify the test spec to go with this?
case ETestOutOfRange:
expErr = KErrArgument;
- //repeats = 9999; // ** TBD : max. range of repeats?
+ //repeats = 9999; // ** XXX : max. range of repeats?
repeats = -1;
silentTime = 1000000;
break;
@@ -4005,7 +4005,7 @@
const TDesC8* ptrInstrument = &KNullDesC8;
const TDesC8* ptrBadInstrument = &KNullDesC8;
- // TODO::When we have a MIDI instrument / controller load the instrument
+ // XXX::When we have a MIDI instrument / controller load the instrument
// into the descriptor here.
// expected results
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestStepMidiClntAllocFailNew.h
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestStepMidiClntAllocFailNew.h Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestStepMidiClntAllocFailNew.h Mon Aug 23 18:56:36 2010 +0100
@@ -20,7 +20,7 @@
/**
*
- * FIXME
+ * XXX
*
* @lib ""
*
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_VCLNT_01.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_VCLNT_01.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-//
-//
-
-TARGET tsu_mmf_vclnt_01.dll
-CAPABILITY ALL -TCB
-TARGETTYPE dll
-//UID to be renamed
-UID 0x1000008d 0x101F7D2C
-VENDORID 0x70000001
-
-MACRO _TYPHOON_TEST2_
-
-SOURCEPATH ../VCLNT/TSU_MMF_VCLNT_01
-SOURCE TestSuiteUnitMMFVidClient.cpp
-SOURCE TestStepUnitMMFVidClient.cpp
-SOURCE TestStepVidPlayerNew.cpp
-SOURCE TestStepVidPlayerNewPriorPref.cpp
-SOURCE TestStepVidPlayerOpen.cpp
-SOURCE TestStepVidPlayerOpenFileCtrlUid.cpp
-SOURCE TestStepAllocFailVidPlayer.cpp
-SOURCE TestStepVidPlayerManip.cpp
-SOURCE TestStepVidRecorderNew.cpp
-SOURCE TestStepVidRecorderOpen.cpp
-SOURCE TestStepAllocFailVidRecorderNew.cpp
-SOURCE TestStepAllocFailVidRecorderOpen.cpp
-SOURCE TestStepVidRecorderManip.cpp
-SOURCE TestStepVidPlayerDrm.cpp
-source teststepvidplayerarn.cpp
-SOURCE TestStepVidRecordError.cpp
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-SOURCE teststepvidplayersubtitle.cpp
-#endif // SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-
-#ifdef SYMBIAN_BUILD_GCE
-source ../../../../src/Client/Video/mmfclientvideoplayer2.cpp
-source ../../../../src/Client/Video/mediaclientvideodisplaybody.cpp
-source ../../../../src/Client/Video/mediaclientextdisplayinterface.cpp
-source ../../../../src/Client/Video/mediaclientextdisplayhandler.cpp
-source ../../../../src/Client/Video/mediaclientwseventobserver.cpp
-source ../../../../src/Client/Video/mediaclientpolicyserverclient.cpp
-source ../../../../src/Client/Video/mediaclientpolicyserversession.cpp
-source teststepvidplayereventhandler.cpp
-#endif
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-SOURCE ../../../../src/Client/Video/mmfsubtitleutility.cpp
-#endif // SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-
-source ../../../../src/Client/Video/mmfclientvideoplayer.cpp
-source ../../../../src/Client/Video/mmfclientvideoplayerbody.cpp
-source ../../../../src/Client/Video/mmfclientvideorecorder.cpp
-source ../../../../src/Client/Video/mmfclientvideorecorderbody.cpp
-source ../../../../src/Client/Video/Mmfclientvideocallback.cpp
-
-USERINCLUDE ../VCLNT/TSU_MMF_VCLNT_01
-USERINCLUDE ../VCLNT/TSU_MMF_VCLNT_APP
-USERINCLUDE ../VCLNT
-USERINCLUDE ../../../inc
-USERINCLUDE ../../../src/Client/Utility
-USERINCLUDE ../VCLNT/TS_CMMFVideoTestController
-USERINCLUDE ../VCLNT/ts_cmmfvideotestcustomcommands
-USERINCLUDE ../../../inc/mmf/plugin
-
-USERINCLUDE ../../../src/Client/Video
-
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN // Application layer macro required to link against Techview headers
-
-USERINCLUDE ../../../inc/mmf/ControllerFramework
-USERINCLUDE ../../../inc/mmf/common
-USERINCLUDE ../../../inc/mmf/server
-
-LIBRARY ecom.lib
-LIBRARY ecam.lib
-LIBRARY euser.lib
-LIBRARY efsrv.lib
-LIBRARY fbscli.lib
-LIBRARY testframeworkclient.lib
-LIBRARY mediaclientutility.lib
-LIBRARY mediaclient.lib
-LIBRARY mediaclientaudiostream.lib
-LIBRARY mediaclientaudio.lib
-
-LIBRARY mmcommon.lib
-
-//
-// from the video client
-// add the test libs for the 'dummy' controller
-//
-library mmfcontrollerframework.lib
-library mmfstandardcustomcommands.lib
-
-library ws32.lib
-library eikcore.lib
-LIBRARY apgrfx.lib
-LIBRARY apparc.lib
-LIBRARY hal.lib
-LIBRARY bafl.lib
-LIBRARY cone.lib
-LIBRARY centralrepository.lib
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-DEFFILE tsu_mmf_vclnt_01_gce2.def
-#else
-
-#ifdef SYMBIAN_BUILD_GCE
-DEFFILE tsu_mmf_vclnt_01_gce.def
-#else
-DEFFILE TSU_MMF_VCLNT_01.DEF
-#endif //SYMBIAN_BUILD_GCE
-#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-
-NOSTRICTDEF
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_VCLNT_APP.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_VCLNT_APP.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET vclntapptest.exe
-TARGETTYPE exe
-
-
-CAPABILITY ALL -TCB
-UID 0x100039CE 0x101F7C13
-VENDORID 0x70000001
-SOURCEPATH ../VCLNT/TSU_MMF_VCLNT_APP
-SOURCE VclntAppTest.cpp
-
-USERINCLUDE ../VCLNT/TSU_MMF_VCLNT_01
-USERINCLUDE ../VCLNT/TSU_MMF_VCLNT_APP
-USERINCLUDE ../VCLNT/TS_CMMFVideoTestController
-USERINCLUDE ../../../src/Client/Video
-USERINCLUDE ../../../src/Client/Utility
-
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN // Application layer macro required to link against Techview headers
-
-START RESOURCE VclntAppTest.rss
-HEADER
-targetpath /resource/apps
-lang sc
-end
-
-LIBRARY euser.lib
-LIBRARY apparc.lib
-LIBRARY cone.lib
-LIBRARY efsrv.lib
-LIBRARY eikcore.lib
-LIBRARY eikdlg.lib
-LIBRARY ws32.lib
-LIBRARY mediaclientvideo.lib
-LIBRARY testframeworkclient.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY ecom.lib
-
-#ifdef SYMBIAN_BUILD_GCE
-LIBRARY gceavailable.lib
-#endif
-
-sourcepath ../VCLNT/TSU_MMF_VCLNT_APP
-START RESOURCE VclntAppTest_reg.rss
-TARGETPATH /private/10003a3f/apps
-END
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFVideoTestController.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFVideoTestController.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-//
-//
-
-target ts_cmmfvideotestcontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID 0x10009d8d 0x101f7D2D
-VENDORID 0x70000001
-
-SOURCEPATH ../VCLNT/TS_CMMFVideoTestController
-SOURCE Ts_cmmfvideotestcontroller.cpp
-
-#ifdef SYMBIAN_BUILD_GCE
-#ifdef WINSCW
-source ../gceavailable_winscw.cpp
-#endif
-
-#if defined(EABI) || defined(X86GCC)
-source ../gceavailable_nongce.cpp
-#endif
-#endif // SYMBIAN_BUILD_GCE
-
-USERINCLUDE ../VCLNT
-USERINCLUDE ../VCLNT/TS_CMMFVideoTestController
-USERINCLUDE ../VCLNT/ts_cmmfvideotestcustomcommands
-USERINCLUDE ../VCLNT/TSU_MMF_VCLNT_01
-USERINCLUDE ../../../inc/mmf/ControllerFramework
-USERINCLUDE ../../../inc/mmf
-USERINCLUDE ../../../inc/mmf/common
-USERINCLUDE ../../../inc/mmf/server
-USERINCLUDE ../../../inc/mmf/PLUGIN
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7D2D.rss
-target ts_cmmfvideotestcontroller.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY ts_cmmfvideotestcustomcommands.lib
-LIBRARY mmfstandardcustomcommands.lib
-LIBRARY fbscli.lib
-LIBRARY bafl.lib
-LIBRARY surfacemanager.lib
-#ifdef EABI
-library ecom.lib
-#endif
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-library ws32.lib
-#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFVideoTestCustomCommands.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFVideoTestCustomCommands.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target ts_cmmfvideotestcustomcommands.dll
-CAPABILITY ALL -TCB
-targettype DLL
-UID 0x1000008d 0x101f7D2E
-VENDORID 0x70000001
-
-SOURCEPATH ../VCLNT/ts_cmmfvideotestcustomcommands
-source TS_CMMFVideoTestCustomCommands.cpp
-
-USERINCLUDE ../VCLNT
-USERINCLUDE ../VCLNT/ts_cmmfvideotestcustomcommands
-USERINCLUDE ../VCLNT/TSU_MMF_VCLNT_01
-USERINCLUDE ../../../inc/mmf
-USERINCLUDE ../../../inc/mmf/ControllerFramework
-USERINCLUDE ../../../inc/mmf/common
-USERINCLUDE ../../../inc/mmf/server
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY euser.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY ecom.lib
-
-//nostrictdef
-//exportunfrozen
-
-
-
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_VideoInput.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_VideoInput.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target ts_videoinput.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F7F8C
-VENDORID 0x70000001
-
-SOURCEPATH ../VCLNT/TS_VideoInput
-SOURCE MmfVideoInput.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F7F8C.rss
-target ts_videoinput.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY mmfserverbaseclasses.lib
-LIBRARY ecom.lib
-LIBRARY mmfcontrollerframework.lib
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_VideoOutput.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_VideoOutput.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target ts_videooutput.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F7F8D
-VENDORID 0x70000001
-
-SOURCEPATH ../VCLNT/TS_VideoOutput
-SOURCE MmfVideoOutput.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F7F8D.rss
-target ts_videooutput.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY mmfserverbaseclasses.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY ecom.lib
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/customaviplayercontroller.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/customaviplayercontroller.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target customaviplayercontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x102834B2
-VENDORID 0x70000001
-
-SOURCEPATH ../../../../../mmplugins/mmfwplugins/src/Plugin/Controller/Video/AviPlayController
-SOURCE aviplaycontroller.cpp
-SOURCE avireader.cpp
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-SOURCE srtreader.cpp
-#endif
-
-SOURCEPATH ../avictrl/testplugins/aviplaycontroller
-SOURCE customaviplaycontroller.cpp
-SOURCE customaviplaycontrollerexports.cpp
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-USERINCLUDE ../../../../../mmplugins/mmfwplugins/src/Plugin/Controller/Video/AviPlayController/devsubtitle
-#endif
-
-USERINCLUDE ../../../../../mmplugins/mmfwplugins/src/Plugin/Controller/Video/AviPlayController
-USERINCLUDE ../avictrl
-USERINCLUDE ../avictrl/testplugins/aviplaycontroller
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-/*#ifdef __OMAP__
-
-// Delete the HwDevice once we have OMAP Server implementation
-// Interfacing with HwDevice implementation begins
-USERINCLUDE /GenericGatewayComponent/raw/RawHwDevice
-USERINCLUDE /GenericGatewayComponent/raw/RawGwc
-USERINCLUDE /GenericGatewayComponent/Gwc
-USERINCLUDE /GenericGatewayComponent/BridgeAbstractionLayer
-// Interfacing with HwDevice implementation ends
-#endif //__OMAP__*/
-
-
-start resource 102834B2.rss
-target customaviplayercontroller.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY mmfserverbaseclasses.lib
-LIBRARY mmfdevsound.lib
-LIBRARY devvideo.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY mmfstandardcustomcommands.lib
-LIBRARY fbscli.lib
-LIBRARY bitgdi.lib
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-LIBRARY bafl.lib
-LIBRARY efsrv.lib
-LIBRARY devsubtitle.lib
-#endif
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/ts_cmmfvideotestcontroller_gce.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/ts_cmmfvideotestcontroller_gce.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-//
-//
-
-target ts_cmmfvideotestcontroller_gce.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID 0x10009d8d 0x101f7D2D
-VENDORID 0x70000001
-
-SOURCEPATH ../VCLNT/TS_CMMFVideoTestController
-SOURCE Ts_cmmfvideotestcontroller.cpp
-
-#ifdef WINSCW
-source ../gceavailable_winscw.cpp
-#endif
-
-#ifdef EABI
-source ../gceavailable_gce.cpp
-#endif
-
-
-USERINCLUDE ../VCLNT
-USERINCLUDE ../VCLNT/TS_CMMFVideoTestController
-USERINCLUDE ../VCLNT/ts_cmmfvideotestcustomcommands
-USERINCLUDE ../VCLNT/TSU_MMF_VCLNT_01
-USERINCLUDE ../../../inc/mmf/ControllerFramework
-USERINCLUDE ../../../inc/mmf
-USERINCLUDE ../../../inc/mmf/common
-USERINCLUDE ../../../inc/mmf/server
-USERINCLUDE ../../../inc/mmf/PLUGIN
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7d2d_gce.rss
-target ts_cmmfvideotestcontroller_gce.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY ts_cmmfvideotestcustomcommands.lib
-LIBRARY mmfstandardcustomcommands.lib
-LIBRARY fbscli.lib
-LIBRARY bafl.lib surfacemanager.lib
-#ifdef EABI
-library ecom.lib
-#endif
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-library ws32.lib
-#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_avictrl_01.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_avictrl_01.mmp Fri Jul 09 13:09:11 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// 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".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// tsu_mmf_avictrl_01.dll
-//
-//
-
-
-TARGET tsu_mmf_avictrl_01.dll
-CAPABILITY ALL -TCB
-TARGETTYPE dll
-
-UID 0x1000008d 0x102737F7
-VENDORID 0x70000001
-
-SOURCEPATH ../avictrl
-SOURCE tsu_mmf_avictrl_testsuite.cpp
-SOURCE tsu_mmf_avictrl_teststep.cpp
-SOURCE tsu_mmf_avictrlplay.cpp
-SOURCE tsu_mmf_avictrlrecord.cpp
-
-USERINCLUDE ../avictrl
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY euser.lib
-LIBRARY testframeworkclient.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY mmfstandardcustomcommands.lib
-LIBRARY efsrv.lib
-LIBRARY ecom.lib
-LIBRARY hal.lib
-LIBRARY devvideo.lib
-LIBRARY mmfdevsound.lib
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-LIBRARY ws32.lib
-#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-DEFFILE TSU_MMF_AVICTRL_01.DEF
-
-SMPSAFE
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/common/readme.rtf
Binary file mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/common/readme.rtf has changed
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/Recogniser/group/unittest_recogniser_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/group/unittest_recogniser_test.pkg Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/group/unittest_recogniser_test.pkg Mon Aug 23 18:56:36 2010 +0100
@@ -94,87 +94,87 @@
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Be_With_You.wma"-"c:\recog\valid_be_with_you.wma"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\WMAWidWrngExt.wxt"-"c:\recog\wmawidwrngext.wxt"
"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wma"-"c:\recog\corrupt.wma"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Apertura.mp4"-"c:\recog\valid_apertura.mp4
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\VIDMP4WidWrngExt.wxt"-"c:\recog\vidmp4widwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_vid.mp4"-"c:\recog\corrupt_vid.mp4
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_Mpeg2.mpg"-"c:\recog\corrupt_mpeg2.mpg
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Goodneighbour.wmv"-"c:\recog\valid_goodneighbour.wmv
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\WMVWidWrngExt.wxt"-"c:\recog\wmvwidwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wmv"-"c:\recog\corrupt.wmv
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Aud_sample.3gp"-"c:\recog\valid_aud_sample.3gp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\A3gpWidWrngExt.wxt"-"c:\recog\a3gpwidwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_aud.3gp"-"c:\recog\corrupt_aud.3gp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sample.aac"-"c:\recog\valid_sample.aac
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AACWidWrngExt.wxt"-"c:\recog\aacwidwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.aac"-"c:\recog\corrupt.aac
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_test.mp3"-"c:\recog\valid_test.mp3
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MP3WidWrngExt.wxt"-"c:\recog\mp3widwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mp3"-"c:\recog\corrupt.mp3
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MKVWidWrngExt.wxt"-"c:\recog\mkvwidwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.mkv"-"c:\recog\corrupt.mkv
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\ASFWidWrngExt.wxt"-"c:\recog\asfwidwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.asf"-"c:\recog\corrupt.asf
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.wxt"-"c:\recog\corrupt.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_3gpWidOutExt"-"c:\recog\valid_3gpwidoutext
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_MP3WidOutExt"-"c:\recog\valid_mp3widoutext
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_CrptOGGWidOutExt"-"c:\recog\valid_crptoggwidoutext
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.rm"-"c:\recog\valid_chand_sifarish.rm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RMWidWrngExt.wxt"-"c:\recog\rmwidwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.rm"-"c:\recog\corrupt.rm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RAWidWrngExt.wxt"-"c:\recog\rawidwrngext.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.ra"-"c:\recog\corrupt.ra
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_niceday.asf"-"c:\recog\valid_niceday.asf
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_aacid3.aac"-"c:\recog\valid_aacid3.aac
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rmvideo.rm"-"c:\recog\valid_rmvideo.rm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_80X140.RM"-"c:\recog\valid_80x140.rm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp1.sdp"-"c:\recog\valid_sdp1.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp2.sdp"-"c:\recog\valid_sdp2.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp3.SDP"-"c:\recog\valid_sdp3.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp4.sdp"-"c:\recog\valid_sdp4.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp5.sdp"-"c:\recog\valid_sdp5.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp6.sdp"-"c:\recog\valid_sdp6.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp7.sdp"-"c:\recog\valid_sdp7.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp8.sdp"-"c:\recog\valid_sdp8.sdp
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.3g2"-"c:\recog\valid_3gpp2.3g2
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.wxt"-"c:\recog\valid_3gpp2.wxt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_3GPP2.3g2"-"c:\recog\corrupt_3gpp2.3g2
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2_BadBrand.3g2"-"c:\recog\valid_3gpp2_badbrand.3g2
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_unicode.txt"-"c:\recog\valid_unicode.txt
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Apertura.mp4"-"c:\recog\valid_apertura.mp4"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\VIDMP4WidWrngExt.wxt"-"c:\recog\vidmp4widwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_vid.mp4"-"c:\recog\corrupt_vid.mp4"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_Mpeg2.mpg"-"c:\recog\corrupt_mpeg2.mpg"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Goodneighbour.wmv"-"c:\recog\valid_goodneighbour.wmv"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\WMVWidWrngExt.wxt"-"c:\recog\wmvwidwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wmv"-"c:\recog\corrupt.wmv"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Aud_sample.3gp"-"c:\recog\valid_aud_sample.3gp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\A3gpWidWrngExt.wxt"-"c:\recog\a3gpwidwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_aud.3gp"-"c:\recog\corrupt_aud.3gp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sample.aac"-"c:\recog\valid_sample.aac"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AACWidWrngExt.wxt"-"c:\recog\aacwidwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.aac"-"c:\recog\corrupt.aac"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_test.mp3"-"c:\recog\valid_test.mp3"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MP3WidWrngExt.wxt"-"c:\recog\mp3widwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mp3"-"c:\recog\corrupt.mp3"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MKVWidWrngExt.wxt"-"c:\recog\mkvwidwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.mkv"-"c:\recog\corrupt.mkv"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\ASFWidWrngExt.wxt"-"c:\recog\asfwidwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.asf"-"c:\recog\corrupt.asf"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.wxt"-"c:\recog\corrupt.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_3gpWidOutExt"-"c:\recog\valid_3gpwidoutext"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_MP3WidOutExt"-"c:\recog\valid_mp3widoutext"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_CrptOGGWidOutExt"-"c:\recog\valid_crptoggwidoutext"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.rm"-"c:\recog\valid_chand_sifarish.rm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RMWidWrngExt.wxt"-"c:\recog\rmwidwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.rm"-"c:\recog\corrupt.rm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RAWidWrngExt.wxt"-"c:\recog\rawidwrngext.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.ra"-"c:\recog\corrupt.ra"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_niceday.asf"-"c:\recog\valid_niceday.asf"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_aacid3.aac"-"c:\recog\valid_aacid3.aac"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rmvideo.rm"-"c:\recog\valid_rmvideo.rm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_80X140.RM"-"c:\recog\valid_80x140.rm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp1.sdp"-"c:\recog\valid_sdp1.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp2.sdp"-"c:\recog\valid_sdp2.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp3.SDP"-"c:\recog\valid_sdp3.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp4.sdp"-"c:\recog\valid_sdp4.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp5.sdp"-"c:\recog\valid_sdp5.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp6.sdp"-"c:\recog\valid_sdp6.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp7.sdp"-"c:\recog\valid_sdp7.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp8.sdp"-"c:\recog\valid_sdp8.sdp"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.3g2"-"c:\recog\valid_3gpp2.3g2"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.wxt"-"c:\recog\valid_3gpp2.wxt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_3GPP2.3g2"-"c:\recog\corrupt_3gpp2.3g2"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2_BadBrand.3g2"-"c:\recog\valid_3gpp2_badbrand.3g2"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_unicode.txt"-"c:\recog\valid_unicode.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\_lmnand_miniboot.bin"-"c:\recog\common\_lmnand_miniboot.bin
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\HATCSS.msi"-"c:\recog\common\hatcss.msi
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Image.JPG"-"c:\recog\common\image.jpg
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pdf.pdf"-"c:\recog\common\pdf.pdf
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\readme.rtf"-"c:\recog\common\readme.rtf
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\whois.exe"-"c:\recog\common\whois.exe
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\3.ebm"-"c:\recog\common\3.ebm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\4.notebm"-"c:\recog\common\4.notebm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.dtd"-"c:\recog\common\a.dtd
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wbxml"-"c:\recog\common\a.wbxml
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wml"-"c:\recog\common\a.wml
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlc"-"c:\recog\common\a.wmlc
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmls"-"c:\recog\common\a.wmls
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlsc"-"c:\recog\common\a.wmlsc
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda"-"c:\recog\common\agenda
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda-emb"-"c:\recog\common\agenda-emb
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\badcert.cer"-"c:\recog\common\badcert.cer
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Base64.VCF"-"c:\recog\common\base64.vcf
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Begin3.VCS"-"c:\recog\common\begin3.vcs
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\CALLMANAGER.APP"-"c:\recog\common\callmanager.app
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\copyfile.txt"-"c:\recog\common\copyfile.txt
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\dsaprivate1.key"-"c:\recog\common\dsaprivate1.key
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jad"-"c:\recog\common\fullversiontest.jad
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jar"-"c:\recog\common\fullversiontest.jar
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\InstTest.jad"-"c:\recog\common\insttest.jad
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\legacy.sis"-"c:\recog\common\legacy.sis
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\roudedkeybag.der"-"c:\recog\common\roudedkeybag.der
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pkcs12.p12"-"c:\recog\common\pkcs12.p12
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample1.html"-"c:\recog\common\sample1.html
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample2.htm"-"c:\recog\common\sample2.htm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample3.xhtml"-"c:\recog\common\sample3.xhtml
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample4.xml"-"c:\recog\common\sample4.xml
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\symbian_key.pk8"-"c:\recog\common\symbian_key.pk8
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\tcaf.ini"-"c:\recog\common\tcaf.ini
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm"-"c:\recog\common\test.drm
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm.bin"-"c:\recog\common\test.drm.bin
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\testdoc.tsym"-"c:\recog\common\testdoc.tsym
\ No newline at end of file
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\_lmnand_miniboot.bin"-"c:\recog\common\_lmnand_miniboot.bin"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\HATCSS.msi"-"c:\recog\common\hatcss.msi"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Image.JPG"-"c:\recog\common\image.jpg"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pdf.pdf"-"c:\recog\common\pdf.pdf"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\readme.rtf"-"c:\recog\common\readme.rtf"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\whois.exe"-"c:\recog\common\whois.exe"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\3.ebm"-"c:\recog\common\3.ebm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\4.notebm"-"c:\recog\common\4.notebm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.dtd"-"c:\recog\common\a.dtd"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wbxml"-"c:\recog\common\a.wbxml"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wml"-"c:\recog\common\a.wml"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlc"-"c:\recog\common\a.wmlc"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmls"-"c:\recog\common\a.wmls"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlsc"-"c:\recog\common\a.wmlsc"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda"-"c:\recog\common\agenda"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda-emb"-"c:\recog\common\agenda-emb"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\badcert.cer"-"c:\recog\common\badcert.cer"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Base64.VCF"-"c:\recog\common\base64.vcf"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Begin3.VCS"-"c:\recog\common\begin3.vcs"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\CALLMANAGER.APP"-"c:\recog\common\callmanager.app"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\copyfile.txt"-"c:\recog\common\copyfile.txt"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\dsaprivate1.key"-"c:\recog\common\dsaprivate1.key"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jad"-"c:\recog\common\fullversiontest.jad"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jar"-"c:\recog\common\fullversiontest.jar"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\InstTest.jad"-"c:\recog\common\insttest.jad"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\legacy.sis"-"c:\recog\common\legacy.sis"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\roudedkeybag.der"-"c:\recog\common\roudedkeybag.der"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pkcs12.p12"-"c:\recog\common\pkcs12.p12"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample1.html"-"c:\recog\common\sample1.html"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample2.htm"-"c:\recog\common\sample2.htm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample3.xhtml"-"c:\recog\common\sample3.xhtml"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample4.xml"-"c:\recog\common\sample4.xml"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\symbian_key.pk8"-"c:\recog\common\symbian_key.pk8"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\tcaf.ini"-"c:\recog\common\tcaf.ini"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm"-"c:\recog\common\test.drm"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm.bin"-"c:\recog\common\test.drm.bin"
+"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\testdoc.tsym"-"c:\recog\common\testdoc.tsym"
\ No newline at end of file
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_ACOD_BASE.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_ACOD_BASE.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_ACOD_BASE.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -139,7 +139,7 @@
aFilename.Append(KPCM16ToPCM16BComparisonFile);
break;
- //[< Fix Me GK ]
+ //xxx GK
//case KMMFUidHwDevicePCM16toPCMU16B ://KMMFUidHwDevicePCM16toPCMU16B:
// aFilename.Copy(KComparisonFilesDir);
// aFilename.Append(KPCM16ToPCMU16BComparisonFile);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_SWCODECDEVICES.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_SWCODECDEVICES.cpp Fri Jul 09 13:09:11 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_SWCODECDEVICES.cpp Mon Aug 23 18:56:36 2010 +0100
@@ -136,7 +136,7 @@
const TInt srcBufferSize = theEncode.SourceBufferSize();
const TInt sinkBufferSize = theEncode.SinkBufferSize();
const TInt codedBufferSize = 76*4* KNumFramesInABuffer; // number of coded buffers * size of coded buffer 63*2
- iNumCodedFrames = KNumFramesInABuffer; // claculate these constants soon
+ iNumCodedFrames = KNumFramesInABuffer; //XXX claculate these constants soon
iScratchData = CMMFDescriptorBuffer::NewL( codedBufferSize);
@@ -845,7 +845,7 @@
const TInt srcBufferSize = theCodec.SourceBufferSize();
const TInt sinkBufferSize = theCodec.SinkBufferSize();
const TInt codedBufferSize = 76*4* KNumFramesInABuffer; // number of coded buffers * size of coded buffer 63*2
- iNumCodedFrames = KNumFramesInABuffer; // claculate these constants soon
+ iNumCodedFrames = KNumFramesInABuffer; //XXX claculate these constants soon
iScratchData = CMMFDescriptorBuffer::NewL( codedBufferSize);
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TS_Codes.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TS_Codes.h Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,110 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+// Standard EPOC32 includes required by this header file
+#include
+#include
+
+
+#ifndef TS_CODES_H
+#define TS_CODES_H
+
+
+//-----------------------------//
+// Test custom command function definitions //
+//-----------------------------//
+enum TMMFTestCustomCommands
+ {
+ EMMFTestCustomCommandSetFrameRate = 1,
+ EMMFTestCustomCommandGetFrameRate,
+ EMMFTestCustomCommandGeneralSynchronous,
+ EMMFTestCustomCommandGeneralSynchronousWithReturn,
+ EMMFTestCustomCommandGeneralAsynchronous,
+ EMMFTestCustomCommandGeneralAsynchronousWithReturn,
+ EMMFTestCustomCommandRequestGeneralEvent,
+ EMMFTestCustomCommandSimulateReloading,
+ EMMFTestCustomCommandCheckUrl,
+ EMMFTestCustomCommandSimulateSurfaceCreated,
+ EMMFTestCustomCommandSimulateParaChanged,
+ EMMFTestCustomCommandSimulateRemoveSurface,
+ EMMFTestCustomCommandSetSubtitleDisplayCheck,
+ EMMFTestCustomCommandGetSubtitleCallCount,
+ EMMFTestCustomCommandSimulateCrpReadyEvent,
+ EMMFTestCustomCommandSetLanguageNotAvail,
+ };
+
+_LIT8(KFirstParameter,"first");
+_LIT8(KSecondParameter,"second");
+_LIT8(KReturnParameter,"third");
+
+//URL Test
+_LIT(KTestURL, "http://symbian.com/clock.dummy");
+const TInt KTestIap = 5;
+
+// These are Codes which are passed to and from functions via the Controller Framework.
+
+const TInt KGetAudioQuality = 1;
+const TInt KSetAudionQuality = 2;
+const TInt KDummyFunc1 = 3;
+const TInt KDummyFunc1Return = -4;
+const TInt KDummyFunc2 = 5;
+const TInt KDummyFunc2Return = -6;
+const TInt KLogFunction = 7;
+const TInt KFuncComplete = 0;
+const TInt KModeFunction = 8;
+const TInt KLogIntFunction = 9;
+const TInt KLogInt2Function = 10;
+const TInt KLogRealFunction = 11;
+const TInt KLogTimeInterMicroFunction = 12;
+const TInt KLogTFourCCFunction = 13;
+const TInt KLogFunction2 = 14;
+const TInt KTestSetError = 15;
+const TInt KTestCustomCommandSuccess = -4444;
+const TInt KTestCustomCommandFailure = -5555;
+const TInt KTestGeneralError = -7777;
+
+const TInt KPlayStartTime = 1000000;
+const TInt KPlayEndTime = 2000000;
+const TInt KTestFrameRate = 25;
+
+//-----------------------------//
+// Enums for EMMFTestCustomCommandGetSubtitleCallCount //
+//-----------------------------//
+enum TMMFTestGetSubtitleCountType
+ {
+ EMMFTestEnableSubtitleCallCount = 1,
+ EMMFTestDisableSubtitleCallCount,
+ EMMFTestAddSubtitleConfigCallCount,
+ EMMFTestRemoveSubtitleConfigCallCount,
+ EMMFTestGetCrpParamCallCount,
+ EMMFTestCrpReadyEventCount,
+ EMMFTestUpdateSubtitleConfigCallCount
+ };
+
+//-----------------------------//
+// Leave Codes (Failure Tests) //
+//-----------------------------//
+
+const TInt KOpenFailure = 201;
+const TInt KAddDataSourceFailure = 202;
+const TInt KAddDataSinkFailure = 203;
+const TInt KRemoveDataSourceFailure = 204;
+const TInt KRemoveDataSinkFailure = 205;
+const TInt KPrimeFailure = 206;
+const TInt KFailureCode1 = 210;
+const TInt KFailureCode2 = 211;
+
+
+#endif
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TestStepAllocFailVidPlayer.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TestStepAllocFailVidPlayer.h Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,209 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file contains testing steps for the Unit
+// test of the MMF Video Clients.
+// Tests exercise all exposed memeber functions
+//
+//
+
+
+#ifndef __TEST_STEP_ALLOCFAIL_VID_PLAYER__
+#define __TEST_STEP_ALLOCFAIL_VID_PLAYER__
+
+
+/**
+ *
+ * Initialise
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ * @xxxx
+ *
+ */
+class CTestStepOOMVidPlayerNew : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepOOMVidPlayerNew* NewL(TBool aUseSurface = EFalse);
+ CTestStepOOMVidPlayerNew(TBool aUseSurface);
+ ~CTestStepOOMVidPlayerNew();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoPlayerUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Open File
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ * @xxxx
+ *
+ */
+class CTestStepOOMVidPlayerOpenFile : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ //public MMMFControllerEventMonitorObserver // is it usefull here?
+ {
+public:
+ static CTestStepOOMVidPlayerOpenFile* NewL(TBool aUseFileHandle,
+ TInt aSurfaceMode = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepOOMVidPlayerOpenFile(TBool aUseFileHandle, TInt aSurfaceMode);
+ ~CTestStepOOMVidPlayerOpenFile();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+ //from MMMFControllerEventMonitorObserver
+ //virtual void HandleEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenFileAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iUseFileHandle;
+ };
+
+/**
+ *
+ * Open Desc
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ * @xxxx
+ *
+ */
+class CTestStepOOMVidPlayerOpenDesc : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepOOMVidPlayerOpenDesc* NewL(TInt aSurfaceMode = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepOOMVidPlayerOpenDesc(TInt aSurfaceMode);
+ ~CTestStepOOMVidPlayerOpenDesc();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+ //from MMMFControllerEventMonitorObserver
+ //virtual void HandleEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenDescAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ HBufC8* iBuf;
+ };
+
+/**
+ *
+ * Open Url
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ * @xxxx
+ *
+ */
+class CTestStepOOMVidPlayerOpenUrl : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ //public MMMFControllerEventMonitorObserver // is it usefull here?
+ {
+public:
+ static CTestStepOOMVidPlayerOpenUrl* NewL(TInt aSurfaceMode = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepOOMVidPlayerOpenUrl(TInt aSurfaceMode);
+ ~CTestStepOOMVidPlayerOpenUrl();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+ //from MMMFControllerEventMonitorObserver
+ //virtual void HandleEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenUrlAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Open File Specific Controller Uid
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ * @xxxx
+ *
+ */
+class CTestStepOOMVidPlayerOpenFileCtrlUid : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ //public MMMFControllerEventMonitorObserver // is it usefull here?
+ {
+public:
+ static CTestStepOOMVidPlayerOpenFileCtrlUid* NewL();
+ CTestStepOOMVidPlayerOpenFileCtrlUid();
+ ~CTestStepOOMVidPlayerOpenFileCtrlUid();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ //from MMMFControllerEventMonitorObserver
+ //virtual void HandleEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenFileAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+#endif //(__TEST_STEP_ALLOCFAIL_VID_PLAYER__)
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TestStepUnitMMFVidClient.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TestStepUnitMMFVidClient.h Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,160 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#if (!defined __UNIT_MMF_VID_CLNT_TESTSTEP_H__)
+#define __UNIT_MMF_VID_CLNT_TESTSTEP_H__
+
+// EPOC includes
+#include
+//#include
+#include
+
+#ifdef SYMBIAN_BUILD_GCE
+#include
+#endif
+
+
+const TInt KUidTestVideoController = 0x101F88D9;
+
+/**
+ *
+ * CActiveListener provides the asynchronous operation
+ * of an active object
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ *
+ */
+class CActiveListener : public CActive
+ {
+public:
+ CActiveListener() : CActive(CActive::EPriorityIdle) { CActiveScheduler::Add(this); }
+ void InitialiseActiveListener() { iStatus = KRequestPending; SetActive(); }
+ // From CActive
+ virtual void RunL() { CActiveScheduler::Stop(); }
+ virtual void DoCancel() {};
+ };
+
+class CTestSuite;
+class CTestSuiteUnitMMFVidClient;
+class CVideoPlayerUtility;
+class CVideoRecorderUtility;
+
+/**
+ *
+ * CTestStepUnitMMFVidClient, which is the base class for all
+ * the UnitMMFVidClient suite test steps.
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ * @xxxx
+ *
+ */
+class CTestStepUnitMMFVidClient : public CTestStep
+ {
+public:
+ enum TTestMode
+ {
+ ENotSurfaceMode,
+ ENotSurfaceModeSupported,
+ ESurfaceMode,
+ ESurfaceModeNotSupported,
+ };
+ CTestStepUnitMMFVidClient();
+ ~CTestStepUnitMMFVidClient();
+
+ virtual enum TVerdict DoTestStepPreambleL(void);
+ virtual enum TVerdict DoTestStepPostambleL(void);
+
+ // accessors
+ void SetUnitMMFVidClientSuite(CTestSuiteUnitMMFVidClient* aSuite);
+ inline CTestSuiteUnitMMFVidClient* UnitMMFVidClientSuite() const;
+
+protected:
+ virtual void OpenAndStartSchedulerL(TBool aUseFileHandle = EFalse);
+
+ virtual void OpenAndStartSchedulerL(const TMMSource& aSource);
+
+ virtual void PlayAndStartSchedulerL();
+ virtual void RecOpenAndStartSchedulerL(TBool aUseFileHandle = EFalse);
+ virtual void RecordAndStartScheduler();
+ virtual void RecorderPrepareAndStartScheduler();
+ virtual void PlayerPrepareAndStartScheduler();
+ TBool PlayerStateOpening();
+ TBool PlayerStatePaused();
+ TBool PlayerStateStopped();
+ TBool PlayerStatePlaying();
+#ifdef SYMBIAN_BUILD_GCE
+ void SurfaceSupported();
+ TBool SurfaceCreated();
+#endif
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+ TInt SubtitleCrpDataCount();
+ TBool CheckSubtitleData(TInt aWindowId, TInt aCrpId, const TRect& aCrpRect);
+#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+
+ TBool RecorderStateOpening();
+ TBool RecorderStatePaused();
+ TBool RecorderStateStopped();
+ TBool RecorderStateRecording();
+
+ TInt GetPlayerPriority(TMMFPrioritySettings&);
+ TInt GetRecorderPriority(TMMFPrioritySettings&);
+ TInt GetPlayerClipRect(TRect& aRect);
+ TInt GetPlayerWindowRect(TRect& aRect);
+ TInt GetPlayerController(RMMFController*& aController);
+ TInt GetRecorderController(RMMFController*& aController);
+ TInt GetInitScreenNumber();
+ TVerdict ControllerCalled(const TDesC8& aText, TBool aExpected = ETrue);
+ TVerdict ControllerCalled2(const TDesC8& aText, TBool aExpected = ETrue);
+ TVerdict DoControllerCalled(TInt aFunction, const TDesC8& aText, TBool aExpected = ETrue);
+
+ void InitWservL();
+ void DeInitWserv();
+ void InitEikonL();
+ void DeInitEikon();
+
+private:
+ // pointer to suite which owns this test
+ CTestSuiteUnitMMFVidClient* iUnitMMFVidClientSuite;
+ CActiveScheduler* iScheduler ;
+
+
+protected:
+ CVideoPlayerUtility* iPlayer;
+#ifdef SYMBIAN_BUILD_GCE
+ CVideoPlayerUtility2* iPlayer2;
+#endif
+ CVideoRecorderUtility* iRecorder;
+ TPtrC iFileName;
+ TPtrC8 iMimeType;
+ TPtrC* iRes;
+
+ RFs iFs;
+ RFile iFile;
+
+ CWsScreenDevice* iScreen;
+ RWindow* iWindow;
+ RWsSession iWs;
+ RWindowGroup iRootWindow;
+
+ //CEikonEnv* iEikEnv;
+
+ TBool iSurfaceSupported;
+ TBool iSurfaceMode;
+ TBool iVpu2;
+ };
+
+#endif //__UNIT_MMF_VID_CLNT_TESTSTEP_H__
diff -r ae690a8c4a18 -r f7bf1ed8db72 mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TestStepVidPlayer.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/inc/TestStepVidPlayer.h Mon Aug 23 18:56:36 2010 +0100
@@ -0,0 +1,2176 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file contains testing steps for the Unit
+// test of the MMF Video Clients.
+// Tests exercise all exposed member functions.
+//
+//
+
+
+#ifndef TEST_STEP_VID_PLAYER
+#define TEST_STEP_VID_PLAYER
+
+//#include
+//#include
+//#include "VclntAppTest.h"
+#include
+
+#include
+
+#ifdef SYMBIAN_BUILD_GCE
+#include
+#include
+#endif // SYMBIAN_BUILD_GCE
+
+
+_LIT (KTestAppFullPath, "Z:\\Sys\\bin\\VclntAppTest.exe");
+
+/**
+ *
+ * Initialise
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerNew : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerNew* NewL(TBool aUseSurface = EFalse);
+ CTestStepVidPlayerNew(TBool aUseSurface);
+ ~CTestStepVidPlayerNew();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Initialise Priority Preference
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerNewPriorPref : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerNewPriorPref* NewL(TBool aUseSurface = EFalse);
+ CTestStepVidPlayerNewPriorPref(TBool aUseSurface);
+ ~CTestStepVidPlayerNewPriorPref();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TMMFPrioritySettings iPrioritySettings;
+ };
+
+/**
+ *
+ * Open File
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerOpenFile : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ enum TTest
+ {
+ EFileName,
+ EFileHandle,
+ EFileSource,
+ EFileHandleSource,
+ };
+
+public:
+ static CTestStepVidPlayerOpenFile* NewL(const TDesC& aTestName, const TTest aTest);
+ CTestStepVidPlayerOpenFile(const TDesC& aTestName, const TTest aTest);
+ ~CTestStepVidPlayerOpenFile();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TTest iTest;
+ };
+
+/**
+ *
+ * Open Desc
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerOpenDesc : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerOpenDesc* NewL(TInt aUseSurface = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepVidPlayerOpenDesc(TInt aUseSurface);
+ ~CTestStepVidPlayerOpenDesc();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenDescAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ HBufC8* iBuf;
+ };
+
+/**
+ *
+ * Open Url
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerOpenUrl : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerOpenUrl* NewL(TInt aUseSurface = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepVidPlayerOpenUrl(TInt aUseSurface);
+ ~CTestStepVidPlayerOpenUrl();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenUrlAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Open Url via uri tag
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerOpenviaUriTag : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerOpenviaUriTag* NewL();
+ CTestStepVidPlayerOpenviaUriTag();
+ ~CTestStepVidPlayerOpenviaUriTag();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenUrlAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Open Url while media client video uses try next controller
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerOpenTryNextCtrl : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerOpenTryNextCtrl* NewL();
+ CTestStepVidPlayerOpenTryNextCtrl();
+ ~CTestStepVidPlayerOpenTryNextCtrl();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenUrlAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Open File Specific Controller Uid
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerOpenFileCtrlUid : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ enum TOpenMethod
+ {
+ EFileName,
+ EFileHandle,
+ EDescriptor,
+ EUrl,
+ };
+ static CTestStepVidPlayerOpenFileCtrlUid* NewL(TInt aUseFileHandle,
+ TInt aSurfaceMode = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepVidPlayerOpenFileCtrlUid(TInt aUseFileHandle, TInt aSurfaceMode);
+ ~CTestStepVidPlayerOpenFileCtrlUid();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ void OpenFileAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TInt iUseFileHandle;
+ TInt iSurfaceMode;
+ RBuf8 iBuf;
+ };
+
+/**
+ *
+ * Close
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerClose : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerClose* NewL();
+ CTestStepVidPlayerClose();
+ ~CTestStepVidPlayerClose();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Play
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerPlay : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerPlay* NewL();
+ CTestStepVidPlayerPlay();
+ ~CTestStepVidPlayerPlay();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * Stop
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerStop : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerStop* NewL();
+ CTestStepVidPlayerStop();
+ ~CTestStepVidPlayerStop();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Pause
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerPause : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerPause* NewL();
+ CTestStepVidPlayerPause();
+ ~CTestStepVidPlayerPause();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+private:
+ void OpenAndStartSchedulerL();
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get/Set Priority
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerPriority : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ //public MMMFControllerEventMonitorObserver // is it here?
+ {
+public:
+ static CTestStepVidPlayerPriority* NewL();
+ CTestStepVidPlayerPriority();
+ ~CTestStepVidPlayerPriority();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Set Display Window
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ */
+class CTestStepVidPlayerSetDisplayWindow : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerSetDisplayWindow* NewL(TBool aUseSurface,
+ TInt aStatus = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepVidPlayerSetDisplayWindow(TBool aUseSurface, TInt aStatus);
+ ~CTestStepVidPlayerSetDisplayWindow();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Player Restart
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerRestart : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerRestart* NewL();
+ CTestStepVidPlayerRestart();
+ ~CTestStepVidPlayerRestart();
+ TVerdict DoTestStepPreambleL();
+ TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+ virtual void Close();
+
+ // from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get Frame
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerGetFrame : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerGetFrame* NewL(TBool aUseIntentAPI);
+
+ ~CTestStepVidPlayerGetFrame();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+protected:
+ CTestStepVidPlayerGetFrame(TBool aUseIntentAPI);
+
+private:
+ TBool iUseIntentAPI;
+ TInt iError;
+ TInt iError2;
+ TMMFEvent iEvent;
+ CFbsBitmap iFrame;
+ };
+
+/**
+ *
+ * Get Frame Rate
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerGetFrameRate : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerGetFrameRate* NewL();
+ CTestStepVidPlayerGetFrameRate();
+ ~CTestStepVidPlayerGetFrameRate();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get Video frame size
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerGetVFrameSize : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerGetVFrameSize* NewL();
+ CTestStepVidPlayerGetVFrameSize();
+ ~CTestStepVidPlayerGetVFrameSize();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get Video bit rate
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerGetVBitRate : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerGetVBitRate* NewL();
+ CTestStepVidPlayerGetVBitRate();
+ ~CTestStepVidPlayerGetVBitRate();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get Audio bit rate
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerGetABitRate : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerGetABitRate* NewL();
+ CTestStepVidPlayerGetABitRate();
+ ~CTestStepVidPlayerGetABitRate();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get Audio enabled
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerAudEnabled : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerAudEnabled* NewL();
+ CTestStepVidPlayerAudEnabled();
+ ~CTestStepVidPlayerAudEnabled();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get position in the clip
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerClipPosition : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerClipPosition* NewL();
+ CTestStepVidPlayerClipPosition();
+ ~CTestStepVidPlayerClipPosition();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get duration of the clip
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerDuration : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerDuration* NewL();
+ CTestStepVidPlayerDuration();
+ ~CTestStepVidPlayerDuration();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get video type
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerVideoType : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerVideoType* NewL();
+ CTestStepVidPlayerVideoType();
+ ~CTestStepVidPlayerVideoType();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Get audio type
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerAudioType : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerAudioType* NewL();
+ CTestStepVidPlayerAudioType();
+ ~CTestStepVidPlayerAudioType();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Volume functions
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerVol : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerVol* NewL();
+ CTestStepVidPlayerVol();
+ ~CTestStepVidPlayerVol();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Set/Get balance functions
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerBalance : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerBalance* NewL();
+ CTestStepVidPlayerBalance();
+ ~CTestStepVidPlayerBalance();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+/**
+ *
+ * Metadata functions
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerMeta : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerMeta* NewL();
+ CTestStepVidPlayerMeta();
+ ~CTestStepVidPlayerMeta();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+
+
+
+/**
+ *
+ * PlayWindow
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerPlayWindow : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerPlayWindow* NewL();
+ CTestStepVidPlayerPlayWindow();
+ ~CTestStepVidPlayerPlayWindow();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * GetImplementationInfo
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerGetImplementationInfo : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerGetImplementationInfo* NewL();
+ CTestStepVidPlayerGetImplementationInfo();
+ ~CTestStepVidPlayerGetImplementationInfo();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * RefreshFrame
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerRefreshFrame : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerRefreshFrame* NewL();
+ CTestStepVidPlayerRefreshFrame();
+ ~CTestStepVidPlayerRefreshFrame();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * SendCustomCommandSync
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerSendCustomCommandSync : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerSendCustomCommandSync* NewL();
+ CTestStepVidPlayerSendCustomCommandSync();
+ ~CTestStepVidPlayerSendCustomCommandSync();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * SendCustomCommandAsync
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerSendCustomCommandAsync : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerSendCustomCommandAsync* NewL();
+ CTestStepVidPlayerSendCustomCommandAsync();
+ ~CTestStepVidPlayerSendCustomCommandAsync();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+ class CAsyncObserver : public CActive
+ {
+ public:
+ CAsyncObserver() : CActive(EPriorityStandard) {CActiveScheduler::Add(this);}
+ void RunL()
+ {
+ CActiveScheduler::Stop();
+ }
+ void DoCancel(){;}
+ TRequestStatus& ActiveStatus(){SetActive();return iStatus;}
+ };
+
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ CAsyncObserver* iAsyncObserver;
+ TMMFMessageDestinationPckg iDestinationPckg;
+ };
+
+/**
+ *
+ * CTestStepVidPlayerGeneralEvent
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerGeneralEvent : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerGeneralEvent* NewL();
+ CTestStepVidPlayerGeneralEvent();
+ ~CTestStepVidPlayerGeneralEvent();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TBool iCorrectEventReceived;
+ TBool iEventReceived;
+ TInt iError;
+ };
+
+/**
+ *
+ * CTestStepVidPlayerReloadingTest
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerReloadingTest : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver,
+ public MVideoLoadingObserver
+ {
+public:
+ static CTestStepVidPlayerReloadingTest* NewL();
+ CTestStepVidPlayerReloadingTest();
+ ~CTestStepVidPlayerReloadingTest();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+ //from MVideoLoadingObserver
+ virtual void MvloLoadingStarted();
+ virtual void MvloLoadingComplete();
+
+private:
+ TBool iCorrectEventReceived;
+ TBool iEventReceived;
+ TBool iLoadingComplete;
+ TBool iLoadingStarted;
+ TInt iError;
+ };
+
+/**
+ *
+ * Test Get/SetRotation methods
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerRotation : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerRotation* NewL();
+ CTestStepVidPlayerRotation();
+ ~CTestStepVidPlayerRotation();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+
+/**
+ *
+ * Test Get/SetScaleFactor methods
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerScale : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerScale* NewL();
+ CTestStepVidPlayerScale();
+ ~CTestStepVidPlayerScale();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * Test Get/SetCropRegion methods
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerCropRegion : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerCropRegion* NewL();
+ CTestStepVidPlayerCropRegion();
+ ~CTestStepVidPlayerCropRegion();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * PlayPause
+ *
+ * INC041303 - PSS - PlaybackComplete problem in MMF Framework
+ * This checks to see whether we get the MvpuoPlayComplete() callback
+ * in the paused state: It relies on the test controller
+ * doing nothing much when it gets a Pause command.
+ *
+ */
+class CTestStepVidPlayerPlayPause : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerPlayPause* NewL();
+ CTestStepVidPlayerPlayPause();
+ ~CTestStepVidPlayerPlayPause();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * Open and play a protected video clip from file using PLAY intent.
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerDrm : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ enum TState
+ {
+ EOpen,
+ EPrepare,
+ EPlay,
+ EStop
+ };
+
+ enum TTest
+ {
+ EProtectedPlayIntent,
+ EProtectedUnknownIntent,
+ EProtectedPlayNoRights
+ };
+
+ enum TSource
+ {
+ EFileSource,
+ EFileHandleSource
+ };
+
+public:
+ static CTestStepVidPlayerDrm* NewL(const TDesC& aTestName, TSource aSource, TTest aTest);
+ static CTestStepVidPlayerDrm* NewAllocTestL(const TDesC& aTestName, TSource aSource, TTest aTest);
+ ~CTestStepVidPlayerDrm();
+ TVerdict DoTestStepPreambleL();
+ TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ CTestStepVidPlayerDrm(const TDesC& aTestName, TSource aSource, TTest aTest, TBool aDoAllocTest);
+ TVerdict GetConfig();
+ TInt OpenFile();
+ void CheckVerdict(const TDesC& aName);
+ void RunStepL();
+ void NextState();
+
+ TVerdict DoTestStepAllocL();
+
+private:
+ TInt iError;
+ TState iState;
+ TTest iTest;
+ TSource iSource;
+ RFile iFile;
+ RFs iFs;
+
+ TBool iDoAllocTest;
+ };
+
+/**
+ *
+ * Player stop and start Direct Screen Access
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerStopStartDSA : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerStopStartDSA* NewL(TInt aSurfaceMode = CTestStepUnitMMFVidClient::ENotSurfaceMode);
+ CTestStepVidPlayerStopStartDSA(TInt aSurfaceMode);
+ ~CTestStepVidPlayerStopStartDSA();
+ TVerdict DoTestStepPreambleL();
+ TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+ virtual void Close();
+
+ // from MVideoPlayerUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ };
+
+/**
+ *
+ * Test case for DEF081389,DEF082497,DEF085513
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerOpenDurationCustomCommand : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerOpenDurationCustomCommand* NewL();
+ CTestStepVidPlayerOpenDurationCustomCommand();
+ ~CTestStepVidPlayerOpenDurationCustomCommand ();
+ TVerdict DoTestStepPreambleL();
+ TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoPlayerUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+private:
+ void OpenUrlAndStartSchedulerL();
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ };
+
+
+/**
+ *
+ * CheckImplementationInfo
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ */
+class CTestStepVidPlayerCheckImplementationInfo : public CTestStepUnitMMFVidClient,
+ public MVideoPlayerUtilityObserver
+ {
+public:
+ static CTestStepVidPlayerCheckImplementationInfo* NewL();
+ CTestStepVidPlayerCheckImplementationInfo();
+ ~CTestStepVidPlayerCheckImplementationInfo();
+ enum TVerdict DoTestStepPreambleL();
+ enum TVerdict DoTestStepPostambleL();
+ virtual TVerdict DoTestStepL();
+
+ //from MVideoRecorderUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame, TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+private:
+ TInt iError;
+ TMMFEvent iEvent;
+ TBool iHasPlayed;
+ };
+
+/**
+ *
+ * Test case for DEF092672
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ *
+ */
+class CTestStepVideoInterruptionByAudio : public CTestStepUnitMMFVidClient,
+ public MMdaAudioOutputStreamCallback,
+ public MVideoPlayerUtilityObserver
+ {
+ enum TEvents
+ {
+ EAudioOpenComplete,
+ EAudioPlayComplete,
+ EVideoOpenComplete,
+ EVideoPrepareComplete,
+ EVideoFrameReady,
+ EVideoPlayComplete
+ };
+public:
+ static CTestStepVideoInterruptionByAudio* NewL();
+ virtual TVerdict DoTestStepPreambleL();
+ virtual TVerdict DoTestStepPostambleL();
+ TVerdict DoTestStepL();
+ void Tester(TEvents aEvent, TInt aError);
+
+ //MMdaAudioOutputStreamCallback
+ virtual void MaoscOpenComplete(TInt aError);
+ virtual void MaoscBufferCopied(TInt aError, const TDesC8& aBuffer);
+ virtual void MaoscPlayComplete(TInt aError);
+
+ //MVideoPlayerUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame,TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+ void OnTimer();
+ void FailTest();
+protected:
+ CTestStepVideoInterruptionByAudio();
+protected:
+ CMdaAudioOutputStream* iAudStreamA;
+ CVideoPlayerUtility* iPlayer;
+ RBuf8 iBuffer;
+ TBool iVidGotKErrInUse; //if video got KErrInUse in MvpuoPlayComplete()
+ TTime iPlayStartTime;
+ TTime iPlayEndTime;
+ TTimeIntervalMicroSeconds iPlayTime;
+ class CTestTimer : public CTimer
+ {
+ public:
+ static CTestTimer* NewL(CTestStepVideoInterruptionByAudio& aTestStep)
+ {
+ CTestTimer* self = new(ELeave)CTestTimer(aTestStep);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop();
+ return self;
+ }
+ CTestTimer(CTestStepVideoInterruptionByAudio& aTestStep):CTimer(EPriorityLow),iContainer(aTestStep)
+ {
+ CActiveScheduler::Add(this);
+ }
+ protected:
+ void RunL()
+ {
+ iContainer.OnTimer();
+ }
+ private:
+ CTestStepVideoInterruptionByAudio& iContainer;
+ };
+ CTestTimer* iTestTimer;
+ };
+/**
+ * Observer class to identify and pass events to the test step class
+ *
+ * @class MTestArnCallback
+ *
+ */
+class CTestGenericArnCallback;
+class MTestArnCallback
+ {
+public:
+ virtual void MarncResourceAvailableTest(TUid aNotificationEventId, const TDesC8& aNotificationData, CTestGenericArnCallback & aGenericArnCallback) = 0;
+ };
+
+/**
+ * Support class to identify, which client has obtained ARN - when multiple clients have registered for ARN
+ *
+ * @class CTestGenericArnCallback
+ *
+ */
+class CTestGenericArnCallback : public CBase, public MMMFAudioResourceNotificationCallback
+ {
+public:
+ static CTestGenericArnCallback* NewL(MTestArnCallback& aCallback);
+ //MMMFAudioResourceNotificationCallback
+ virtual void MarncResourceAvailable(TUid aNotificationEventId, const TDesC8& aNotificationData);
+protected:
+ CTestGenericArnCallback(MTestArnCallback& aCallback);
+private :
+ MTestArnCallback& iCallback;
+ };
+
+class CTestGenericAosCallback;
+class MTestAosCallback
+ {
+public:
+ virtual void MaoscOpenCompleteTest(TInt aError,CTestGenericAosCallback& aGenericAosCallback) = 0;
+ virtual void MaoscBufferCopiedTest(TInt aError, const TDesC8& aBuffer,CTestGenericAosCallback& aGenericAosCallback) = 0;
+ virtual void MaoscPlayCompleteTest(TInt aError,CTestGenericAosCallback& aGenericAosCallback) = 0;
+ };
+
+class CTestGenericAosCallback : public MMdaAudioOutputStreamCallback
+ {
+public:
+ static CTestGenericAosCallback* NewL(MTestAosCallback& aCallback);
+ //MMdaAudioOutputStreamCallback
+ virtual void MaoscOpenComplete(TInt aError);
+ virtual void MaoscBufferCopied(TInt aError, const TDesC8& aBuffer);
+ virtual void MaoscPlayComplete(TInt aError);
+protected:
+ CTestGenericAosCallback(MTestAosCallback& aCallback);
+private:
+ MTestAosCallback& iCallback;
+ };
+
+/**
+ * Check audio resource notification ARN functionality
+ *
+ * @lib "TSU_MMF_VCLNT_01.lib"
+ *
+ */
+class CTestStepVidPlayerARN : public CTestStep,
+ public MVideoPlayerUtilityObserver,
+ public MTestArnCallback,
+ public MTestAosCallback
+ {
+public:
+ enum TClient //enumeration of clients
+ {
+ ETestStep,//represents test step
+ EAudioStreamA, //audio stream A (low priority)
+ EAudioStreamB, //audio stream B (high priority)
+ EVideo //video player
+ };
+
+ enum TTestEvent //enumeration of events
+ {
+ ETestStart,
+ EAudioOpenComplete,
+ EAudioBufferCopied,
+ EAudioPlayComplete,
+ EArnAvailable, //audio resource available
+ EVideoOpenComplete,
+ EVideoPrepareComplete,
+ EVideoFrameReady,
+ EVideoPlayComplete,
+ };
+ /*
+ * Represents a transition set. This contains Client, event and error.
+ */
+ class CTransitionInput: public CBase
+ {
+ public:
+ CTransitionInput():iMatched(EFalse),iIgnoreError(EFalse)
+ {
+ }
+ CTransitionInput(TClient aClient, TTestEvent aEvent, TInt aError):
+ iClient(aClient), iEvent(aEvent), iError(aError)
+ {
+ }
+ void SetData(TClient aClient, TTestEvent aEvent, TInt aError)
+ {
+ iClient = aClient;
+ iEvent = aEvent;
+ iError = aError;
+ }
+
+ TClient iClient;
+ TTestEvent iEvent;
+ TInt iError;
+
+ TBool iMatched; //whether match is donne for client, event, error.
+ TBool iIgnoreError;
+ };
+
+public:
+ ~CTestStepVidPlayerARN();
+ virtual TVerdict DoTestStepPreambleL();
+ virtual TVerdict DoTestStepPostambleL();
+
+ //MVideoPlayerUtilityObserver
+ virtual void MvpuoOpenComplete(TInt aError);
+ virtual void MvpuoPrepareComplete(TInt aError);
+ virtual void MvpuoFrameReady(CFbsBitmap& aFrame,TInt aError);
+ virtual void MvpuoPlayComplete(TInt aError);
+ virtual void MvpuoEvent(const TMMFEvent& aEvent);
+
+ //MTestArnCallback
+ virtual void MarncResourceAvailableTest(TUid aNotificationEventId, const TDesC8& aNotificationData, CTestGenericArnCallback & aGenericArnCallback) = 0;
+
+ //MTestAosCallback
+ virtual void MaoscOpenCompleteTest(TInt aError,CTestGenericAosCallback& aGenericAosCallback);
+ virtual void MaoscBufferCopiedTest(TInt aError, const TDesC8& aBuffer,CTestGenericAosCallback& aGenericAosCallback);
+ virtual void MaoscPlayCompleteTest(TInt aError,CTestGenericAosCallback& aGenericAosCallback);
+
+ virtual void EndTest() = 0;
+ void FailTest();
+
+ virtual TBool JumpStateIfRequired(TClient aClient, TTestEvent aEvent, TInt aError,TInt& aState) = 0;
+ virtual TBool NextState(TInt& aState) = 0;
+ virtual TInt AnalyseInput(TClient aClient, TTestEvent aEvent, TInt aError); //-1 endtest; 0 continue in current state; 1 new state
+ virtual void OnStateEntry() = 0; //on entering new state
+ virtual void Fsm(TClient aClient, TTestEvent aEvent, TInt aError);
+protected:
+ CTestStepVidPlayerARN();
+ void InitWservL();
+ void DeInitWserv();
+
+protected:
+ RBuf8 iBuffer;
+ CMdaAudioOutputStream* iAudStreamA;
+ CMdaAudioOutputStream* iAudStreamB;
+ CVideoPlayerUtility* iPlayer;
+ TPtrC iFileName;
+ CTestGenericArnCallback* iAudClientAArnCallback; //ARN callback for audio clientA
+ CTestGenericArnCallback* iAudClientBArnCallback; //ARN callback for audio clientB
+ CTestGenericArnCallback* iVidClientArnCallback; //ARN callback for video client
+
+ CTestGenericAosCallback* iAudStreamACallback; //Audio output stream callback for - audio stream A
+ CTestGenericAosCallback* iAudStreamBCallback; //Audio output stream callback for - audio stream B
+
+ class CTestTimer : public CTimer
+ {
+ public:
+ static CTestTimer* NewL(CTestStepVidPlayerARN& aTestStepVidPlayer)
+ {
+ CTestTimer* self = new(ELeave)CTestTimer(aTestStepVidPlayer);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop();
+ return self;
+ }
+ CTestTimer(CTestStepVidPlayerARN& aTestStepVidPlayer):CTimer(EPriorityStandard),iContainer(aTestStepVidPlayer)
+ {
+ CActiveScheduler::Add(this);
+ }
+ protected:
+ void RunL()
+ {
+ iContainer.EndTest();
+ }
+ private:
+ CTestStepVidPlayerARN& iContainer;
+ };
+ CTestTimer* iTestTimer;
+ CActiveScheduler* iActiveScheduler;
+ CWsScreenDevice* iScreen;
+ RWindow* iWindow;
+ RWsSession iWs;
+ RWindowGroup iRootWindow;
+
+ TFixedArray ipTransitionSet; //for maximum 15 states
+ TFixedArray iExpInputCnt; //expected input events count
+ TFixedArray