diff options
| author | hkuang <hkuang@google.com> | 2013-06-24 11:21:17 -0700 |
|---|---|---|
| committer | Hangyu Kuang <hkuang@google.com> | 2013-06-24 20:29:08 +0000 |
| commit | 94705aff3c9eef58cbb72ec6fe5d2dcfd9481646 (patch) | |
| tree | a6129de4a9abf49499bfc4639587a2627c0370ab /media/libstagefright/omx | |
| parent | 078a540525f86517aefa4afc56e12fbd74e3823d (diff) | |
| download | frameworks_av-94705aff3c9eef58cbb72ec6fe5d2dcfd9481646.zip frameworks_av-94705aff3c9eef58cbb72ec6fe5d2dcfd9481646.tar.gz frameworks_av-94705aff3c9eef58cbb72ec6fe5d2dcfd9481646.tar.bz2 | |
Adds VP9 decoding support for stagefright.
Also change the VP8 encoder role name from
video_encoder.vpx to video_encoder.vp8 for
future VP9 encoder support.
Requires the change in frameworks/native and media_codecs.xml
corresponding to the device.
VP9 decoding test will be added to cts repo later.
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/SoftOMXPlugin.cpp | 5 | ||||
| -rw-r--r-- | media/libstagefright/omx/tests/OMXHarness.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/omx/SoftOMXPlugin.cpp b/media/libstagefright/omx/SoftOMXPlugin.cpp index b3fe98e..d6cde73 100644 --- a/media/libstagefright/omx/SoftOMXPlugin.cpp +++ b/media/libstagefright/omx/SoftOMXPlugin.cpp @@ -50,8 +50,9 @@ static const struct { { "OMX.google.mpeg4.encoder", "mpeg4enc", "video_encoder.mpeg4" }, { "OMX.google.mp3.decoder", "mp3dec", "audio_decoder.mp3" }, { "OMX.google.vorbis.decoder", "vorbisdec", "audio_decoder.vorbis" }, - { "OMX.google.vpx.decoder", "vpxdec", "video_decoder.vpx" }, - { "OMX.google.vpx.encoder", "vpxenc", "video_encoder.vpx" }, + { "OMX.google.vp8.decoder", "vpxdec", "video_decoder.vp8" }, + { "OMX.google.vp9.decoder", "vpxdec", "video_decoder.vp9" }, + { "OMX.google.vp8.encoder", "vpxenc", "video_encoder.vp8" }, { "OMX.google.raw.decoder", "rawdec", "audio_decoder.raw" }, { "OMX.google.flac.encoder", "flacenc", "audio_encoder.flac" }, { "OMX.google.gsm.decoder", "gsmdec", "audio_decoder.gsm" }, diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp index 6cca8da..4bee808 100644 --- a/media/libstagefright/omx/tests/OMXHarness.cpp +++ b/media/libstagefright/omx/tests/OMXHarness.cpp @@ -449,7 +449,8 @@ static const char *GetMimeFromComponentRole(const char *componentRole) { { "video_decoder.avc", "video/avc" }, { "video_decoder.mpeg4", "video/mp4v-es" }, { "video_decoder.h263", "video/3gpp" }, - { "video_decoder.vpx", "video/x-vnd.on2.vp8" }, + { "video_decoder.vp8", "video/x-vnd.on2.vp8" }, + { "video_decoder.vp9", "video/x-vnd.on2.vp9" }, // we appear to use this as a synonym to amrnb. { "audio_decoder.amr", "audio/3gpp" }, |