Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1713)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ffmpeg/source/ffmpeg_generated.gypi

Issue 7659006: Remove libvpx from FFmpeg in favour of ffvp8. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party
Patch Set: fixes Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ffmpeg/source/ffmpeg.gyp ('k') | ffmpeg/source/ffmpeg_stub_headers.fragment » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ffmpeg/source/ffmpeg_generated.gypi
diff --git a/ffmpeg/source/ffmpeg_generated.gypi b/ffmpeg/source/ffmpeg_generated.gypi
index c101d1ba84c73c6848e68d37dbb98dc81bb77eab..8d4795a5854283601789d7057938f1855ab73977 100644
--- a/ffmpeg/source/ffmpeg_generated.gypi
+++ b/ffmpeg/source/ffmpeg_generated.gypi
@@ -12,16 +12,6 @@
'patched-ffmpeg/libavcodec/arm/h264idct_neon.S',
],
}], # ((target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")
- ['((target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")', {
- 'sources': [
- 'patched-ffmpeg/libavcodec/arm/vp8dsp_neon.S',
- ],
- }], # ((target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")
- ['((target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")', {
- 'sources': [
- 'patched-ffmpeg/libavcodec/arm/h264pred_neon.S',
- ],
- }], # ((target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")
['(target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
'sources': [
'patched-ffmpeg/libavcodec/x86/dct32_sse.asm',
@@ -35,12 +25,6 @@
'patched-ffmpeg/libavcodec/x86/mpegaudiodec_mmx.c',
],
}], # (target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")
- ['(target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")', {
- 'sources': [
- 'patched-ffmpeg/libavcodec/x86/vp8dsp-init.c',
- 'patched-ffmpeg/libavcodec/x86/vp8dsp.asm',
- ],
- }], # (target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")
['(1) and (ffmpeg_branding=="ChromeOS")', {
'sources': [
'patched-ffmpeg/libavcodec/acelp_filters.c',
@@ -65,13 +49,6 @@
'patched-ffmpeg/libavformat/avidec.c',
],
}], # (1) and (ffmpeg_branding=="ChromeOS")
- ['(target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
- 'sources': [
- 'patched-ffmpeg/libavcodec/x86/h264_intrapred.asm',
- 'patched-ffmpeg/libavcodec/x86/h264_intrapred_10bit.asm',
- 'patched-ffmpeg/libavcodec/x86/h264_intrapred_init.c',
- ],
- }], # (target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")
['(target_arch=="arm" or (target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
'sources': [
'patched-ffmpeg/libavcodec/arm/h264dsp_init_arm.c',
@@ -79,12 +56,6 @@
'patched-ffmpeg/libavcodec/arm/mpegaudiodsp_init_arm.c',
],
}], # (target_arch=="arm" or (target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")
- ['(target_arch=="arm" or (target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")', {
- 'sources': [
- 'patched-ffmpeg/libavcodec/arm/vp8_armv6.S',
- 'patched-ffmpeg/libavcodec/arm/vp8dsp_init_arm.c',
- ],
- }], # (target_arch=="arm" or (target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS")
['((target_arch=="arm" and arm_neon==1)) and (1)', {
'sources': [
'patched-ffmpeg/libavcodec/arm/dsputil_init_neon.c',
@@ -92,6 +63,7 @@
'patched-ffmpeg/libavcodec/arm/fft_fixed_neon.S',
'patched-ffmpeg/libavcodec/arm/fft_neon.S',
'patched-ffmpeg/libavcodec/arm/fmtconvert_neon.S',
+ 'patched-ffmpeg/libavcodec/arm/h264pred_neon.S',
'patched-ffmpeg/libavcodec/arm/int_neon.S',
'patched-ffmpeg/libavcodec/arm/mdct_fixed_neon.S',
'patched-ffmpeg/libavcodec/arm/mdct_neon.S',
@@ -99,20 +71,14 @@
'patched-ffmpeg/libavcodec/arm/rdft_neon.S',
'patched-ffmpeg/libavcodec/arm/simple_idct_neon.S',
'patched-ffmpeg/libavcodec/arm/vp3dsp_neon.S',
+ 'patched-ffmpeg/libavcodec/arm/vp8dsp_neon.S',
],
}], # ((target_arch=="arm" and arm_neon==1)) and (1)
- ['(target_arch=="arm" or (target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
- 'sources': [
- 'patched-ffmpeg/libavcodec/arm/h264pred_init_arm.c',
- ],
- }], # (target_arch=="arm" or (target_arch=="arm" and arm_neon==1)) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")
['(target_arch=="ia32" or target_arch=="x64") and (1)', {
'sources': [
'patched-ffmpeg/libavcodec/x86/deinterlace.asm',
'patched-ffmpeg/libavcodec/x86/dsputil_mmx.c',
'patched-ffmpeg/libavcodec/x86/dsputil_yasm.asm',
- 'patched-ffmpeg/libavcodec/x86/dsputilenc_mmx.c',
- 'patched-ffmpeg/libavcodec/x86/dsputilenc_yasm.asm',
'patched-ffmpeg/libavcodec/x86/fdct_mmx.c',
'patched-ffmpeg/libavcodec/x86/fft.c',
'patched-ffmpeg/libavcodec/x86/fft_mmx.asm',
@@ -121,6 +87,9 @@
'patched-ffmpeg/libavcodec/x86/fmtconvert_mmx.c',
'patched-ffmpeg/libavcodec/x86/h264_chromamc.asm',
'patched-ffmpeg/libavcodec/x86/h264_chromamc_10bit.asm',
+ 'patched-ffmpeg/libavcodec/x86/h264_intrapred.asm',
+ 'patched-ffmpeg/libavcodec/x86/h264_intrapred_10bit.asm',
+ 'patched-ffmpeg/libavcodec/x86/h264_intrapred_init.c',
'patched-ffmpeg/libavcodec/x86/h264_qpel_10bit.asm',
'patched-ffmpeg/libavcodec/x86/idct_mmx_xvid.c',
'patched-ffmpeg/libavcodec/x86/idct_sse2_xvid.c',
@@ -128,6 +97,8 @@
'patched-ffmpeg/libavcodec/x86/mpegvideo_mmx.c',
'patched-ffmpeg/libavcodec/x86/simple_idct_mmx.c',
'patched-ffmpeg/libavcodec/x86/vp3dsp.asm',
+ 'patched-ffmpeg/libavcodec/x86/vp8dsp-init.c',
+ 'patched-ffmpeg/libavcodec/x86/vp8dsp.asm',
'patched-ffmpeg/libavutil/x86/cpu.c',
],
}], # (target_arch=="ia32" or target_arch=="x64") and (1)
@@ -174,10 +145,6 @@
'patched-ffmpeg/libavcodec/flac_parser.c',
'patched-ffmpeg/libavcodec/flacdata.c',
'patched-ffmpeg/libavcodec/flacdec.c',
- 'patched-ffmpeg/libavcodec/vp56rac.c',
- 'patched-ffmpeg/libavcodec/vp8.c',
- 'patched-ffmpeg/libavcodec/vp8_parser.c',
- 'patched-ffmpeg/libavcodec/vp8dsp.c',
'patched-ffmpeg/libavformat/flacdec.c',
'patched-ffmpeg/libavformat/oggparseflac.c',
'patched-ffmpeg/libavformat/rawdec.c',
@@ -196,6 +163,7 @@
'patched-ffmpeg/libavcodec/arm/fft_init_arm.c',
'patched-ffmpeg/libavcodec/arm/fmtconvert_init_arm.c',
'patched-ffmpeg/libavcodec/arm/fmtconvert_vfp.S',
+ 'patched-ffmpeg/libavcodec/arm/h264pred_init_arm.c',
'patched-ffmpeg/libavcodec/arm/jrevdct_arm.S',
'patched-ffmpeg/libavcodec/arm/mpegvideo_arm.c',
'patched-ffmpeg/libavcodec/arm/mpegvideo_armv5te.c',
@@ -203,14 +171,11 @@
'patched-ffmpeg/libavcodec/arm/simple_idct_arm.S',
'patched-ffmpeg/libavcodec/arm/simple_idct_armv5te.S',
'patched-ffmpeg/libavcodec/arm/simple_idct_armv6.S',
+ 'patched-ffmpeg/libavcodec/arm/vp8_armv6.S',
+ 'patched-ffmpeg/libavcodec/arm/vp8dsp_init_arm.c',
'patched-ffmpeg/libavutil/arm/cpu.c',
],
}], # (target_arch=="arm" or (target_arch=="arm" and arm_neon==1)) and (1)
- ['(1) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS" or ffmpeg_branding=="Chrome")', {
- 'sources': [
- 'patched-ffmpeg/libavcodec/h264pred.c',
- ],
- }], # (1) and (ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS" or ffmpeg_branding=="Chrome")
['(1) and (1)', {
'sources': [
'patched-ffmpeg/libavcodec/allcodecs.c',
@@ -220,18 +185,14 @@
'patched-ffmpeg/libavcodec/bitstream.c',
'patched-ffmpeg/libavcodec/bitstream_filter.c',
'patched-ffmpeg/libavcodec/dsputil.c',
- 'patched-ffmpeg/libavcodec/faandct.c',
'patched-ffmpeg/libavcodec/faanidct.c',
'patched-ffmpeg/libavcodec/fft_fixed.c',
'patched-ffmpeg/libavcodec/fft_float.c',
'patched-ffmpeg/libavcodec/fmtconvert.c',
'patched-ffmpeg/libavcodec/golomb.c',
+ 'patched-ffmpeg/libavcodec/h264pred.c',
'patched-ffmpeg/libavcodec/imgconvert.c',
- 'patched-ffmpeg/libavcodec/jfdctfst.c',
- 'patched-ffmpeg/libavcodec/jfdctint.c',
'patched-ffmpeg/libavcodec/jrevdct.c',
- 'patched-ffmpeg/libavcodec/libvpxdec.c',
- 'patched-ffmpeg/libavcodec/libvpxenc.c',
'patched-ffmpeg/libavcodec/mdct_fixed.c',
'patched-ffmpeg/libavcodec/mdct_float.c',
'patched-ffmpeg/libavcodec/mpeg12data.c',
@@ -251,6 +212,10 @@
'patched-ffmpeg/libavcodec/vorbisdec.c',
'patched-ffmpeg/libavcodec/vp3.c',
'patched-ffmpeg/libavcodec/vp3dsp.c',
+ 'patched-ffmpeg/libavcodec/vp56rac.c',
+ 'patched-ffmpeg/libavcodec/vp8.c',
+ 'patched-ffmpeg/libavcodec/vp8_parser.c',
+ 'patched-ffmpeg/libavcodec/vp8dsp.c',
'patched-ffmpeg/libavcodec/xiph.c',
'patched-ffmpeg/libavformat/allformats.c',
'patched-ffmpeg/libavformat/avio.c',
« no previous file with comments | « ffmpeg/source/ffmpeg.gyp ('k') | ffmpeg/source/ffmpeg_stub_headers.fragment » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698