diff -r 0f19bbf75c06 -r 78ccc60a13b1 common/tools/ats/bctest/multimedia/multimediatest.xml
--- a/common/tools/ats/bctest/multimedia/multimediatest.xml	Sat Oct 03 21:54:15 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediatest.xml	Wed Oct 07 11:09:46 2009 +0100
@@ -815,330 +815,12 @@
 						</params>
 					</step>
 				</case>
-				<case id="" name="T_VideoPlayerUtility" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="t_videoplayerutility.exe"/>
-							<param dst="c:\sys\bin\t_videoplayerutility.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidencoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xvidencoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xviddecoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xviddecoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidencoderdevice.dll"/>
-							<param dst="c:\sys\bin\xvidencoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xviddecoderdevice.dll"/>
-							<param dst="c:\sys\bin\xviddecoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidhwdeviceplugins.rsc"/>
-							<param dst="z:\resource\plugins\xvidhwdeviceplugins.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidhwdeviceplugins.dll"/>
-							<param dst="c:\sys\bin\xvidhwdeviceplugins.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkserver.exe"/>
-							<param dst="c:\sys\bin\testframeworkserver.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkclient.dll"/>
-							<param dst="c:\sys\bin\testframeworkclient.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.tcs"/>
-							<param dst="c:\multimedia\t_multimedia.tcs"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.ini"/>
-							<param dst="c:\multimedia\t_multimedia.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 2 (location)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia_location.ini"/>
-							<param dst="c:\multimedia\t_multimedia_location.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_videoplayerutility/*"/>
-							<param dst="c:\multimedia\t_videoplayerutility\"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-plyr-publicapi.script"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-plyr-publicapi.script"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-plyr-publicapi.ini"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-plyr-publicapi.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 4 (execute)" harness="GENERIC" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="\multimedia\mm-mmf-vclnt-plyr-publicapi.script -tcs \multimedia\t_multimedia.tcs"/>
-							<param result-file="c:\logs\testexecute\mm-mmf-vclnt-plyr-publicapi.htm"/>
-							<param parser="TEFTestResultParser"/>
-							<param timeout="1000"/>
-						</params>
-					</step>
-				</case>
-				<case id="" name="T_VideoRecorderUtility" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="t_videorecorderutility.exe"/>
-							<param dst="c:\sys\bin\t_videorecorderutility.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/ecamtestplugin.rsc"/>
-							<param dst="z:\resource\plugins\ecamtestplugin.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="ecamtestplugin.dll"/>
-							<param dst="c:\sys\bin\ecamtestplugin.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="102070CC.txt"/>
-							<param dst="c:\102070CC.txt"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidencoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xvidencoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xviddecoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xviddecoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidencoderdevice.dll"/>
-							<param dst="c:\sys\bin\xvidencoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xviddecoderdevice.dll"/>
-							<param dst="c:\sys\bin\xviddecoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidhwdeviceplugins.rsc"/>
-							<param dst="z:\resource\plugins\xvidhwdeviceplugins.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidhwdeviceplugins.dll"/>
-							<param dst="c:\sys\bin\xvidhwdeviceplugins.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkserver.exe"/>
-							<param dst="c:\sys\bin\testframeworkserver.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkclient.dll"/>
-							<param dst="c:\sys\bin\testframeworkclient.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.tcs"/>
-							<param dst="c:\multimedia\t_multimedia.tcs"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.ini"/>
-							<param dst="c:\multimedia\t_multimedia.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 2 (location)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia_location.ini"/>
-							<param dst="c:\multimedia\t_multimedia_location.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-rcrdr-publicapi.script"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-rcrdr-publicapi.script"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-rcrdr-publicapi.ini"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-rcrdr-publicapi.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 4 (execute)" harness="GENERIC" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="\multimedia\mm-mmf-vclnt-rcrdr-publicapi.script -tcs \multimedia\t_multimedia.tcs"/>
-							<param result-file="c:\logs\testexecute\mm-mmf-vclnt-rcrdr-publicapi.htm"/>
-							<param parser="TEFTestResultParser"/>
-							<param timeout="1000"/>
-						</params>
-					</step>
-				</case>
 			</set>
 		</session>
 	</plan>
 	<files>
 		<file>multimediatest/winscw_udeb/z/resource/plugins/ecamtestplugin.rsc</file>
 		<file>multimediatest/winscw_udeb/ecamtestplugin.dll</file>
-		<file>multimediatest/winscw_udeb/z/resource/plugins/xvidencoderdevice.rsc</file>
-		<file>multimediatest/winscw_udeb/z/resource/plugins/xviddecoderdevice.rsc</file>
-		<file>multimediatest/winscw_udeb/xvidencoderdevice.dll</file>
-		<file>multimediatest/winscw_udeb/xviddecoderdevice.dll</file>
-		<file>multimediatest/winscw_udeb/z/resource/plugins/xvidhwdeviceplugins.rsc</file>
-		<file>multimediatest/winscw_udeb/xvidhwdeviceplugins.dll</file>
 		<file>multimediatest/winscw_udeb/testframeworkserver.exe</file>
 		<file>multimediatest/winscw_udeb/testframeworkclient.dll</file>
 		<file>multimediatest/winscw_udeb/z/resource/plugins/ts_miditstcntrl.rsc</file>
@@ -1229,14 +911,7 @@
 		<file>multimediatest/general/multimedia/mm-mmf-midi-publicapi.ini</file>
 		<file>multimediatest/general/multimedia/t_midiclientutility/midi.mid</file>
 		<file>multimediatest/general/multimedia/t_midiclientutility/textmidi.mid</file>
-		<file>multimediatest/general/multimedia/t_midiclientutility/midiclienttest.gm</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-plyr-publicapi.script</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-plyr-publicapi.ini</file>
-		<file>multimediatest/general/multimedia/t_videoplayerutility/alter.mp4</file>
-		<file>multimediatest/general/multimedia/t_videoplayerutility/xvid_clock.avi</file>
-		<file>multimediatest/general/multimedia/t_videoplayerutility/corrupted.avi</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-rcrdr-publicapi.script</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-rcrdr-publicapi.ini</file>
+		<file>multimediatest/general/multimedia/t_midiclientutility/sample.gm</file>
 		<file>multimediatest/winscw_udeb/t_camera.exe</file>
 		<file>multimediatest/winscw_udeb/t_imagedecoder.exe</file>
 		<file>multimediatest/winscw_udeb/t_imageencoder.exe</file>
@@ -1247,7 +922,5 @@
 		<file>multimediatest/winscw_udeb/t_mdaaudiorecorderutility.exe</file>
 		<file>multimediatest/winscw_udeb/t_mdaaudiotoneutility.exe</file>
 		<file>multimediatest/winscw_udeb/t_midiclientutility.exe</file>
-		<file>multimediatest/winscw_udeb/t_videoplayerutility.exe</file>
-		<file>multimediatest/winscw_udeb/t_videorecorderutility.exe</file>
 	</files>
 </test>