Chromium changes for static linking ffmpeg

media/media.gyp

 # Copyright (c) 2012 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,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 295 matching lines @@
         'base/keyboard_event_counter.h',
         'base/mac/avfoundation_glue.h',
         'base/mac/avfoundation_glue.mm',
         'base/mac/coremedia_glue.h',
         'base/mac/coremedia_glue.mm',
         'base/mac/corevideo_glue.h',
         'base/mac/video_frame_mac.cc',
         'base/mac/video_frame_mac.h',
         'base/mac/videotoolbox_glue.h',
         'base/mac/videotoolbox_glue.mm',
+        'base/media_init.cc',

[M-A Ruel, 2015/05/15 23:51:29]

sort

[chcunningham, 2015/05/16 04:36:26]

deleted.

         'base/media.cc',
         'base/media.h',
         'base/media_client.cc',
         'base/media_client.h',
         'base/media_file_checker.cc',
         'base/media_file_checker.h',
         'base/media_keys.cc',
         'base/media_keys.h',
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
         'base/media_permission.cc',
         'base/media_permission.h',
-        'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
-        'base/media_win.cc',
         'base/moving_average.cc',
         'base/moving_average.h',
         'base/multi_channel_resampler.cc',
         'base/multi_channel_resampler.h',
         'base/pipeline.cc',
         'base/pipeline.h',
         'base/pipeline_status.h',
         'base/player_tracker.cc',
         'base/player_tracker.h',
         'base/ranges.cc',
@@ skipping 265 matching lines @@
             'USE_NEON'
           ],
         }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
         }, {  # media_use_ffmpeg==0
           # Exclude the sources that depend on ffmpeg.
           'sources!': [
+            'base/media_init.cc',

[M-A Ruel, 2015/05/15 23:51:29]

sort

[chcunningham, 2015/05/16 04:36:25]

deleted.

             'base/audio_video_metadata_extractor.cc',
             'base/audio_video_metadata_extractor.h',
             'base/container_names.cc',
             'base/container_names.h',
             'base/media_file_checker.cc',
             'base/media_file_checker.h',
             'base/media_posix.cc',
             'ffmpeg/ffmpeg_common.cc',
             'ffmpeg/ffmpeg_common.h',
             'filters/audio_file_reader.cc',
             'filters/audio_file_reader.h',
             'filters/blocking_url_protocol.cc',
             'filters/blocking_url_protocol.h',
             'filters/ffmpeg_aac_bitstream_converter.cc',
             'filters/ffmpeg_aac_bitstream_converter.h',
             'filters/ffmpeg_audio_decoder.cc',
             'filters/ffmpeg_audio_decoder.h',
             'filters/ffmpeg_bitstream_converter.h',
             'filters/ffmpeg_demuxer.cc',
             'filters/ffmpeg_demuxer.h',
             'filters/ffmpeg_glue.cc',
             'filters/ffmpeg_glue.h',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
             'filters/ffmpeg_video_decoder.cc',
             'filters/ffmpeg_video_decoder.h',
             'filters/in_memory_url_protocol.cc',
             'filters/in_memory_url_protocol.h',
           ],
+          # Stub out ffmpeg initializer
+          'sources': [
+            'base/media_init_stub.cc',
+          ],
           'defines': [
             'MEDIA_DISABLE_FFMPEG',
           ],
           'direct_dependent_settings': {
             'defines': [
               'MEDIA_DISABLE_FFMPEG',
             ],
           },
         }],
         ['media_use_libvpx==1', {
@@ skipping 26 matching lines @@
         ['OS=="android"', {
           'dependencies': [
             'media_android_jni_headers',
             'media_java',
             'player_android',
             'video_capture_android_jni_headers',
           ],
           'sources': [
             'base/media.cc',
             'base/media.h',
-            'base/media_stub.cc',
           ],
           'sources!': [
             'filters/opus_audio_decoder.cc',
             'filters/opus_audio_decoder.h',
             'renderers/default_renderer_factory.cc',
             'renderers/default_renderer_factory.h',
           ],
           'defines': [
             'DISABLE_USER_INPUT_MONITOR',
           ],
@@ skipping 547 matching lines @@
         }],
         ['os_posix==1 and OS!="mac"', {
           'conditions': [
             ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
+        ['OS=="win"', {

[M-A Ruel, 2015/05/15 23:51:29]

['OS=="win" and win_use_allocator_shim==1', {

I don't see any reason to use embedded conditions.

[chcunningham, 2015/05/16 04:36:25]

ended up combining this with the above condition 

+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              # TODO(chcunningham): This seems to not be picked up? FFmpeg allocator test (which should be removed) still fails.
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
         ['OS=="android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
             'player_android',
           ],
         }],
         ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
           'sources': [
             'filters/h264_bitstream_buffer_unittest.cc',
           ],
@@ skipping 683 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'audio_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }