andrew's patch

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11904 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 341 insertions, 317 deletions

diff --git a/media/build/media.vcproj b/media/build/media.vcproj
index 2913d35..37d33d7 100644
--- a/media/build/media.vcproj
+++ b/media/build/media.vcproj
@@ -1,307 +1,331 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="media"
-	ProjectGUID="{6AE76406-B03B-11DD-94B1-80B556D89593}"
-	RootNamespace="media"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="base"
-			>
-			<File
-				RelativePath="..\base\buffers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\data_buffer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\base\data_buffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\factory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\filter_host.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\filter_host_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\base\filter_host_impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\filters.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\media_format.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\base\media_format.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\pipeline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\pipeline_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\base\pipeline_impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\synchronizer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\base\synchronizer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\video_frame_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\base\video_frame_impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\base\yuv_convert.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\base\yuv_convert.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="filters"
-			>
-			<File
-				RelativePath="..\filters\audio_renderer_base.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\audio_renderer_base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\audio_renderer_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\audio_renderer_impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\ffmpeg_common.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\ffmpeg_common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\ffmpeg_demuxer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\ffmpeg_demuxer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\ffmpeg_glue.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\ffmpeg_glue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\file_data_source.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\file_data_source.h"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\null_audio_renderer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\null_audio_renderer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\video_renderer_base.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\filters\video_renderer_base.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="audio"
-			>
-			<File
-				RelativePath="..\audio\win\audio_manager_win.h"
-				>
-			</File>
-			<File
-				RelativePath="..\audio\audio_output.h"
-				>
-			</File>
-			<File
-				RelativePath="..\audio\win\audio_output_win.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\audio\simple_sources.h"
-				>
-			</File>
-			<File
-				RelativePath="..\audio\win\simple_sources_win.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\audio\win\waveout_output_win.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\audio\win\waveout_output_win.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="media"

+	ProjectGUID="{6AE76406-B03B-11DD-94B1-80B556D89593}"

+	RootNamespace="media"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\coreavc_demo_sdk_20090202\using_coreavc.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\coreavc_demo_sdk_20090202\using_coreavc.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="base"

+			>

+			<File

+				RelativePath="..\base\buffers.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\data_buffer.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\base\data_buffer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\factory.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\filter_host.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\filter_host_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\base\filter_host_impl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\filters.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\media_format.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\base\media_format.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\pipeline.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\pipeline_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\base\pipeline_impl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\synchronizer.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\base\synchronizer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\base\yuv_convert.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\base\yuv_convert.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="filters"

+			>

+			<File

+				RelativePath="..\filters\audio_renderer_base.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\audio_renderer_base.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\audio_renderer_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\audio_renderer_impl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\coreavc_decoder.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\coreavc_decoder.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_audio.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_audio.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_common.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_common.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_decoder_base.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_decoder_base.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_demuxer.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_demuxer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_glue.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_glue.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_video.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\ffmpeg_video.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\file_data_source.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\file_data_source.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\null_audio_renderer.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\null_audio_renderer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\video_renderer_base.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\filters\video_renderer_base.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="audio"

+			>

+			<File

+				RelativePath="..\audio\win\audio_manager_win.h"

+				>

+			</File>

+			<File

+				RelativePath="..\audio\audio_output.h"

+				>

+			</File>

+			<File

+				RelativePath="..\audio\win\audio_output_win.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\audio\simple_sources.h"

+				>

+			</File>

+			<File

+				RelativePath="..\audio\win\simple_sources_win.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\audio\win\waveout_output_win.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\audio\win\waveout_output_win.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/media/build/media_player.vcproj b/media/build/media_player.vcproj
index e0a19c62..e0d5e14 100644
--- a/media/build/media_player.vcproj
+++ b/media/build/media_player.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\coreavc_demo_sdk_20090202\using_coreavc.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\SDL\using_sdl.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -78,7 +78,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\coreavc_demo_sdk_20090202\using_coreavc.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\SDL\using_sdl.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -146,6 +146,14 @@
 				RelativePath="..\player\player.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\player\sdl_renderer.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\player\sdl_renderer.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/media/build/media_unittests.vcproj b/media/build/media_unittests.vcproj
index e8210c9..4e18337 100644
--- a/media/build/media_unittests.vcproj
+++ b/media/build/media_unittests.vcproj
@@ -176,10 +176,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\base\video_frame_impl_unittest.cc"
-					>
-				</File>
-				<File
 					RelativePath="..\base\yuv_convert_unittest.cc"
 					>
 				</File>
@@ -208,10 +204,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\filters\test_video_decoder.h"
-					>
-				</File>
-				<File
 					RelativePath="..\filters\test_video_renderer.h"
 					>
 				</File>