Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(287)

Unified Diff: webrtc/modules/video_coding/utility/h264_bitstream_parser.cc

Issue 2373393002: Support for parsing CABAC coded bitstreams (Closed)
Patch Set: update test data Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/utility/h264_bitstream_parser.cc
diff --git a/webrtc/modules/video_coding/utility/h264_bitstream_parser.cc b/webrtc/modules/video_coding/utility/h264_bitstream_parser.cc
index 97cd0038695ca5f30fe4bccb48b32b1392b02b67..92b2935a323db02a72bf6d1acd5f2c1fc1c8ba8b 100644
--- a/webrtc/modules/video_coding/utility/h264_bitstream_parser.cc
+++ b/webrtc/modules/video_coding/utility/h264_bitstream_parser.cc
@@ -240,9 +240,11 @@ bool H264BitstreamParser::ParseNonParameterSetNalu(const uint8_t* source,
}
}
}
- // cabac not supported: entropy_coding_mode_flag == 0 asserted above.
- // if (entropy_coding_mode_flag && slice_type != I && slice_type != SI)
- // cabac_init_idc
+ if (pps_->entropy_coding_mode_flag &&
+ slice_type != H264::SliceType::kI && slice_type != H264::SliceType::kSi) {
+ // cabac_init_idc: ue(v)
+ RETURN_FALSE_ON_FAIL(slice_reader.ReadExponentialGolomb(&golomb_tmp));
+ }
int32_t last_slice_qp_delta;
RETURN_FALSE_ON_FAIL(
slice_reader.ReadSignedExponentialGolomb(&last_slice_qp_delta));
« no previous file with comments | « webrtc/common_video/h264/pps_parser_unittest.cc ('k') | webrtc/modules/video_coding/utility/h264_bitstream_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698