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

Merge change 23539 into eclair

Browse Source 
* changes:
  Squashed commit of the following:
This commit is contained in:
Android (Google) Code Review
2009-09-02 09:22:49 -07:00
parent bb54f93ff6 43ad6eaf77
commit 854bcb95ce
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,7 +136,7 @@ private:
void clearCodecSpecificData(); void clearCodecSpecificData();
void setAMRFormat(); void setAMRFormat();
void setAACFormat(); void setAACFormat(int32_t numChannels, int32_t sampleRate);
status_t setVideoPortFormatType( status_t setVideoPortFormatType(
OMX_U32 portIndex, OMX_U32 portIndex,

46
media/libstagefright/OMXCodec.cpp
View File

@@ -302,7 +302,11 @@ sp<OMXCodec> OMXCodec::Create(
codec->setAMRFormat(); codec->setAMRFormat();
} }
if (!createEncoder && !strcasecmp("audio/mp4a-latm", mime)) { if (!createEncoder && !strcasecmp("audio/mp4a-latm", mime)) {
codec->setAACFormat(); int32_t numChannels, sampleRate;
CHECK(meta->findInt32(kKeyChannelCount, &numChannels));
CHECK(meta->findInt32(kKeySampleRate, &sampleRate));
codec->setAACFormat(numChannels, sampleRate);
} }
if (!strncasecmp(mime, "video/", 6)) { if (!strncasecmp(mime, "video/", 6)) {
int32_t width, height; int32_t width, height;
@@ -1321,10 +1325,6 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) {
return; return;
} }
// We're going to temporarily give up the lock while reading data
// from the source. A certain client unfortunately chose to have the
// thread supplying input data and reading output data be the same...
MediaBuffer *srcBuffer; MediaBuffer *srcBuffer;
status_t err; status_t err;
if (mSeekTimeUs >= 0) { if (mSeekTimeUs >= 0) {
@@ -1332,13 +1332,10 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) {
options.setSeekTo(mSeekTimeUs); options.setSeekTo(mSeekTimeUs);
mSeekTimeUs = -1; mSeekTimeUs = -1;
mLock.unlock();
err = mSource->read(&srcBuffer, &options); err = mSource->read(&srcBuffer, &options);
} else { } else {
mLock.unlock();
err = mSource->read(&srcBuffer); err = mSource->read(&srcBuffer);
} }
mLock.lock();
OMX_U32 flags = OMX_BUFFERFLAG_ENDOFFRAME; OMX_U32 flags = OMX_BUFFERFLAG_ENDOFFRAME;
OMX_TICKS timestamp = 0; OMX_TICKS timestamp = 0;
@@ -1496,20 +1493,22 @@ void OMXCodec::setAMRFormat() {
} }
} }
void OMXCodec::setAACFormat() { void OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate) {
OMX_AUDIO_PARAM_AACPROFILETYPE def; OMX_AUDIO_PARAM_AACPROFILETYPE profile;
def.nSize = sizeof(def); profile.nSize = sizeof(profile);
def.nVersion.s.nVersionMajor = 1; profile.nVersion.s.nVersionMajor = 1;
def.nVersion.s.nVersionMinor = 1; profile.nVersion.s.nVersionMinor = 1;
def.nPortIndex = kPortIndexInput; profile.nPortIndex = kPortIndexInput;
status_t err = status_t err =
mOMX->get_parameter(mNode, OMX_IndexParamAudioAac, &def, sizeof(def)); mOMX->get_parameter(mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile));
CHECK_EQ(err, OK); CHECK_EQ(err, OK);
def.eAACStreamFormat = OMX_AUDIO_AACStreamFormatMP4ADTS; profile.nChannels = numChannels;
profile.nSampleRate = sampleRate;
profile.eAACStreamFormat = OMX_AUDIO_AACStreamFormatMP4ADTS;
err = mOMX->set_parameter(mNode, OMX_IndexParamAudioAac, &def, sizeof(def)); err = mOMX->set_parameter(mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile));
CHECK_EQ(err, OK); CHECK_EQ(err, OK);
} }
@@ -2123,8 +2122,19 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {
inputFormat->findInt32(kKeyChannelCount, &numChannels); inputFormat->findInt32(kKeyChannelCount, &numChannels);
inputFormat->findInt32(kKeySampleRate, &sampleRate); inputFormat->findInt32(kKeySampleRate, &sampleRate);
if ((OMX_U32)numChannels != params.nChannels) {
LOGW("Codec outputs a different number of channels than "
"the input stream contains.");
}
mOutputFormat->setCString(kKeyMIMEType, "audio/raw"); mOutputFormat->setCString(kKeyMIMEType, "audio/raw");
mOutputFormat->setInt32(kKeyChannelCount, numChannels);
// Use the codec-advertised number of channels, as some
// codecs appear to output stereo even if the input data is
// mono.
mOutputFormat->setInt32(kKeyChannelCount, params.nChannels);
// The codec-reported sampleRate is not reliable...
mOutputFormat->setInt32(kKeySampleRate, sampleRate); mOutputFormat->setInt32(kKeySampleRate, sampleRate);
break; break;
} }