diff options
| author | servolk <servolk@chromium.org> | 2015-09-08 15:33:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-08 22:34:30 +0000 |
| commit | 4585056bcf1491d19262aaef0577542840f54f19 (patch) | |
| tree | a2934a2e239ef7efbdaeeb1a09873936e4291a6e /media/ffmpeg | |
| parent | b1a17c24b420b95b78558fe36701e0dc1fd6e214 (diff) | |
| download | chromium_src-4585056bcf1491d19262aaef0577542840f54f19.zip chromium_src-4585056bcf1491d19262aaef0577542840f54f19.tar.gz chromium_src-4585056bcf1491d19262aaef0577542840f54f19.tar.bz2 | |
Implemented HEVC video demuxing and parsing
Chromecast team is interested in adding HEVC/H265 video codec support. Since we are using hardware decoders on our platforms, we don't need to add software decoder, but we still need to be able to demux and parse HEVC in mp4 containers. HEVC is very similar to H264 in many aspects, so we can reuse a lot of the existing H264 functionality.
BUG=454948
Review URL: https://codereview.chromium.org/816353010
Cr-Commit-Position: refs/heads/master@{#347814}
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 2d536e9..a92bf7c 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -154,6 +154,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: @@ -172,6 +176,10 @@ 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: |