History

avcodec/vvcdec: derive subpic position for PPS

Nuo Mi committed 2 years ago

Commit 4e478471 parent 8078a0b2 files · +23 −0Browse files

Unified · Split

2 files
  1. libavcodec/vvc/vvc_ps.c +19 −0
  2. libavcodec/vvc/vvc_ps.h +4 −0
libavcodec/vvc/vvc_ps.c+19−0
@@ -516,6 +516,24 @@ static void pps_ref_wraparound_offset(VVCPPS *pps, const VVCSPS *sps) · 515 unmodified lines
516516 pps->ref_wraparound_offset = (pps->width / sps->min_cb_size_y) - r->pps_pic_width_minus_wraparound_offset;
517517 }
518518
519+static void pps_subpic(VVCPPS *pps, const VVCSPS *sps)
520+{
521+ const H266RawSPS *rsps = sps->r;
522+ for (int i = 0; i < rsps->sps_num_subpics_minus1 + 1; i++) {
523+ if (rsps->sps_subpic_treated_as_pic_flag[i]) {
524+ pps->subpic_x[i] = rsps->sps_subpic_ctu_top_left_x[i] << sps->ctb_log2_size_y;
525+ pps->subpic_y[i] = rsps->sps_subpic_ctu_top_left_y[i] << sps->ctb_log2_size_y;
526+ pps->subpic_width[i] = FFMIN(pps->width - pps->subpic_x[i], (rsps->sps_subpic_width_minus1[i] + 1) << sps->ctb_log2_size_y);
527+ pps->subpic_height[i] = FFMIN(pps->height - pps->subpic_y[i], (rsps->sps_subpic_height_minus1[i] + 1) << sps->ctb_log2_size_y);
528+ } else {
529+ pps->subpic_x[i] = 0;
530+ pps->subpic_y[i] = 0;
531+ pps->subpic_width[i] = pps->width;
532+ pps->subpic_height[i] = pps->height;
533+ }
534+ }
535+}
536+
519537 static int pps_derive(VVCPPS *pps, const VVCSPS *sps)
520538 {
521539 int ret;
@@ -532,6 +550,7 @@ static int pps_derive(VVCPPS *pps, const VVCSPS *sps) · 10 unmodified lines
532550 return ret;
533551
534552 pps_ref_wraparound_offset(pps, sps);
553+ pps_subpic(pps, sps);
535554
536555 return 0;
537556 }
libavcodec/vvc/vvc_ps.h+4−0
@@ -127,6 +127,10 @@ typedef struct VVCPPS { · 126 unmodified lines
127127
128128 uint16_t ref_wraparound_offset; ///< PpsRefWraparoundOffset
129129
130+ uint16_t subpic_x[VVC_MAX_SLICES]; ///< SubpicLeftBoundaryPos
131+ uint16_t subpic_y[VVC_MAX_SLICES]; ///< SubpicTopBoundaryPos
132+ uint16_t subpic_width[VVC_MAX_SLICES];
133+ uint16_t subpic_height[VVC_MAX_SLICES];
130134 } VVCPPS;
131135
132136 #define MAX_WEIGHTS 15

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