diff options
| author | Lajos Molnar <lajos@google.com> | 2013-06-25 22:07:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-25 22:07:56 +0000 |
| commit | 3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5 (patch) | |
| tree | cff1198ade127c231b63935ef66605614f79b957 /media/libstagefright/ACodec.cpp | |
| parent | 01128a03c85521d463f12e751e887ddbd90895d5 (diff) | |
| parent | 94705aff3c9eef58cbb72ec6fe5d2dcfd9481646 (diff) | |
| download | frameworks_av-3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5.zip frameworks_av-3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5.tar.gz frameworks_av-3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5.tar.bz2 | |
Merge "Adds VP9 decoding support for stagefright."
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 1a4f069..6bc7718 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -949,8 +949,10 @@ status_t ACodec::setComponentRole( "video_decoder.mpeg4", "video_encoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_H263, "video_decoder.h263", "video_encoder.h263" }, - { MEDIA_MIMETYPE_VIDEO_VPX, - "video_decoder.vpx", "video_encoder.vpx" }, + { MEDIA_MIMETYPE_VIDEO_VP8, + "video_decoder.vp8", "video_encoder.vp8" }, + { MEDIA_MIMETYPE_VIDEO_VP9, + "video_decoder.vp9", "video_encoder.vp9" }, { MEDIA_MIMETYPE_AUDIO_RAW, "audio_decoder.raw", "audio_encoder.raw" }, { MEDIA_MIMETYPE_AUDIO_FLAC, @@ -1632,7 +1634,8 @@ static const struct VideoCodingMapEntry { { MEDIA_MIMETYPE_VIDEO_MPEG4, OMX_VIDEO_CodingMPEG4 }, { MEDIA_MIMETYPE_VIDEO_H263, OMX_VIDEO_CodingH263 }, { MEDIA_MIMETYPE_VIDEO_MPEG2, OMX_VIDEO_CodingMPEG2 }, - { MEDIA_MIMETYPE_VIDEO_VPX, OMX_VIDEO_CodingVPX }, + { MEDIA_MIMETYPE_VIDEO_VP8, OMX_VIDEO_CodingVP8 }, + { MEDIA_MIMETYPE_VIDEO_VP9, OMX_VIDEO_CodingVP9 }, }; static status_t GetVideoCodingTypeFromMime( |