History

avcodec/cbs_h265: fix valid range for {left,right}_view_id

view_id_len in VPS is 4 bits, so view_id values can be up to 15 bits long.

James Almer committed 2 years ago

Commit 853c1651 parent 6611bf52 files · +4 −4Browse files

Unified · Split

2 files
  1. libavcodec/cbs_h265.h +2 −2
  2. libavcodec/cbs_h265_syntax_template.c +2 −2
libavcodec/cbs_h265.h+2−2
@@ -725,8 +725,8 @@ typedef struct H265RawSEI3DReferenceDisplaysInfo { · 724 unmodified lines
725 uint8_t ref_viewing_distance_flag;725 uint8_t ref_viewing_distance_flag;
726 uint8_t prec_ref_viewing_dist;726 uint8_t prec_ref_viewing_dist;
727 uint8_t num_ref_displays_minus1;727 uint8_t num_ref_displays_minus1;
728 uint8_t left_view_id[31];728 uint16_t left_view_id[31];
729 uint8_t right_view_id[31];729 uint16_t right_view_id[31];
730 uint8_t exponent_ref_display_width[31];730 uint8_t exponent_ref_display_width[31];
731 uint8_t mantissa_ref_display_width[31];731 uint8_t mantissa_ref_display_width[31];
732 uint8_t exponent_ref_viewing_distance[31];732 uint8_t exponent_ref_viewing_distance[31];
libavcodec/cbs_h265_syntax_template.c+2−2
@@ -2299,8 +2299,8 @@ SEI_FUNC(sei_3d_reference_displays_info, (CodedBitstreamContext *ctx, RWContext · 2298 unmodified lines
2299 ue(prec_ref_viewing_dist, 0, 31);2299 ue(prec_ref_viewing_dist, 0, 31);
2300 ue(num_ref_displays_minus1, 0, 31);2300 ue(num_ref_displays_minus1, 0, 31);
2301 for (i = 0; i <= current->num_ref_displays_minus1; i++) {2301 for (i = 0; i <= current->num_ref_displays_minus1; i++) {
2302 ues(left_view_id[i], 0, UINT8_MAX, 1, i);2302 ues(left_view_id[i], 0, MAX_UINT_BITS(15), 1, i);
2303 ues(right_view_id[i], 0, UINT8_MAX, 1, i);2303 ues(right_view_id[i], 0, MAX_UINT_BITS(15), 1, i);
2304 us(6, exponent_ref_display_width[i], 0, 62, 1, i);2304 us(6, exponent_ref_display_width[i], 0, 62, 1, i);
2305 if (!current->exponent_ref_display_width[i])2305 if (!current->exponent_ref_display_width[i])
2306 length = FFMAX(0, (int)current->prec_ref_display_width - 30);2306 length = FFMAX(0, (int)current->prec_ref_display_width - 30);

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