diff options
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/media/media.gyp b/media/media.gyp index f53c35d..e504d12 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -19,6 +19,7 @@ 'target_name': 'media', 'type': '<(library)', 'dependencies': [ + 'omx_wrapper', '../base/base.gyp:base', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], @@ -98,6 +99,8 @@ 'filters/audio_renderer_base.h', 'filters/audio_renderer_impl.cc', 'filters/audio_renderer_impl.h', + 'filters/bitstream_converter.cc', + 'filters/bitstream_converter.h', 'filters/decoder_base.h', 'filters/ffmpeg_audio_decoder.cc', 'filters/ffmpeg_audio_decoder.h', @@ -109,12 +112,20 @@ 'filters/ffmpeg_glue.h', 'filters/ffmpeg_interfaces.cc', 'filters/ffmpeg_interfaces.h', + 'filters/ffmpeg_video_decode_engine.cc', + 'filters/ffmpeg_video_decode_engine.h', 'filters/ffmpeg_video_decoder.cc', 'filters/ffmpeg_video_decoder.h', 'filters/file_data_source.cc', 'filters/file_data_source.h', 'filters/null_audio_renderer.cc', 'filters/null_audio_renderer.h', + 'filters/omx_video_decode_engine.cc', + 'filters/omx_video_decode_engine.h', + 'filters/omx_video_decoder.cc', + 'filters/omx_video_decoder.h', + 'filters/video_decoder_impl.cc', + 'filters/video_decoder_impl.h', 'filters/video_decode_engine.h', 'filters/video_renderer_base.cc', 'filters/video_renderer_base.h', @@ -195,11 +206,12 @@ 'base/yuv_convert_unittest.cc', 'filters/audio_renderer_algorithm_ola_unittest.cc', 'filters/audio_renderer_base_unittest.cc', + 'filters/bitstream_converter_unittest.cc', 'filters/ffmpeg_demuxer_unittest.cc', 'filters/ffmpeg_glue_unittest.cc', 'filters/ffmpeg_video_decode_engine_unittest.cc', - 'filters/ffmpeg_video_decoder_unittest.cc', 'filters/file_data_source_unittest.cc', + 'filters/video_decoder_impl_unittest.cc', 'filters/video_renderer_base_unittest.cc', ], 'conditions': [ @@ -257,9 +269,8 @@ 'target_name': 'omx_test', 'type': 'executable', 'dependencies': [ - 'omx', + 'omx_wrapper', '../base/base.gyp:base', - '../third_party/openmax/openmax.gyp:il', ], 'sources': [ 'omx/omx_test.cc', @@ -269,7 +280,7 @@ 'target_name': 'omx_unittests', 'type': 'executable', 'dependencies': [ - 'omx', + 'omx_wrapper', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../testing/gtest.gyp:gtest', @@ -280,7 +291,7 @@ ], }, { - 'target_name': 'omx', + 'target_name': 'omx_wrapper', 'type': '<(library)', 'dependencies': [ '../base/base.gyp:base', @@ -292,6 +303,9 @@ 'omx/omx_codec.cc', 'omx/omx_codec.h', ], + 'export_dependent_settings': [ + '../third_party/openmax/openmax.gyp:il', + ], }, ], 'conditions': [ |