--- a/build.config.xml Fri Sep 17 08:27:08 2010 +0300
+++ b/build.config.xml Thu Oct 14 10:22:53 2010 +0100
@@ -32,5 +32,14 @@
</component>
</module>
</layer>
+
+ <layer name="test_ncp_layer">
+ <module name="openmaxil.nokia">
+ <component name="omxilcomp">
+ <unit unitID="omxilcomp.omxiltestcomp_test" name="OpenMAX IL Test Components" mrp="" bldFile="&layer_real_source_path;/omxilcomp/omxiltestcomp/group"/>
+ </component>
+ </module>
+ </layer>
+
</systemModel>
</SystemDefinition>
--- a/omxilcomp/omxilgeneric/filesink/group/bld.inf Fri Sep 17 08:27:08 2010 +0300
+++ b/omxilcomp/omxilgeneric/filesink/group/bld.inf Thu Oct 14 10:22:53 2010 +0100
@@ -47,5 +47,7 @@
../tests/unit/te_omx_filesink_video.xml /epoc32/winscw/c/omxil/tef/te_omx_filesink_video.xml
../tests/unit/te_omx_filesink_video_compatibility.script /epoc32/winscw/c/omxil/tef/te_omx_filesink_video_compatibility.script
../tests/unit/te_omx_filesink_video_compatibility.xml /epoc32/winscw/c/omxil/tef/te_omx_filesink_video_compatibility.xml
+../tests/unit/te_omx_filesink_graphic.script /epoc32/winscw/c/omxil/tef/te_omx_filesink_graphic.script
+../tests/unit/te_omx_filesink_graphic.xml /epoc32/winscw/c/omxil/tef/te_omx_filesink_graphic.xml
#endif
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/omxilcomp/omxilgeneric/filesink/tests/unit/te_omx_filesink_graphic.script Thu Oct 14 10:22:53 2010 +0100
@@ -0,0 +1,31 @@
+//
+// 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:
+//
+
+
+
+LOAD_SUITE te_xmlomxclient
+
+START_TESTCASE MM-GRAPHIC-OMX-FILESINK-001-HP
+ START_TEST_BLOCK 30 te_xmlomxclient c:\omxil\tef\te_omx_filesink.ini
+ CREATE_OBJECT OmxXmlTestWrapper InstanceName
+ COMMAND InstanceName New c:\omxil\tef\te_omx_filesink_graphic.xml
+ COMMAND InstanceName RunTest ChangeEncodeType_filesink
+ COMMAND InstanceName RunTest ChangeVideoPortFormat_filesink
+ COMMAND InstanceName RunTest GetExtensionIndex_filesink
+ END_TEST_BLOCK
+END_TESTCASE MM-GRAPHIC-OMX-FILESINK-001-HP
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/omxilcomp/omxilgeneric/filesink/tests/unit/te_omx_filesink_graphic.xml Thu Oct 14 10:22:53 2010 +0100
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) NOKIA 2010. All rights reserved.
+ file Source Sink Video tests for OpenMAX IL.
+
+
+ Expected Result:
+ ChangeEncodeType_filesink Pass
+ ChangeVideoPortFormat_filesink Pass
+ GetExtensionIndex_filesink Pass
+
+ Objective: The following tests are mainly to to improve CTC coverage in COmxILVideoPort
+-->
+
+<TestSet>
+ <Test name="ChangeEncodeType_filesink">
+ <!-- expected result :Pass -->
+ <LoadComponent comp="filesink" name="OMX.SYMBIAN.VIDEO.GRAPHICSINK" />
+ <!--Pass-->
+ <SetVideoPortDef port="filesink:0" codingType="unused" />
+ <IgnoreEvent comp="filesink" event="Error" nData1="0x8000100A" nData2="0" nData3="0"/>
+ <AllTransition state="Invalid" />
+ <EnablePort port="filesink:0" expectedomxerr="OMX_ErrorInvalidState"/>
+ <DisablePort port="filesink:0" expectedomxerr="OMX_ErrorInvalidState"/>
+ </Test>
+
+ <Test name="ChangeVideoPortFormat_filesink">
+ <!-- expected result :Pass -->
+ <LoadComponent comp="filesink" name="OMX.SYMBIAN.VIDEO.GRAPHICSINK" />
+ <!--Pass-->
+ <SetVideoPortFormat port="filesink:0" colorFormat="CbYCrY" codingType="unused" framerate="0" />
+ <IgnoreEvent comp="filesink" event="Error" nData1="0x8000100A" nData2="0" nData3="0"/>
+ <AllTransition state="Invalid" />
+ <SetVideoPortFormat port="filesink:0" colorFormat="CbYCrY" codingType="unused" framerate="0" expectedomxerr="OMX_ErrorInvalidState" />
+ <CheckState comp="filesink" state="Invalid" />
+ <CheckCommonScale port="filesink:0" width="0" height="0" expectedomxerr="OMX_ErrorInvalidState"/>
+ <SetCommonScale port="filesink:0" width="0" height="0" expectedomxerr="OMX_ErrorInvalidState"/>
+ </Test>
+
+ <Test name="GetExtensionIndex_filesink">
+ <!-- expected result :Pass -->
+ <LoadComponent comp="filesink" name="OMX.SYMBIAN.VIDEO.GRAPHICSINK" />
+ <!--Pass-->
+ <GetExtensionIndex comp="filesink" parametername="OMX.Symbian.Index.Config.Sharedchunkmetadata" expectedomxerr="OMX_ErrorNone"/>
+ <IgnoreEvent comp="filesink" event="Error" nData1="0x8000100A" nData2="0" nData3="0"/>
+ <AllTransition state="Invalid" />
+ <GetExtensionIndex comp="filesink" parametername="OMX.Symbian.Index.Config.Sharedchunkmetadata" expectedomxerr="OMX_ErrorInvalidState"/>
+ <FlushBuffer port="filesink:0" expectedomxerr="OMX_ErrorInvalidState" />
+ <EnablePort port="filesink:0" expectedomxerr="OMX_ErrorInvalidState"/>
+ </Test>
+</TestSet>
+
+
+
--- a/omxilcomp/omxilgeneric/filesink/tests/unit/te_omx_filesink_video.script Fri Sep 17 08:27:08 2010 +0300
+++ b/omxilcomp/omxilgeneric/filesink/tests/unit/te_omx_filesink_video.script Thu Oct 14 10:22:53 2010 +0100
@@ -28,6 +28,7 @@
COMMAND InstanceName RunTest ChangeEncodeType_filesink
COMMAND InstanceName RunTest ChangeInvalidEncodeType_filesink
COMMAND InstanceName RunTest BasicOperation_nofilename_filesink
+ COMMAND InstanceName RunTest CTC_coverage_filesink
END_TEST_BLOCK
END_TESTCASE MM-VIDEO-OMX-FILESINK-001-HP
--- a/omxilcomp/omxilgeneric/filesink/tests/unit/te_omx_filesink_video.xml Fri Sep 17 08:27:08 2010 +0300
+++ b/omxilcomp/omxilgeneric/filesink/tests/unit/te_omx_filesink_video.xml Thu Oct 14 10:22:53 2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
- Copyright (c) NOKIA 2009. All rights reserved.
+ Copyright (c) NOKIA 2010. All rights reserved.
file Source Sink Video tests for OpenMAX IL.
@@ -105,7 +105,50 @@
<AllTransition state="loaded" order="auto"/>
</Test>
-
+
+ <Test name="CTC_coverage_filesink">
+ <!-- Simple file read\write testcase: all comps. to IDLE then to EXECUTING then 3 secs later to IDLE
+ -->
+ <LoadComponent comp="filesink" name="OMX.NOKIA.VIDEO.FILESINK" />
+ <LoadComponent comp="filesource" name="OMX.NOKIA.VIDEO.FILESOURCE" />
+
+ <SetupTunnel output="filesource:0" input="filesink:0" />
+ <BufferSupplierOverride output="filesource:0" input="filesink:0" supplier="output" />
+
+ <SetFilename comp="filesink" filename="C:\omxil\data\aac_same_video.stream" />
+
+ <SetFilename comp="filesource" filename="C:\omxil\data\aac.stream" />
+ <GetFilename comp="filesink" filename="C:\omxil\data\aab_same_video.stream"/>
+
+ <IgnoreEvent comp="filesink" event="PortSettingsChanged" nData1="0x02000001" nData2="0" nData3="0"/>
+ <IgnoreEvent comp="filesource" event="PortSettingsChanged" nData1="0x02000001" nData2="0" nData3="0"/>
+
+ <IgnoreEvent comp="filesink" event="OMX_EventBufferFlag" nData1="0x00000000 " nData2="0x00000001" nData3="0"/>
+ <IgnoreEvent comp="filesource" event="OMX_EventBufferFlag" nData1="0x00000000 " nData2="0x00000001" nData3="0"/>
+ <AllTransition state="idle" order="auto"/>
+ <FlushBuffer port="filesink:0" expectedomxerr="OMX_ErrorNone" />
+ <ExpectEvent comp="filesink" event="CmdComplete" nData1="0x00000001" nData2="0" />
+ <AllTransition state="executing" order="auto" />
+ <AllTransition state="pause" order="auto"/>
+ <SetVideoPortDef port="filesink:0" codingType="mpeg4" expectedomxerr="OMX_ErrorIncorrectStateOperation"/>
+ <EnablePort port="filesink:0" />
+ <ExpectEvent comp="filesink" event="CmdComplete" nData1="0x00000003" nData2="0" />
+ <Wait delaytime="3000000" />
+ <SetupTunnel output="filesource:0" input="filesink:0" expectedomxerr="OMX_ErrorIncorrectStateOperation"/>
+ <AllTransition state="idle" order="auto"/>
+ <SetupTunnel output="filesource:0" input="filesink:0" expectedomxerr="OMX_ErrorIncorrectStateOperation"/>
+ <AllTransition state="loaded" order="auto"/>
+ <AllTransition state="WaitForResources" />
+ <SetFilename comp="filesink" filename="C:\omxil\data\aac_same_video.stream" />
+ <SetupTunnel output="filesource:0" input="filesink:0" expectedomxerr="OMX_ErrorIncorrectStateOperation"/>
+ <EnablePort port="filesink:0" />
+ <ExpectEvent comp="filesink" event="CmdComplete" nData1="0x00000003" nData2="0" />
+ <IgnoreEvent comp="filesink" event="Error" nData1="0x8000100A" nData2="0" nData3="0"/>
+ <IgnoreEvent comp="filesource" event="Error" nData1="0x8000100A" nData2="0" nData3="0"/>
+ <AllTransition state="Invalid" />
+ <SetupTunnel output="filesource:0" input="filesink:0" expectedomxerr="OMX_ErrorInvalidState"/>
+ </Test>
+
</TestSet>
--- a/omxilcomp/omxilgeneric/filesource/tests/unit/te_omx_filesource_audio.xml Fri Sep 17 08:27:08 2010 +0300
+++ b/omxilcomp/omxilgeneric/filesource/tests/unit/te_omx_filesource_audio.xml Thu Oct 14 10:22:53 2010 +0100
@@ -48,7 +48,7 @@
<Test name="GetFilenameNoFileSet_filesource">
<LoadComponent comp="filesource" name="OMX.NOKIA.AUDIO.FILESOURCE" />
- <!--OMX_ErrorNotReady-->
+ <!--OMX_ErrorNotReady-->
<ExpectEvent comp="filesource" event="Error" nData1="0x80001010" nData2="0"/>
<GetFilename comp="filesource" filename="C:\omxil\data\aab.stream" expectedomxerr="OMX_ErrorNotReady"/>
</Test>
--- a/omxilcomp/omxiltestcomp/md5sink/src/omxiltestmd5sink.cpp Fri Sep 17 08:27:08 2010 +0300
+++ b/omxilcomp/omxiltestcomp/md5sink/src/omxiltestmd5sink.cpp Thu Oct 14 10:22:53 2010 +0100
@@ -81,7 +81,7 @@
COmxILComponent::ConstructL(hComponent);
// STEP 2: Create the call backs holder...
- MOmxILCallbackNotificationIf* callbackNotificationIf=CreateCallbackManagerL(COmxILComponent::EOutofContext);
+ MOmxILCallbackNotificationIf* callbackNotificationIf=CreateCallbackManagerL(COmxILComponent::EInContext);
// STEP 3: Create the MD5 sink-specific Processing Function...
COmxILTestMD5SinkProcessingFunction* pProcessingFunction = COmxILTestMD5SinkProcessingFunction::NewL(*callbackNotificationIf);
--- a/omxilcomp/omxiltestcomp/md5sink/src/omxiltestmd5sinkconst.h Fri Sep 17 08:27:08 2010 +0300
+++ b/omxilcomp/omxiltestcomp/md5sink/src/omxiltestmd5sinkconst.h Thu Oct 14 10:22:53 2010 +0100
@@ -20,6 +20,6 @@
const OMX_U32 KMD5SINK_OPB0PORT_INDEX = 0;
const OMX_U32 KMinBuffers = 1;
-const OMX_U32 KMinBufferSize = 1;
+const OMX_U32 KMinBufferSize = 1500;
#endif /* OMXILTESTMD5SINKCONST_H_ */