diff options
| author | Andreas Huber <andih@google.com> | 2012-03-16 12:00:18 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-03-16 12:00:18 -0700 |
| commit | c5255ac5b1bd313dcb50159566163b24dce7483f (patch) | |
| tree | 49f2e815570219a3cf541032dba3e4ac857aca09 /media/libstagefright/ACodec.cpp | |
| parent | 49f306f863b14f8bfc3b405ebfd3a2fb2b403c15 (diff) | |
| download | frameworks_av-c5255ac5b1bd313dcb50159566163b24dce7483f.zip frameworks_av-c5255ac5b1bd313dcb50159566163b24dce7483f.tar.gz frameworks_av-c5255ac5b1bd313dcb50159566163b24dce7483f.tar.bz2 | |
ACodec is a little more aggressive in its error checking now.
Update components to do the right thing.
Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 09e4e45..e5ad4b7 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -746,6 +746,10 @@ status_t ACodec::setComponentRole( "audio_decoder.aac", "audio_encoder.aac" }, { MEDIA_MIMETYPE_AUDIO_VORBIS, "audio_decoder.vorbis", "audio_encoder.vorbis" }, + { MEDIA_MIMETYPE_AUDIO_G711_MLAW, + "audio_decoder.g711mlaw", "audio_encoder.g711mlaw" }, + { MEDIA_MIMETYPE_AUDIO_G711_ALAW, + "audio_decoder.g711alaw", "audio_encoder.g711alaw" }, { MEDIA_MIMETYPE_VIDEO_AVC, "video_decoder.avc", "video_encoder.avc" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, @@ -855,10 +859,6 @@ status_t ACodec::configureCodec( } } - if (err != OK) { - return err; - } - int32_t maxInputSize; if (msg->findInt32("max-input-size", &maxInputSize)) { err = setMinBufferSize(kPortIndexInput, (size_t)maxInputSize); @@ -2770,6 +2770,9 @@ bool ACodec::LoadedState::onConfigureComponent( status_t err = mCodec->configureCodec(mime.c_str(), msg); if (err != OK) { + ALOGE("[%s] configureCodec returning error %d", + mCodec->mComponentName.c_str(), err); + mCodec->signalError(OMX_ErrorUndefined, err); return false; } |