Merge "MediaCodec: recognize KEY_CAPTURE_RATE" into qt-qpr1-dev (727ba2ad) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodec.cpp

+11 −3

Original line number	Diff line number	Diff line
		@@ -814,9 +814,17 @@ void CCodec::configure(const sp<AMessage> &msg) {
		}

		{
		double value;
		if (msg->findDouble("time-lapse-fps", &value)) {
		config->mISConfig->mCaptureFps = value;
		bool captureFpsFound = false;
		double timeLapseFps;
		float captureRate;
		if (msg->findDouble("time-lapse-fps", &timeLapseFps)) {
		config->mISConfig->mCaptureFps = timeLapseFps;
		captureFpsFound = true;
		} else if (msg->findAsFloat(KEY_CAPTURE_RATE, &captureRate)) {
		config->mISConfig->mCaptureFps = captureRate;
		captureFpsFound = true;
		}
		if (captureFpsFound) {
		(void)msg->findAsFloat(KEY_FRAME_RATE, &config->mISConfig->mCodedFps);
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -1844,8 +1844,13 @@ status_t ACodec::configureCodec(
		}

		if (!msg->findDouble("time-lapse-fps", &mCaptureFps)) {
		float captureRate;
		if (msg->findAsFloat(KEY_CAPTURE_RATE, &captureRate)) {
		mCaptureFps = captureRate;
		} else {
		mCaptureFps = -1.0;
		}
		}

		if (!msg->findInt32(
		KEY_CREATE_INPUT_SURFACE_SUSPENDED,