admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove wrong range check for CurrRpsIdx and fix its naming.

Browse Source 
CurrRpsIdx value is specified in spec section 7.4.7.1. CurrRpsIdx can be
non-zero and the check here makes no sense.

Bug: webrtc:13485
Change-Id: Ie7b7fab3286fdb812fca7aaf6f68bb5a8df81386
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347764
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42122}
This commit is contained in:
Qiu Jianlin 2024-04-17 23:09:07 +08:00 committed by WebRTC LUCI CQ
parent ec2fda9daa
commit d9c1b335b7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common_video/h265/h265_bitstream_parser.cc
View File

@ -276,18 +276,16 @@ H265BitstreamParser::Result H265BitstreamParser::ParseNonParameterSetNalu(
} }
uint32_t num_pic_total_curr = 0; uint32_t num_pic_total_curr = 0;
uint32_t curr_sps_idx = 0; uint32_t curr_rps_idx = 0;
if (short_term_ref_pic_set_sps_flag) { if (short_term_ref_pic_set_sps_flag) {
curr_sps_idx = short_term_ref_pic_set_idx; curr_rps_idx = short_term_ref_pic_set_idx;
} else { } else {
curr_sps_idx = sps->num_short_term_ref_pic_sets; curr_rps_idx = sps->num_short_term_ref_pic_sets;
}
if (sps->short_term_ref_pic_set.size() <= curr_sps_idx) {
TRUE_OR_RETURN(!(curr_sps_idx != 0 || short_term_ref_pic_set_sps_flag));
} }
const H265SpsParser::ShortTermRefPicSet* ref_pic_set; const H265SpsParser::ShortTermRefPicSet* ref_pic_set;
if (curr_sps_idx < sps->short_term_ref_pic_set.size()) { if (curr_rps_idx < sps->short_term_ref_pic_set.size()) {
ref_pic_set = &(sps->short_term_ref_pic_set[curr_sps_idx]); ref_pic_set = &(sps->short_term_ref_pic_set[curr_rps_idx]);
} else { } else {
ref_pic_set = &short_term_ref_pic_set; ref_pic_set = &short_term_ref_pic_set;
} }