diff options
| author | Martin Storsjo <martin@martin.st> | 2013-08-07 14:57:20 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2014-02-11 21:05:39 +0100 |
| commit | 04ed61b1004282a632cdc1277d93183e15a8df93 (patch) | |
| tree | fea7e72e3e4396de890ebfc6a16a05dd7959fb76 | |
| parent | 5930e8ebdacf3a59c13eef11fd03658ba58b443e (diff) | |
| download | frameworks_av-04ed61b1004282a632cdc1277d93183e15a8df93.zip frameworks_av-04ed61b1004282a632cdc1277d93183e15a8df93.tar.gz frameworks_av-04ed61b1004282a632cdc1277d93183e15a8df93.tar.bz2 | |
avcenc: Only do startcode escaping if the next byte requires it
Section 7.4.1 in the H.264 standard says that the only valid bytes
to follow a sequence that starts with 0x000003 are 0x00, 0x01,
0x02 or 0x03.
This makes EncodeDecodeTest pass properly when decoding using
OMX.google.h264.decoder, which is strict about the forbidden
escape sequences.
Change-Id: Ice113d9b934015003ea9cb10d0b21cee4d18d774
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp b/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp index 0e3037f..d71c327 100644 --- a/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp +++ b/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp @@ -103,6 +103,15 @@ AVCEnc_Status AVCBitstreamSaveWord(AVCEncBitstream *stream) { num_bits -= 8; byte = (current_word >> num_bits) & 0xFF; + if (stream->count_zeros == 2) + { /* for num_bits = 32, this can add 2 more bytes extra for EPBS */ + if (byte <= 3) + { + *write_pnt++ = 0x3; + stream->write_pos++; + stream->count_zeros = 0; + } + } if (byte != 0) { *write_pnt++ = byte; @@ -114,12 +123,6 @@ AVCEnc_Status AVCBitstreamSaveWord(AVCEncBitstream *stream) stream->count_zeros++; *write_pnt++ = byte; stream->write_pos++; - if (stream->count_zeros == 2) - { /* for num_bits = 32, this can add 2 more bytes extra for EPBS */ - *write_pnt++ = 0x3; - stream->write_pos++; - stream->count_zeros = 0; - } } } |