HLS: parse stream resolution and set maxWidth/maxHeight (a0d0ba51) · Commits · e / os / android_frameworks_av

include/media/stagefright/MetaData.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,8 @@ enum {
	kKeyDecoderComponent = 'decC', // cstring		kKeyDecoderComponent = 'decC', // cstring
	kKeyBufferID = 'bfID',		kKeyBufferID = 'bfID',
	kKeyMaxInputSize = 'inpS',		kKeyMaxInputSize = 'inpS',
			kKeyMaxWidth = 'maxW',
			kKeyMaxHeight = 'maxH',
	kKeyThumbnailTime = 'thbT', // int64_t (usecs)		kKeyThumbnailTime = 'thbT', // int64_t (usecs)
	kKeyTrackID = 'trID',		kKeyTrackID = 'trID',
	kKeyIsDRM = 'idrm', // int32_t (bool)		kKeyIsDRM = 'idrm', // int32_t (bool)

media/libstagefright/Utils.cpp

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -166,6 +166,16 @@ status_t convertMetaDataToMessage(
	msg->setInt32("max-input-size", maxInputSize);		msg->setInt32("max-input-size", maxInputSize);
	}		}

			int32_t maxWidth;
			if (meta->findInt32(kKeyMaxWidth, &maxWidth)) {
			msg->setInt32("max-width", maxWidth);
			}

			int32_t maxHeight;
			if (meta->findInt32(kKeyMaxHeight, &maxHeight)) {
			msg->setInt32("max-height", maxHeight);
			}

	int32_t rotationDegrees;		int32_t rotationDegrees;
	if (meta->findInt32(kKeyRotation, &rotationDegrees)) {		if (meta->findInt32(kKeyRotation, &rotationDegrees)) {
	msg->setInt32("rotation-degrees", rotationDegrees);		msg->setInt32("rotation-degrees", rotationDegrees);
	@@ -568,6 +578,16 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) {
	meta->setInt32(kKeyMaxInputSize, maxInputSize);		meta->setInt32(kKeyMaxInputSize, maxInputSize);
	}		}

			int32_t maxWidth;
			if (msg->findInt32("max-width", &maxWidth)) {
			meta->setInt32(kKeyMaxWidth, maxWidth);
			}

			int32_t maxHeight;
			if (msg->findInt32("max-height", &maxHeight)) {
			meta->setInt32(kKeyMaxHeight, maxHeight);
			}

	// reassemble the csd data into its original form		// reassemble the csd data into its original form
	sp<ABuffer> csd0;		sp<ABuffer> csd0;
	if (msg->findBuffer("csd-0", &csd0)) {		if (msg->findBuffer("csd-0", &csd0)) {

media/libstagefright/httplive/LiveSession.cpp

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -171,6 +171,8 @@ LiveSession::LiveSession(
	mOrigBandwidthIndex(-1),		mOrigBandwidthIndex(-1),
	mLastBandwidthBps(-1ll),		mLastBandwidthBps(-1ll),
	mBandwidthEstimator(new BandwidthEstimator()),		mBandwidthEstimator(new BandwidthEstimator()),
			mMaxWidth(720),
			mMaxHeight(480),
	mStreamMask(0),		mStreamMask(0),
	mNewStreamMask(0),		mNewStreamMask(0),
	mSwapMask(0),		mSwapMask(0),
	@@ -345,6 +347,9 @@ status_t LiveSession::getStreamFormat(StreamType stream, sp<AMessage> *format) {
	if (stream == STREAMTYPE_AUDIO) {		if (stream == STREAMTYPE_AUDIO) {
	// set AAC input buffer size to 32K bytes (256kbps x 1sec)		// set AAC input buffer size to 32K bytes (256kbps x 1sec)
	meta->setInt32(kKeyMaxInputSize, 32 * 1024);		meta->setInt32(kKeyMaxInputSize, 32 * 1024);
			} else if (stream == STREAMTYPE_VIDEO) {
			meta->setInt32(kKeyMaxWidth, mMaxWidth);
			meta->setInt32(kKeyMaxHeight, mMaxHeight);
	}		}

	return convertMetaDataToMessage(meta, format);		return convertMetaDataToMessage(meta, format);
	@@ -847,6 +852,9 @@ void LiveSession::onConnect(const sp<AMessage> &msg) {
	size_t initialBandwidth = 0;		size_t initialBandwidth = 0;
	size_t initialBandwidthIndex = 0;		size_t initialBandwidthIndex = 0;

			int32_t maxWidth = 0;
			int32_t maxHeight = 0;

	if (mPlaylist->isVariantPlaylist()) {		if (mPlaylist->isVariantPlaylist()) {
	Vector<BandwidthItem> itemsWithVideo;		Vector<BandwidthItem> itemsWithVideo;
	for (size_t i = 0; i < mPlaylist->size(); ++i) {		for (size_t i = 0; i < mPlaylist->size(); ++i) {
	@@ -860,6 +868,14 @@ void LiveSession::onConnect(const sp<AMessage> &msg) {

	CHECK(meta->findInt32("bandwidth", (int32_t *)&item.mBandwidth));		CHECK(meta->findInt32("bandwidth", (int32_t *)&item.mBandwidth));

			int32_t width, height;
			if (meta->findInt32("width", &width)) {
			maxWidth = max(maxWidth, width);
			}
			if (meta->findInt32("height", &height)) {
			maxHeight = max(maxHeight, height);
			}

	mBandwidthItems.push(item);		mBandwidthItems.push(item);
	if (mPlaylist->hasType(i, "video")) {		if (mPlaylist->hasType(i, "video")) {
	itemsWithVideo.push(item);		itemsWithVideo.push(item);
	@@ -893,6 +909,9 @@ void LiveSession::onConnect(const sp<AMessage> &msg) {
	mBandwidthItems.push(item);		mBandwidthItems.push(item);
	}		}

			mMaxWidth = maxWidth > 0 ? maxWidth : mMaxWidth;
			mMaxHeight = maxHeight > 0 ? maxHeight : mMaxHeight;

	mPlaylist->pickRandomMediaItems();		mPlaylist->pickRandomMediaItems();
	changeConfiguration(		changeConfiguration(
	0ll /* timeUs /, initialBandwidthIndex, false / pickTrack */);		0ll /* timeUs /, initialBandwidthIndex, false / pickTrack */);

media/libstagefright/httplive/LiveSession.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -191,6 +191,8 @@ private:
	sp<BandwidthEstimator> mBandwidthEstimator;		sp<BandwidthEstimator> mBandwidthEstimator;

	sp<M3UParser> mPlaylist;		sp<M3UParser> mPlaylist;
			int32_t mMaxWidth;
			int32_t mMaxHeight;

	sp<ALooper> mFetcherLooper;		sp<ALooper> mFetcherLooper;
	KeyedVector<AString, FetcherInfo> mFetcherInfos;		KeyedVector<AString, FetcherInfo> mFetcherInfos;

media/libstagefright/httplive/M3UParser.cpp

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -808,6 +808,29 @@ status_t M3UParser::parseStreamInf(
	*meta = new AMessage;		*meta = new AMessage;
	}		}
	(*meta)->setString(key.c_str(), codecs.c_str());		(*meta)->setString(key.c_str(), codecs.c_str());
			} else if (!strcasecmp("resolution", key.c_str())) {
			const char *s = val.c_str();
			char *end;
			unsigned long width = strtoul(s, &end, 10);

			if (end == s \|\| *end != 'x') {
			// malformed
			continue;
			}

			s = end + 1;
			unsigned long height = strtoul(s, &end, 10);

			if (end == s \|\| *end != '\0') {
			// malformed
			continue;
			}

			if (meta->get() == NULL) {
			*meta = new AMessage;
			}
			(*meta)->setInt32("width", width);
			(*meta)->setInt32("height", height);
	} else if (!strcasecmp("audio", key.c_str())		} else if (!strcasecmp("audio", key.c_str())
	\|\| !strcasecmp("video", key.c_str())		\|\| !strcasecmp("video", key.c_str())
	\|\| !strcasecmp("subtitles", key.c_str())) {		\|\| !strcasecmp("subtitles", key.c_str())) {