summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-02 16:18:33 -0800
committerAndreas Huber <andih@google.com>2011-03-02 16:18:33 -0800
commit56e84ba1506399f78125db838dab8db5816fe731 (patch)
treed351156102ca11bdf21a85e4b4a79e7cbe0f30d7 /media/libstagefright
parent669ad13de924af145771837b339c882e30ea8ce2 (diff)
downloadframeworks_base-56e84ba1506399f78125db838dab8db5816fe731.zip
frameworks_base-56e84ba1506399f78125db838dab8db5816fe731.tar.gz
frameworks_base-56e84ba1506399f78125db838dab8db5816fe731.tar.bz2
Resize internal PES buffers dynamically instead of relying on a fixed maximum size.
Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/mpeg2ts/ATSParser.cpp13
1 files changed, 12 insertions, 1 deletions
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<ABuffer> 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);