am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo

Merge commit '3e8b89bd8d35525019080205e7221063748a3f0a' into kraken

* commit '3e8b89bd8d35525019080205e7221063748a3f0a':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
This commit is contained in:
Andreas Huber
2010-04-06 14:50:05 -07:00
committed by Android Git Automerger

View File

@@ -535,26 +535,6 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) {
return err; return err;
} }
} }
} else if (!strncasecmp(mMIME, "audio/", 6)) {
if ((mQuirks & kSupportsMultipleFramesPerInputBuffer)
&& !strcmp(mComponentName, "OMX.TI.AAC.decode")) {
OMX_PARAM_PORTDEFINITIONTYPE def;
InitOMXParams(&def);
def.nPortIndex = kPortIndexInput;
status_t err = mOMX->getParameter(
mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));
CHECK_EQ(err, OK);
const size_t kMinBufferSize = 100 * 1024;
if (def.nBufferSize < kMinBufferSize) {
def.nBufferSize = kMinBufferSize;
}
err = mOMX->setParameter(
mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));
CHECK_EQ(err, OK);
}
} }
if (!strcasecmp(mMIME, MEDIA_MIMETYPE_IMAGE_JPEG) if (!strcasecmp(mMIME, MEDIA_MIMETYPE_IMAGE_JPEG)