diff options
| author | Andreas Huber <andih@google.com> | 2011-01-18 11:52:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-18 11:52:02 -0800 |
| commit | 529fc53d3fd298ee5aef20e3a07bd263f7376b8d (patch) | |
| tree | 009c1ee3f8096f48937261e1b80489e7b70b8cec /media/libstagefright | |
| parent | 8d48c3d21f78cc2bc94682731d64b23ec0899824 (diff) | |
| parent | 77034e6393838b391eb3a54e4ac6d6715cd45dac (diff) | |
| download | frameworks_base-529fc53d3fd298ee5aef20e3a07bd263f7376b8d.zip frameworks_base-529fc53d3fd298ee5aef20e3a07bd263f7376b8d.tar.gz frameworks_base-529fc53d3fd298ee5aef20e3a07bd263f7376b8d.tar.bz2 | |
Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/rtsp/APacketSource.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/media/libstagefright/rtsp/APacketSource.cpp b/media/libstagefright/rtsp/APacketSource.cpp index 10cc88b..f0b858d 100644 --- a/media/libstagefright/rtsp/APacketSource.cpp +++ b/media/libstagefright/rtsp/APacketSource.cpp @@ -373,7 +373,17 @@ static bool ExtractDimensionsFromVOLHeader( br.skipBits(2); // chroma_format br.skipBits(1); // low_delay if (br.getBits(1)) { // vbv_parameters - TRESPASS(); + br.skipBits(15); // first_half_bit_rate + CHECK(br.getBits(1)); // marker_bit + br.skipBits(15); // latter_half_bit_rate + CHECK(br.getBits(1)); // marker_bit + br.skipBits(15); // first_half_vbv_buffer_size + CHECK(br.getBits(1)); // marker_bit + br.skipBits(3); // latter_half_vbv_buffer_size + br.skipBits(11); // first_half_vbv_occupancy + CHECK(br.getBits(1)); // marker_bit + br.skipBits(15); // latter_half_vbv_occupancy + CHECK(br.getBits(1)); // marker_bit } } unsigned video_object_layer_shape = br.getBits(2); |