Merge "Acodec: Send framerate information to OMX decoder if available" into lmp-mr1-dev (36dca156) · Commits · e / os / android_frameworks_av

include/media/stagefright/ACodec.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ private:
		status_t setVideoFormatOnPort(
		OMX_U32 portIndex,
		int32_t width, int32_t height,
		OMX_VIDEO_CODINGTYPE compressionFormat);
		OMX_VIDEO_CODINGTYPE compressionFormat, float frameRate = -1.0);

		typedef struct drcParams {
		int32_t drcCut;

+15 −2

Original line number	Diff line number	Diff line
		@@ -2224,8 +2224,17 @@ status_t ACodec::setupVideoDecoder(
		return err;
		}

		int32_t frameRateInt;
		float frameRateFloat;
		if (!msg->findFloat("frame-rate", &frameRateFloat)) {
		if (!msg->findInt32("frame-rate", &frameRateInt)) {
		frameRateInt = -1;
		}
		frameRateFloat = (float)frameRateInt;
		}

		err = setVideoFormatOnPort(
		kPortIndexInput, width, height, compressionFormat);
		kPortIndexInput, width, height, compressionFormat, frameRateFloat);

		if (err != OK) {
		return err;
		@@ -2989,7 +2998,8 @@ status_t ACodec::setupErrorCorrectionParameters() {

		status_t ACodec::setVideoFormatOnPort(
		OMX_U32 portIndex,
		int32_t width, int32_t height, OMX_VIDEO_CODINGTYPE compressionFormat) {
		int32_t width, int32_t height, OMX_VIDEO_CODINGTYPE compressionFormat,
		float frameRate) {
		OMX_PARAM_PORTDEFINITIONTYPE def;
		InitOMXParams(&def);
		def.nPortIndex = portIndex;
		@@ -3017,6 +3027,9 @@ status_t ACodec::setVideoFormatOnPort(
		if (portIndex == kPortIndexInput) {
		video_def->eCompressionFormat = compressionFormat;
		video_def->eColorFormat = OMX_COLOR_FormatUnused;
		if (frameRate >= 0) {
		video_def->xFramerate = (OMX_U32)(frameRate * 65536.0f);
		}
		}

		err = mOMX->setParameter(