Skip to content
Snippets Groups Projects
Commit fdcb3545 authored by scherkus@chromium.org's avatar scherkus@chromium.org
Browse files

Convert /third_party/ffmpeg to gyp for Windows builds. 

To smooth out the transition I left in using_ffmpeg.vsprops until the rest of Windows switches over to gyp.  I also took the opportunity to ditch the .bat file in favour of python.

Review URL: http://codereview.chromium.org/63054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13270 0039d316-1c4b-4281-b951-d872f2087c98
parent bbccf694
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build/all.gyp
+ 1
− 0
View file @ fdcb3545
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
'../skia/skia.gyp:*', '../skia/skia.gyp:*',
'../testing/gtest.gyp:*', '../testing/gtest.gyp:*',
'../third_party/bzip2/bzip2.gyp:*', '../third_party/bzip2/bzip2.gyp:*',
'../third_party/ffmpeg/ffmpeg.gyp:*',
'../third_party/icu38/icu38.gyp:*', '../third_party/icu38/icu38.gyp:*',
'../third_party/libjpeg/libjpeg.gyp:*', '../third_party/libjpeg/libjpeg.gyp:*',
'../third_party/libpng/libpng.gyp:*', '../third_party/libpng/libpng.gyp:*',
......
media/media.gyp
+ 2
− 14
View file @ fdcb3545
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
], ],
'include_dirs': [ 'include_dirs': [
'..', '..',
...@@ -87,13 +88,9 @@ ...@@ -87,13 +88,9 @@
'filters/video_renderer_base.cc', 'filters/video_renderer_base.cc',
'filters/video_renderer_base.h', 'filters/video_renderer_base.h',
], ],
'include_dirs': [
'../third_party/ffmpeg/include',
],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
'..', '..',
'../third_party/ffmpeg/include',
], ],
}, },
'conditions': [ 'conditions': [
...@@ -117,16 +114,6 @@ ...@@ -117,16 +114,6 @@
'filters/ffmpeg_video_decoder.cc', 'filters/ffmpeg_video_decoder.cc',
], ],
}], }],
['OS =="win"', {
'include_dirs': [
'../third_party/ffmpeg/include/win',
],
'direct_dependent_settings': {
'include_dirs': [
'../third_party/ffmpeg/include/win',
],
},
}],
], ],
}, },
{ {
...@@ -184,6 +171,7 @@ ...@@ -184,6 +171,7 @@
'dependencies': [ 'dependencies': [
'media', 'media',
'../base/base.gyp:base', '../base/base.gyp:base',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
], ],
'sources': [ 'sources': [
'player/player.cc', 'player/player.cc',
......
third_party/ffmpeg/ffmpeg.gyp 0 → 100755
+ 100
− 0
View file @ fdcb3545
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables': {
'chromium_code': 1,
},
'includes': [
'../../build/common.gypi',
],
'target_defaults': {
'conditions': [
['OS!="linux"', {'sources/': [['exclude', '/linux/']]}],
['OS!="mac"', {'sources/': [['exclude', '/mac/']]}],
['OS!="win"', {'sources/': [['exclude', '/win/']]}],
],
},
'targets': [
{
'target_name': 'ffmpeg',
'type': 'none',
'msvs_guid': 'D7A94F58-576A-45D9-A45F-EB87C63ABBB0',
'sources': [
'include/libavcodec/avcodec.h',
'include/libavcodec/opt.h',
'include/libavcodec/vdpau.h',
'include/libavcodec/xvmc.h',
'include/libavdevice/avdevice.h',
'include/libavformat/avformat.h',
'include/libavformat/avio.h',
'include/libavutil/adler32.h',
'include/libavutil/avstring.h',
'include/libavutil/avutil.h',
'include/libavutil/base64.h',
'include/libavutil/common.h',
'include/libavutil/crc.h',
'include/libavutil/fifo.h',
'include/libavutil/intfloat_readwrite.h',
'include/libavutil/log.h',
'include/libavutil/lzo.h',
'include/libavutil/mathematics.h',
'include/libavutil/md5.h',
'include/libavutil/mem.h',
'include/libavutil/pixfmt.h',
'include/libavutil/rational.h',
'include/libavutil/sha1.h',
'include/win/inttypes.h',
'include/win/stdint.h',
],
'direct_dependent_settings': {
'include_dirs': [
'include',
],
},
'conditions': [
['OS=="win"', {
'sources': [
'avcodec-52.def',
'avformat-52.def',
'avutil-50.def',
],
'direct_dependent_settings': {
'include_dirs': [
'include/win',
],
'link_settings': {
'libraries': [
'<(PRODUCT_DIR)/lib/avcodec-52.lib',
'<(PRODUCT_DIR)/lib/avformat-52.lib',
'<(PRODUCT_DIR)/lib/avutil-50.lib',
],
},
},
'rules': [
{
'rule_name': 'generate_libs',
'extension': 'def',
'inputs': [
'generate_libs.py',
],
'outputs': [
'<(PRODUCT_DIR)/lib/<(RULE_INPUT_ROOT).lib',
],
'variables': {
'def_files': [
'avcodec-52.def',
'avformat-52.def',
'avutil-50.def',
],
},
'action': ['python', '<@(_inputs)', '-o', '<(PRODUCT_DIR)/lib', '<@(RULE_INPUT_PATH)'],
'message': 'Generating import libraries',
},
],
}],
],
},
],
}
third_party/ffmpeg/ffmpeg.vcproj deleted 100644 → 0
+ 0
− 196
View file @ bbccf694
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="ffmpeg"
ProjectGUID="{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}"
RootNamespace="ffmpeg"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath="generate_libs.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="include"
>
<Filter
Name="libavcodec"
>
<File
RelativePath=".\include\libavcodec\avcodec.h"
>
</File>
<File
RelativePath=".\include\libavcodec\opt.h"
>
</File>
<File
RelativePath=".\include\libavcodec\vdpau.h"
>
</File>
</Filter>
<Filter
Name="libavformat"
>
<File
RelativePath=".\include\libavformat\avformat.h"
>
</File>
<File
RelativePath=".\include\libavformat\avio.h"
>
</File>
<File
RelativePath=".\include\libavformat\rtsp.h"
>
</File>
<File
RelativePath=".\include\libavformat\rtspcodes.h"
>
</File>
</Filter>
<Filter
Name="libavdevice"
>
<File
RelativePath=".\include\libavdevice\avdevice.h"
>
</File>
</Filter>
<Filter
Name="libavutil"
>
<File
RelativePath=".\include\libavutil\adler32.h"
>
</File>
<File
RelativePath=".\include\libavutil\avstring.h"
>
</File>
<File
RelativePath=".\include\libavutil\avutil.h"
>
</File>
<File
RelativePath=".\include\libavutil\base64.h"
>
</File>
<File
RelativePath=".\include\libavutil\common.h"
>
</File>
<File
RelativePath=".\include\libavutil\crc.h"
>
</File>
<File
RelativePath=".\include\libavutil\fifo.h"
>
</File>
<File
RelativePath=".\include\libavutil\intfloat_readwrite.h"
>
</File>
<File
RelativePath=".\include\libavutil\log.h"
>
</File>
<File
RelativePath=".\include\libavutil\lzo.h"
>
</File>
<File
RelativePath=".\include\libavutil\mathematics.h"
>
</File>
<File
RelativePath=".\include\libavutil\md5.h"
>
</File>
<File
RelativePath=".\include\libavutil\mem.h"
>
</File>
<File
RelativePath=".\include\libavutil\random.h"
>
</File>
<File
RelativePath=".\include\libavutil\rational.h"
>
</File>
<File
RelativePath=".\include\libavutil\sha1.h"
>
</File>
</Filter>
</Filter>
<File
RelativePath=".\avcodec-52.def"
>
</File>
<File
RelativePath=".\avformat-52.def"
>
</File>
<File
RelativePath=".\avutil-50.def"
>
</File>
<File
RelativePath=".\generate_libs.bat"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
third_party/ffmpeg/generate_libs.bat deleted 100755 → 0
+ 0
− 8
View file @ bbccf694
@echo off
setlocal
set OUTDIR=%1
lib /nologo /machine:X86 /def:avcodec-52.def /out:%OUTDIR%\lib\avcodec-52.lib
lib /nologo /machine:X86 /def:avformat-52.def /out:%OUTDIR%\lib\avformat-52.lib
lib /nologo /machine:X86 /def:avutil-50.def /out:%OUTDIR%\lib\avutil-50.lib
third_party/ffmpeg/generate_libs.py 0 → 100644
+ 36
− 0
View file @ fdcb3545
#!/usr/bin/python
# Generates MSVC import libraries from .def files. Assumes MSVC environment
# has been loaded.
import optparse
import os
import subprocess
def main():
parser = optparse.OptionParser(usage='usage: %prog [options] input')
parser.add_option('-o',
'--output',
dest='output',
default=None,
help=('output location'))
(options, args) = parser.parse_args()
if options.output == None:
parser.error('Output location not specified')
if len(args) == 0:
parser.error('No inputs specified')
# Make sure output directory exists.
if not os.path.exists(options.output):
os.makedirs(options.output)
# Run lib.exe on each input def file.
for input_path in args:
input_name = os.path.basename(input_path)
input_root = os.path.splitext(input_name)[0]
output_path = os.path.join(options.output, input_root + '.lib')
subprocess.call(['lib', '/nologo', '/machine:X86', '/def:' + input_path,
'/out:' + output_path])
if __name__ == '__main__':
main()
third_party/ffmpeg/generate_libs.rules deleted 100644 → 0
+ 0
− 18
View file @ bbccf694
<?xml version="1.0" encoding="utf-8"?>
<VisualStudioToolFile
Name="Generate FFmpeg import libraries"
Version="8.00"
>
<Rules>
<CustomBuildRule
Name="Generate FFmpeg import libraries"
CommandLine="generate_libs.bat $(OutDir)"
Outputs="$(OutDir)\lib\avcodec-52.lib"
FileExtensions="*.def"
ExecutionDescription="Generating FFmpeg import libraries..."
>
<Properties>
</Properties>
</CustomBuildRule>
</Rules>
</VisualStudioToolFile>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment