summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-12-26 22:07:56 -0800
committerSteve Kondik <shade@chemlab.org>2015-12-28 02:13:17 -0800
commit1bb6c3edfea2a8b961e9550bd02a1e0e3d79db22 (patch)
tree05415e70d1fe311af426274fce027422cef00bc1 /media/libstagefright/ACodec.cpp
parent1b5f480d61432ab5aeb090f96823ed59dbc727bc (diff)
downloadframeworks_av-1bb6c3edfea2a8b961e9550bd02a1e0e3d79db22.zip
frameworks_av-1bb6c3edfea2a8b961e9550bd02a1e0e3d79db22.tar.gz
frameworks_av-1bb6c3edfea2a8b961e9550bd02a1e0e3d79db22.tar.bz2
stagefright: Add more hardware codec support for our extractor
* Additional cases for timestamp reordering (smooth out AVI playback) * Enable hardware thumbnailer Change-Id: If828181850a5627dc1f91b118974905d22ab24e9
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r--media/libstagefright/ACodec.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 6d26173..4286d3c 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -2966,13 +2966,11 @@ status_t ACodec::setupVideoDecoder(
OMX_VIDEO_CODINGTYPE compressionFormat;
status_t err = GetVideoCodingTypeFromMime(mime, &compressionFormat);
- if (err != OK) {
- err = FFMPEGSoftCodec::setVideoFormat(
+ err = FFMPEGSoftCodec::setVideoFormat(err,
msg, mime, mOMX, mNode, mIsEncoder, &compressionFormat,
mComponentName.c_str());
- if (err != OK) {
- return err;
- }
+ if (err != OK) {
+ return err;
}
err = setVideoPortFormatType(
@@ -3121,14 +3119,12 @@ status_t ACodec::setupVideoEncoder(const char *mime, const sp<AMessage> &msg) {
OMX_VIDEO_CODINGTYPE compressionFormat;
err = GetVideoCodingTypeFromMime(mime, &compressionFormat);
- if (err != OK) {
- err = FFMPEGSoftCodec::setVideoFormat(
+ err = FFMPEGSoftCodec::setVideoFormat(err,
msg, mime, mOMX, mNode, mIsEncoder, &compressionFormat,
mComponentName.c_str());
- if (err != OK) {
- ALOGE("Not a supported video mime type: %s", mime);
- return err;
- }
+ if (err != OK) {
+ ALOGE("Not a supported video mime type: %s", mime);
+ return err;
}
err = setVideoPortFormatType(