diff options
| author | Leena Winterrowd <lenhardw@codeaurora.org> | 2014-09-10 19:22:54 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-30 15:04:08 -0800 |
| commit | d69ffb9cf12a4664584e0b3eea30e23b95db4ad0 (patch) | |
| tree | f6134cec387a1d95ade4ba7d33b74aafc51a4d22 /media/libstagefright/rtsp | |
| parent | 46c4173bc9b415b443f2705675dd5785f0c4c46c (diff) | |
| download | frameworks_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/rtsp')
| -rw-r--r-- | media/libstagefright/rtsp/APacketSource.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/APacketSource.cpp b/media/libstagefright/rtsp/APacketSource.cpp index cfafaa7..e81325d 100644 --- a/media/libstagefright/rtsp/APacketSource.cpp +++ b/media/libstagefright/rtsp/APacketSource.cpp @@ -37,6 +37,7 @@ #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> +#include <media/stagefright/Utils.h> #include <utils/Vector.h> namespace android { @@ -535,6 +536,8 @@ APacketSource::APacketSource( return; } + updateVideoTrackInfoFromESDS_MPEG4Video(mFormat); + mFormat->setInt32(kKeyWidth, width); mFormat->setInt32(kKeyHeight, height); } else if (!strncasecmp(desc.c_str(), "mpeg4-generic/", 14)) { |