Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-dev (c4706396) · Commits · e / os / android_frameworks_av

media/libstagefright/Utils.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ status_t convertMetaDataToMessage(
		}

		int32_t fps;
		if (meta->findInt32(kKeyFrameRate, &fps)) {
		if (meta->findInt32(kKeyFrameRate, &fps) && fps > 0) {
		msg->setInt32("frame-rate", fps);
		}

		@@ -664,7 +664,7 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) {
		}

		int32_t fps;
		if (msg->findInt32("frame-rate", &fps)) {
		if (msg->findInt32("frame-rate", &fps) && fps > 0) {
		meta->setInt32(kKeyFrameRate, fps);
		}