Commit 8aa5af70 authored Apr 19, 2011 by Sunil Shah Committed by Johan Redestig Oct 23, 2015

Handle malformed audio packets received during RTSP stream switching

During RTSP stream switching (for example channel switching in a
Mobile TV application) we occasionally receive packets that
don't contain valid data, so we cannot remove LATM framing (as per
the MPEG4 Audio Assembler).  This fix allows the frame remover
to exit gracefully (instead of crashing), when such frames are
encountered, and as a consequence, Mobile TV apps can change
channels properly.

Change-Id: Ie4c3d2766c87b43f31624192de96bc47180ca514

parent 2d772fd4

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -379,7 +379,10 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) {
		unsigned muxSlotLengthBytes = 0;
		unsigned tmp;
		do {
		CHECK_LT(offset, buffer->size());
		if (offset >= buffer->size()) {
		ALOGW("Malformed buffer received");
		return out;
		}
		tmp = ptr[offset++];
		muxSlotLengthBytes += tmp;
		} while (tmp == 0xff);