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

Unified Diff: media/media.gyp

Issue 816353010: Implemented HEVC video demuxing and parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT Created 5 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 79980a403fc1d70c3920a1b69a2414551996ae87..ae8d75d201f6b0f97f8ede7f00955b0b87c33194 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',
+ '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',
+ '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,11 @@
'USE_NEON'
],
}],
+ ['proprietary_codecs==1 and enable_hevc_demuxing==1', {
+ 'sources': [
+ 'filters/h265_parser_unittest.cc',
+ ],
+ }],
['media_use_ffmpeg==1', {
'dependencies': [
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',

Powered by Google App Engine
This is Rietveld 408576698