diff options
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 9245c53..6c4fd76 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1603,11 +1603,7 @@ status_t ACodec::setComponentRole( } if (i == kNumMimeToRole) { - status_t err = ERROR_UNSUPPORTED; - if (!strncmp(mComponentName.c_str(), "OMX.ffmpeg.", 11)) { - err = FFMPEGSoftCodec::setSupportedRole(mOMX, mNode, isEncoder, mime); - } - return err; + return FFMPEGSoftCodec::setSupportedRole(mOMX, mNode, isEncoder, mime); } const char *role = @@ -2930,10 +2926,9 @@ status_t ACodec::setupVideoDecoder( status_t err = GetVideoCodingTypeFromMime(mime, &compressionFormat); if (err != OK) { - if (!strncmp(mComponentName.c_str(), "OMX.ffmpeg.", 11)) { - err = FFMPEGSoftCodec::setVideoFormat( - msg, mime, mOMX, mNode, mIsEncoder, &compressionFormat); - } + err = FFMPEGSoftCodec::setVideoFormat( + msg, mime, mOMX, mNode, mIsEncoder, &compressionFormat, + mComponentName.c_str()); if (err != OK) { return err; } @@ -3086,10 +3081,9 @@ status_t ACodec::setupVideoEncoder(const char *mime, const sp<AMessage> &msg) { err = GetVideoCodingTypeFromMime(mime, &compressionFormat); if (err != OK) { - if (!strncmp(mComponentName.c_str(), "OMX.ffmpeg.", 11)) { - err = FFMPEGSoftCodec::setVideoFormat( - msg, mime, mOMX, mNode, mIsEncoder, &compressionFormat); - } + err = FFMPEGSoftCodec::setVideoFormat( + msg, mime, mOMX, mNode, mIsEncoder, &compressionFormat, + mComponentName.c_str()); if (err != OK) { ALOGE("Not a supported video mime type: %s", mime); return err; |