From 3e57322b332214e3cb1874e67a5704c9b2b5f6ec Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 2 Mar 2011 16:18:33 -0800 Subject: Resize internal PES buffers dynamically instead of relying on a fixed maximum size. Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952 --- media/libstagefright/mpeg2ts/ATSParser.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'media') diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp index 5ba4a4f..7d4bc6e 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -369,7 +369,18 @@ void ATSParser::Stream::parse( size_t payloadSizeBits = br->numBitsLeft(); CHECK_EQ(payloadSizeBits % 8, 0u); - CHECK_LE(mBuffer->size() + payloadSizeBits / 8, mBuffer->capacity()); + size_t neededSize = mBuffer->size() + payloadSizeBits / 8; + if (mBuffer->capacity() < neededSize) { + // Increment in multiples of 64K. + neededSize = (neededSize + 65535) & ~65535; + + LOGI("resizing buffer to %d bytes", neededSize); + + sp newBuffer = new ABuffer(neededSize); + memcpy(newBuffer->data(), mBuffer->data(), mBuffer->size()); + newBuffer->setRange(0, mBuffer->size()); + mBuffer = newBuffer; + } memcpy(mBuffer->data() + mBuffer->size(), br->data(), payloadSizeBits / 8); mBuffer->setRange(0, mBuffer->size() + payloadSizeBits / 8); -- cgit v1.1