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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/ffmpeg/ffmpeg_common.cc

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, 7 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
« media/base/mime_util.cc ('K') | « media/base/video_decoder_config.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | media/filters/stream_parser_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.cc
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index 3b212ed79ad9009328cb510cc29415588fc453ce..31f51c77e7a2fa8f7a93e29e6e2a42fefa706005 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -153,6 +153,10 @@ static VideoCodec CodecIDToVideoCodec(AVCodecID codec_id) {
switch (codec_id) {
case AV_CODEC_ID_H264:
return kCodecH264;
+#if defined(ENABLE_HEVC_DEMUXING)
+ case AV_CODEC_ID_HEVC:
+ return kCodecHEVC;
+#endif
case AV_CODEC_ID_THEORA:
return kCodecTheora;
case AV_CODEC_ID_MPEG4:
@@ -171,6 +175,10 @@ static AVCodecID VideoCodecToCodecID(VideoCodec video_codec) {
switch (video_codec) {
case kCodecH264:
return AV_CODEC_ID_H264;
+#if defined(ENABLE_HEVC_DEMUXING)
+ case kCodecHEVC:
+ return AV_CODEC_ID_HEVC;
+#endif
case kCodecTheora:
return AV_CODEC_ID_THEORA;
case kCodecMPEG4:
« media/base/mime_util.cc ('K') | « media/base/video_decoder_config.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | media/filters/stream_parser_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698