Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Gracefuly return on detecting wrong AAC format from corrupted files"

Browse Source
This commit is contained in:
Andreas Huber
2011-09-30 11:13:21 -07:00
committed by Android (Google) Code Review
parent d42825f40e 9a6ed36ba5
commit cb52d012e9
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/media/stagefright/OMXCodec.h
View File

@@ -228,7 +228,7 @@ private:
void setComponentRole(); void setComponentRole();
void setAMRFormat(bool isWAMR, int32_t bitRate); void setAMRFormat(bool isWAMR, int32_t bitRate);
void setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate); status_t setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate);
void setG711Format(int32_t numChannels); void setG711Format(int32_t numChannels);
status_t setVideoPortFormatType( status_t setVideoPortFormatType(

28
media/libstagefright/OMXCodec.cpp
View File

@@ -625,7 +625,11 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) {
CHECK(meta->findInt32(kKeyChannelCount, &numChannels)); CHECK(meta->findInt32(kKeyChannelCount, &numChannels));
CHECK(meta->findInt32(kKeySampleRate, &sampleRate)); CHECK(meta->findInt32(kKeySampleRate, &sampleRate));
setAACFormat(numChannels, sampleRate, bitRate); status_t err = setAACFormat(numChannels, sampleRate, bitRate);
if (err != OK) {
CODEC_LOGE("setAACFormat() failed (err = %d)", err);
return err;
}
} else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_G711_ALAW, mMIME) } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_G711_ALAW, mMIME)
|| !strcasecmp(MEDIA_MIMETYPE_AUDIO_G711_MLAW, mMIME)) { || !strcasecmp(MEDIA_MIMETYPE_AUDIO_G711_MLAW, mMIME)) {
// These are PCM-like formats with a fixed sample rate but // These are PCM-like formats with a fixed sample rate but
@@ -3358,8 +3362,10 @@ void OMXCodec::setAMRFormat(bool isWAMR, int32_t bitRate) {
} }
} }
void OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate) { status_t OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate) {
CHECK(numChannels == 1 || numChannels == 2); if (numChannels > 2)
LOGW("Number of channels: (%d) \n", numChannels);
if (mIsEncoder) { if (mIsEncoder) {
//////////////// input port //////////////////// //////////////// input port ////////////////////
setRawAudioFormat(kPortIndexInput, sampleRate, numChannels); setRawAudioFormat(kPortIndexInput, sampleRate, numChannels);
@@ -3410,9 +3416,13 @@ void OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bit
profile.nAACERtools = OMX_AUDIO_AACERNone; profile.nAACERtools = OMX_AUDIO_AACERNone;
profile.eAACProfile = OMX_AUDIO_AACObjectLC; profile.eAACProfile = OMX_AUDIO_AACObjectLC;
profile.eAACStreamFormat = OMX_AUDIO_AACStreamFormatMP4FF; profile.eAACStreamFormat = OMX_AUDIO_AACStreamFormatMP4FF;
CHECK_EQ(mOMX->setParameter(mNode, OMX_IndexParamAudioAac, err = mOMX->setParameter(mNode, OMX_IndexParamAudioAac,
&profile, sizeof(profile)), (status_t)OK); &profile, sizeof(profile));
if (err != OK) {
CODEC_LOGE("setParameter('OMX_IndexParamAudioAac') failed (err = %d)", err);
return err;
}
} else { } else {
OMX_AUDIO_PARAM_AACPROFILETYPE profile; OMX_AUDIO_PARAM_AACPROFILETYPE profile;
InitOMXParams(&profile); InitOMXParams(&profile);
@@ -3428,8 +3438,14 @@ void OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bit
err = mOMX->setParameter( err = mOMX->setParameter(
mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile)); mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile));
CHECK_EQ(err, (status_t)OK);
if (err != OK) {
CODEC_LOGE("setParameter('OMX_IndexParamAudioAac') failed (err = %d)", err);
return err;
}
} }
return OK;
} }
void OMXCodec::setG711Format(int32_t numChannels) { void OMXCodec::setG711Format(int32_t numChannels) {