History

avcodec/cbs_h266: store SubpicIdVal in the context

And use it to derive CurrSubpicIdx

James Almer committed 3 years ago

Commit a77f5011 parent e7f152a2 files · +18 −17Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files
  1. libavcodec/cbs_h266.h +1 −0
  2. libavcodec/cbs_h266_syntax_template.c +17 −17
libavcodec/cbs_h266.h+1−0
@@ -552,6 +552,7 @@ typedef struct H266RawPPS { · 551 unmodified lines
552 uint16_t num_tiles_in_pic;552 uint16_t num_tiles_in_pic;
553 uint16_t slice_height_in_ctus[VVC_MAX_SLICES];553 uint16_t slice_height_in_ctus[VVC_MAX_SLICES];
554 uint16_t num_slices_in_subpic[VVC_MAX_SLICES];554 uint16_t num_slices_in_subpic[VVC_MAX_SLICES];
555 uint16_t sub_pic_id_val[VVC_MAX_SLICES];
555} H266RawPPS;556} H266RawPPS;
556 557
557typedef struct H266RawAUD {558typedef struct H266RawAUD {
libavcodec/cbs_h266_syntax_template.c+17−17
@@ -1706,6 +1706,15 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, · 1705 unmodified lines
1706 }1706 }
1707 }1707 }
1708 1708
1709 for (i = 0; i <= sps->sps_num_subpics_minus1; i++) {
1710 if (sps->sps_subpic_id_mapping_explicitly_signalled_flag)
1711 current->sub_pic_id_val[i] = current->pps_subpic_id_mapping_present_flag
1712 ? current->pps_subpic_id[i]
1713 : sps->sps_subpic_id[i];
1714 else
1715 current->sub_pic_id_val[i] = i;
1716 }
1717
1709 pic_width_in_ctbs_y = AV_CEIL_RSHIFT1718 pic_width_in_ctbs_y = AV_CEIL_RSHIFT
1710 (current->pps_pic_width_in_luma_samples, (sps->sps_log2_ctu_size_minus5 + 5));1719 (current->pps_pic_width_in_luma_samples, (sps->sps_log2_ctu_size_minus5 + 5));
1711 pic_height_in_ctbs_y = AV_CEIL_RSHIFT(1720 pic_height_in_ctbs_y = AV_CEIL_RSHIFT(
@@ -2697,25 +2706,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, · 985 unmodified lines
2697 2706
2698 if (sps->sps_subpic_info_present_flag) {2707 if (sps->sps_subpic_info_present_flag) {
2699 ub(sps->sps_subpic_id_len_minus1 + 1, sh_subpic_id);2708 ub(sps->sps_subpic_id_len_minus1 + 1, sh_subpic_id);
2700 if (sps->sps_subpic_id_mapping_explicitly_signalled_flag) {2709 for (i = 0; i <= sps->sps_num_subpics_minus1; i++) {
2701 for (i = 0; i <= sps->sps_num_subpics_minus1; i++) {2710 if (pps->sub_pic_id_val[i] == current->sh_subpic_id) {
2702 uint16_t subpic_id_val =2711 curr_subpic_idx = i;
2703 pps->pps_subpic_id_mapping_present_flag ?2712 break;
2704 pps->pps_subpic_id[i] : sps->sps_subpic_id[i];
2705 if (subpic_id_val == current->sh_subpic_id) {
2706 curr_subpic_idx = i;
2707 break;
2708 }
2709 }
2710 } else {
2711 curr_subpic_idx = current->sh_subpic_id;
2712 if (curr_subpic_idx > sps->sps_num_subpics_minus1) {
2713 av_log(ctx->log_ctx, AV_LOG_ERROR,
2714 "sh_subpic_id(%d) should in range [0, %d]\n",
2715 curr_subpic_idx, sps->sps_num_subpics_minus1);
2716 return AVERROR_INVALIDDATA;
2717 }2713 }
2718 }2714 }
2715 if (i > sps->sps_num_subpics_minus1) {
2716 av_log(ctx->log_ctx, AV_LOG_ERROR, "invalid CurrSubpicIdx %d\n", i);
2717 return AVERROR_INVALIDDATA;
2718 }
2719 } else {2719 } else {
2720 curr_subpic_idx = 0;2720 curr_subpic_idx = 0;
2721 }2721 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t