diff options
| author | Zach Pfeffer <zach.pfeffer@linaro.org> | 2011-12-15 14:57:57 +0000 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-12-17 11:58:18 +0059 |
| commit | aa249482458d38c829f8d6050b4dfc42b779854a (patch) | |
| tree | f7d1331163ed27829a3aebeb5b12e06731dc6a5a | |
| parent | 65b2e318ee5e015a1274340ef47461a64cd4be84 (diff) | |
| download | base-aa249482458d38c829f8d6050b4dfc42b779854a.tar.gz | |
Revert "Stagefright: Improve parsing in AH263Assembler"
This reverts commit de7c5d2ed830443a05a5b02b96b23b5253ed468f
| -rw-r--r-- | media/libstagefright/rtsp/AH263Assembler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/libstagefright/rtsp/AH263Assembler.cpp b/media/libstagefright/rtsp/AH263Assembler.cpp index 8f286ed67b2c..498295c46e1b 100644 --- a/media/libstagefright/rtsp/AH263Assembler.cpp +++ b/media/libstagefright/rtsp/AH263Assembler.cpp @@ -100,17 +100,17 @@ ARTPAssembler::AssemblyStatus AH263Assembler::addPacket( } unsigned payloadHeader = U16_AT(buffer->data()); + CHECK_EQ(payloadHeader >> 11, 0u); // RR=0 unsigned P = (payloadHeader >> 10) & 1; CHECK_EQ((payloadHeader >> 9) & 1, 0u); // V=0 - unsigned PLEN = (payloadHeader >> 3) & 0x3f; - CHECK_LE(PLEN, buffer->size() - 1); + CHECK_EQ((payloadHeader >> 3) & 0x3f, 0u); // PLEN=0 + CHECK_EQ(payloadHeader & 7, 0u); // PEBIT=0 if (P) { - buffer->data()[PLEN] = 0x00; - buffer->data()[PLEN + 1] = 0x00; - buffer->setRange(buffer->offset() + PLEN, buffer->size() - PLEN); + buffer->data()[0] = 0x00; + buffer->data()[1] = 0x00; } else { - buffer->setRange(buffer->offset() + 2 + PLEN, buffer->size() - 2 - PLEN); + buffer->setRange(buffer->offset() + 2, buffer->size() - 2); } mPackets.push_back(buffer); |