Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index 79980a403fc1d70c3920a1b69a2414551996ae87..39d0e14f883220c11bd8b0dff354238e5f2a25d9 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -33,6 +33,13 @@ |
| }, { |
| 'use_low_memory_buffer%': 0, |
| }], |
| + ['chromecast==1', { |
| + # Enable HEVC/H265 demuxing. Actual decoding must be provided by the |
| + # platform. |
| + 'enable_hevc_demuxing%': 1, |
| + }, { |
| + 'enable_hevc_demuxing%': 0, |
| + }], |
| ], |
| }, |
| 'includes': [ |
| @@ -663,6 +670,8 @@ |
| 'filters/ffmpeg_glue.h', |
| 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', |
| 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', |
| + 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', |
|
ddorwin
2015/09/08 18:55:44
Remove here?
servolk
2015/09/08 19:22:02
Done.
|
| + 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', |
| 'filters/ffmpeg_video_decoder.cc', |
| 'filters/ffmpeg_video_decoder.h', |
| 'filters/in_memory_url_protocol.cc', |
| @@ -1096,6 +1105,19 @@ |
| 'formats/mpeg/mpeg_audio_stream_parser_base.h', |
| ], |
| }], |
| + ['proprietary_codecs==1 and enable_hevc_demuxing==1', { |
| + 'defines': [ |
| + 'ENABLE_HEVC_DEMUXING' |
| + ], |
| + 'sources': [ |
| + 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', |
|
ddorwin
2015/09/08 18:55:44
Then probably need to use a media_use_ffmpeg==1 ch
servolk
2015/09/08 19:22:02
Done.
|
| + 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', |
| + 'filters/h265_parser.cc', |
| + 'filters/h265_parser.h', |
| + 'formats/mp4/hevc.cc', |
| + 'formats/mp4/hevc.h', |
| + ], |
| + }], |
| ['target_arch=="ia32" or target_arch=="x64"', { |
| 'dependencies': [ |
| 'media_asm', |
| @@ -1304,6 +1326,14 @@ |
| 'USE_NEON' |
| ], |
| }], |
| + ['proprietary_codecs==1 and enable_hevc_demuxing==1', { |
| + 'defines': [ |
| + 'ENABLE_HEVC_DEMUXING' |
| + ], |
| + 'sources': [ |
| + 'filters/h265_parser_unittest.cc', |
| + ], |
| + }], |
| ['media_use_ffmpeg==1', { |
| 'dependencies': [ |
| '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |