diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-04 00:05:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-04 00:05:15 +0000 |
| commit | b4350af65dd66ed57f1ff79b1b426507f0e73b7b (patch) | |
| tree | 47c385021c247ebc3faaf99ffdb2174dba5d8597 /media/libstagefright/omx | |
| parent | feac1a43c8b674c4b526214fa8061452fd6e4846 (diff) | |
| parent | bf927f8ec7979f2b64331c2b2f12a6a5dba05bca (diff) | |
| download | frameworks_av-b4350af65dd66ed57f1ff79b1b426507f0e73b7b.zip frameworks_av-b4350af65dd66ed57f1ff79b1b426507f0e73b7b.tar.gz frameworks_av-b4350af65dd66ed57f1ff79b1b426507f0e73b7b.tar.bz2 | |
Merge "Opus Matroska support in OpenMax"
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/SoftOMXPlugin.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/omx/tests/OMXHarness.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/omx/SoftOMXPlugin.cpp b/media/libstagefright/omx/SoftOMXPlugin.cpp index d49e50b..65f5404 100644 --- a/media/libstagefright/omx/SoftOMXPlugin.cpp +++ b/media/libstagefright/omx/SoftOMXPlugin.cpp @@ -50,6 +50,7 @@ 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.opus.decoder", "opusdec", "audio_decoder.opus" }, { "OMX.google.vp8.decoder", "vpxdec", "video_decoder.vp8" }, { "OMX.google.vp9.decoder", "vpxdec", "video_decoder.vp9" }, { "OMX.google.vp8.encoder", "vpxenc", "video_encoder.vp8" }, diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp index 03725df..f4dfd6b 100644 --- a/media/libstagefright/omx/tests/OMXHarness.cpp +++ b/media/libstagefright/omx/tests/OMXHarness.cpp @@ -463,6 +463,7 @@ static const char *GetMimeFromComponentRole(const char *componentRole) { { "audio_decoder.aac", "audio/mp4a-latm" }, { "audio_decoder.mp3", "audio/mpeg" }, { "audio_decoder.vorbis", "audio/vorbis" }, + { "audio_decoder.opus", "audio/opus" }, { "audio_decoder.g711alaw", MEDIA_MIMETYPE_AUDIO_G711_ALAW }, { "audio_decoder.g711mlaw", MEDIA_MIMETYPE_AUDIO_G711_MLAW }, }; @@ -495,6 +496,7 @@ static const char *GetURLForMime(const char *mime) { { "audio/mpeg", "file:///sdcard/media_api/music/MP3_48KHz_128kbps_s_1_17_CBR.mp3" }, { "audio/vorbis", NULL }, + { "audio/opus", NULL }, { "video/x-vnd.on2.vp8", "file:///sdcard/media_api/video/big-buck-bunny_trailer.webm" }, { MEDIA_MIMETYPE_AUDIO_G711_ALAW, "file:///sdcard/M1F1-Alaw-AFsp.wav" }, |