media/media.gyp - Issue 816353010: Implemented HEVC video demuxing and parsing

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Added hevc handling in media/base/android/media_codec_bridge.cc Created 5 years, 9 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 20d84cc4d5cf1cbe426e51eed1a646bb4cdb9bcb..140d20cce0155493785d6d3a4edc516814b449a7 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -667,6 +667,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',

@@ -1015,8 +1017,12 @@

'filters/ffmpeg_aac_bitstream_converter.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/h264_to_annex_b_bitstream_converter.cc',

'filters/h264_to_annex_b_bitstream_converter.h',

+ 'filters/h265_parser.cc',

+ 'filters/h265_parser.h',

'formats/mp2t/es_adapter_video.cc',

'formats/mp2t/es_adapter_video.h',

'formats/mp2t/es_parser.cc',

@@ -1055,6 +1061,8 @@

'formats/mp4/cenc.h',

'formats/mp4/es_descriptor.cc',

'formats/mp4/es_descriptor.h',

+ 'formats/mp4/hevc.cc',

+ 'formats/mp4/hevc.h',

'formats/mp4/mp4_stream_parser.cc',

'formats/mp4/mp4_stream_parser.h',

'formats/mp4/sample_to_group_iterator.cc',

@@ -1299,6 +1307,11 @@

'USE_NEON'

}],

+ ['proprietary_codecs==1', {

+ 'sources': [

+ 'filters/h265_parser_unittest.cc',

+ ],

+ }],

['media_use_ffmpeg==1', {

'dependencies': [

'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',

« media/filters/stream_parser_factory.cc ('K') | « media/formats/mp4/mp4_stream_parser_unittest.cc ('k') | media/mojo/interfaces/media_types.mojom » ('j') | net/base/mime_util.cc » ('J')