summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorLeena Winterrowd <lenhardw@codeaurora.org>2014-09-10 19:22:54 -0700
committerSteve Kondik <steve@cyngn.com>2015-11-30 15:04:08 -0800
commitd69ffb9cf12a4664584e0b3eea30e23b95db4ad0 (patch)
treef6134cec387a1d95ade4ba7d33b74aafc51a4d22 /media/libstagefright/ACodec.cpp
parent46c4173bc9b415b443f2705675dd5785f0c4c46c (diff)
downloadframeworks_av-d69ffb9cf12a4664584e0b3eea30e23b95db4ad0.zip
frameworks_av-d69ffb9cf12a4664584e0b3eea30e23b95db4ad0.tar.gz
frameworks_av-d69ffb9cf12a4664584e0b3eea30e23b95db4ad0.tar.bz2
libstagefright: Handle MPEG4 DP playback
Since the HW decoder doesn't support MPEG4 DP clips, detect DP format clips in the parser and report a new MIME: video/mpeg4-esdp. This MIME is only registered to the SW decoder which supports DP clips. Merges the following change from kitkat: libstagefright: Fix DP Parsing issue with mpeg4 SP,ASP (Change-Id: I69c719011e1a0d2a0b0ae5a9b504b7cce443866b) CRs-Fixed: 722066 Change-Id: I7bc3a7a9f4a6d37e046ed9c8008cb27fb3bc665d
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r--media/libstagefright/ACodec.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 6c4fd76..f7cc4cd 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1590,6 +1590,8 @@ status_t ACodec::setComponentRole(
"audio_decoder.ac3", "audio_encoder.ac3" },
{ MEDIA_MIMETYPE_AUDIO_EAC3,
"audio_decoder.eac3", "audio_encoder.eac3" },
+ { MEDIA_MIMETYPE_VIDEO_MPEG4_DP,
+ "video_decoder.mpeg4", NULL },
};
static const size_t kNumMimeToRole =