zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VP9 parser: undo r34393 and fix incorrect return statement.

Browse Source 
Some code was deleted in
https://webrtc-review.googlesource.com/c/src/+/224266/2/modules/video_coding/utility/vp9_uncompressed_header_parser.cc
since it was detected as unreachable.
The root cause was an early return that should have been a
RETURN_IF_FALSE(x).

Bug: webrtc:12924
Change-Id: Ifadded9bbb4748d56cf65c30fd8f87e92fde10d8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/225040
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34422}
This commit is contained in:
Erik Språng
2021-07-06 15:05:24 +02:00
committed by WebRTC LUCI CQ
parent 54388a876a
commit 5a5d751aa5
3 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/video_coding/utility/vp9_uncompressed_header_parser.cc
View File

@ -300,7 +300,12 @@ bool Vp9ReadQp(BitstreamReader* br, FrameInfo* frame_info) {
}
bool Vp9ReadSegmentationParams(BitstreamReader* br) {
return br->IfNextBoolean([&] { // segmentation_enabled
constexpr int kVp9MaxSegments = 8;
constexpr int kVp9SegLvlMax = 4;
constexpr int kSegmentationFeatureBits[kVp9SegLvlMax] = {8, 6, 2, 0};
constexpr bool kSegmentationFeatureSigned[kVp9SegLvlMax] = {1, 1, 0, 0};
RETURN_IF_FALSE(br->IfNextBoolean([&] { // segmentation_enabled
return br->IfNextBoolean([&] { // update_map
// Consume probs.
for (int i = 0; i < 7; ++i) {
@ -316,6 +321,19 @@ bool Vp9ReadSegmentationParams(BitstreamReader* br) {
return true;
});
});
}));
return br->IfNextBoolean([&] {
RETURN_IF_FALSE(br->ConsumeBits(1)); // abs_or_delta
for (int i = 0; i < kVp9MaxSegments; ++i) {
for (int j = 0; j < kVp9SegLvlMax; ++j) {
RETURN_IF_FALSE(br->IfNextBoolean([&] { // feature_enabled
return br->ConsumeBits(kSegmentationFeatureBits[j] +
kSegmentationFeatureSigned[j]);
}));
}
}
return true;
});
}