Merge "stagefright: propagate float frame rates to MetaData" into nyc-dev (25df0fc0) · Commits · e / os / android_frameworks_av

media/libstagefright/Utils.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -828,8 +828,13 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) {
		}

		int32_t fps;
		float fpsFloat;
		if (msg->findInt32("frame-rate", &fps) && fps > 0) {
		meta->setInt32(kKeyFrameRate, fps);
		} else if (msg->findFloat("frame-rate", &fpsFloat)
		&& fpsFloat >= 1 && fpsFloat <= INT32_MAX) {
		// truncate values to distinguish between e.g. 24 vs 23.976 fps
		meta->setInt32(kKeyFrameRate, (int32_t)fpsFloat);
		}

		// reassemble the csd data into its original form