diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 11:30:21 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-10-18 10:39:29 -0700 |
| commit | acc82a3bad22af17008a839d993e3bd7a5d9b5af (patch) | |
| tree | fbf0e52ff4c314d168ccf49d60eee2e0c8a0a54b | |
| parent | 56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627 (diff) | |
| download | frameworks_av-acc82a3bad22af17008a839d993e3bd7a5d9b5af.zip frameworks_av-acc82a3bad22af17008a839d993e3bd7a5d9b5af.tar.gz frameworks_av-acc82a3bad22af17008a839d993e3bd7a5d9b5af.tar.bz2 | |
If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
| -rw-r--r-- | media/libstagefright/MPEG2TSWriter.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG2TSWriter.cpp b/media/libstagefright/MPEG2TSWriter.cpp index b3daf67..81a2b0d 100644 --- a/media/libstagefright/MPEG2TSWriter.cpp +++ b/media/libstagefright/MPEG2TSWriter.cpp @@ -725,6 +725,14 @@ void MPEG2TSWriter::writeAccessUnit( size_t PES_packet_length = accessUnit->size() + 8; + if (PES_packet_length >= 65536) { + // This really should only happen for video. + CHECK_EQ(stream_id, 0xe0u); + + // It's valid to set this to 0 for video according to the specs. + PES_packet_length = 0; + } + uint8_t *ptr = buffer->data(); *ptr++ = 0x47; *ptr++ = 0x40 | (PID >> 8); |