Merge "stagefrights: propagate bitrate to muxers" into nyc-dev (70bdd112) · Commits · e / os / android_frameworks_av

media/libstagefright/Utils.cpp

+19 −7

Original line number	Diff line number	Diff line
		@@ -576,13 +576,14 @@ status_t convertMetaDataToMessage(
		msg->setInt64("durationUs", durationUs);
		}

		int32_t avgBitRate;
		if (meta->findInt32(kKeyBitRate, &avgBitRate)) {
		int32_t avgBitRate = 0;
		if (meta->findInt32(kKeyBitRate, &avgBitRate) && avgBitRate > 0) {
		msg->setInt32("bitrate", avgBitRate);
		}

		int32_t maxBitRate;
		if (meta->findInt32(kKeyMaxBitRate, &maxBitRate)) {
		if (meta->findInt32(kKeyMaxBitRate, &maxBitRate)
		&& maxBitRate > 0 && maxBitRate >= avgBitRate) {
		msg->setInt32("max-bitrate", maxBitRate);
		}

		@@ -908,13 +909,15 @@ status_t convertMetaDataToMessage(

		uint32_t maxBitrate, avgBitrate;
		if (esds.getBitRate(&maxBitrate, &avgBitrate) == OK) {
		if (!meta->hasData(kKeyMaxBitRate)
		&& maxBitrate > 0 && maxBitrate <= INT32_MAX) {
		msg->setInt32("max-bitrate", (int32_t)maxBitrate);
		}
		if (!meta->hasData(kKeyBitRate)
		&& avgBitrate > 0 && avgBitrate <= INT32_MAX) {
		msg->setInt32("bitrate", (int32_t)avgBitrate);
		} else {
		(void)msg->findInt32("bitrate", (int32_t*)&avgBitrate);
		}
		if (!meta->hasData(kKeyMaxBitRate)
		&& maxBitrate > 0 && maxBitrate <= INT32_MAX && maxBitrate >= avgBitrate) {
		msg->setInt32("max-bitrate", (int32_t)maxBitrate);
		}
		}
		} else if (meta->findData(kTypeD263, &type, &data, &size)) {
		@@ -1211,6 +1214,15 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) {
		meta->setInt32(kKeyIsSyncFrame, 1);
		}

		int32_t avgBitrate = 0;
		int32_t maxBitrate;
		if (msg->findInt32("bitrate", &avgBitrate) && avgBitrate > 0) {
		meta->setInt32(kKeyBitRate, avgBitrate);
		}
		if (msg->findInt32("max-bitrate", &maxBitrate) && maxBitrate > 0 && maxBitrate >= avgBitrate) {
		meta->setInt32(kKeyMaxBitRate, maxBitrate);
		}

		if (mime.startsWith("video/")) {
		int32_t width;
		int32_t height;