If i is greater than 0, it is a requirement of bitstream conformance that
point_y_value[ i ] is greater than point_y_value[ i - 1 ].
If i is greater than 0, it is a requirement of bitstream conformance that
point_cb_value[ i ] is greater than point_cb_value[ i - 1 ].
If i is greater than 0, it is a requirement of bitstream conformance that
point_cr_value[ i ] is greater than point_cr_value[ i - 1 ].
Signed-off-by: James Almer <jamr...@gmail.com>
---
Better version. Now it can't overflow the min value, and will also constrain
the max value to ensure v[i] > v[i-1] is always true.
libavcodec/cbs_av1_syntax_template.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/libavcodec/cbs_av1_syntax_template.c
b/libavcodec/cbs_av1_syntax_template.c
index b62e07fb11..0855f7306f 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -1156,7 +1156,10 @@ static int FUNC(film_grain_params)(CodedBitstreamContext
*ctx, RWContext *rw,
fc(4, num_y_points, 0, 14);
for (i = 0; i < current->num_y_points; i++) {
- fbs(8, point_y_value[i], 1, i);
+ fcs(8, point_y_value[i],
+ i ? current->point_y_value[i - 1] + 1 : 0,
+ MAX_UINT_BITS(8) - (current->num_y_points - i - 1),
+ 1, i);
fbs(8, point_y_scaling[i], 1, i);
}
@@ -1175,12 +1178,18 @@ static int
FUNC(film_grain_params)(CodedBitstreamContext *ctx, RWContext *rw,
} else {
fc(4, num_cb_points, 0, 10);
for (i = 0; i < current->num_cb_points; i++) {
- fbs(8, point_cb_value[i], 1, i);
+ fcs(8, point_cb_value[i],
+ i ? current->point_cb_value[i - 1] + 1 : 0,
+ MAX_UINT_BITS(8) - (current->num_cb_points - i - 1),
+ 1, i);
fbs(8, point_cb_scaling[i], 1, i);
}
fc(4, num_cr_points, 0, 10);
for (i = 0; i < current->num_cr_points; i++) {
- fbs(8, point_cr_value[i], 1, i);
+ fcs(8, point_cr_value[i],
+ i ? current->point_cr_value[i - 1] + 1 : 0,
+ MAX_UINT_BITS(8) - (current->num_cr_points - i - 1),
+ 1, i);
fbs(8, point_cr_scaling[i], 1, i);
}
}
--
2.25.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
