April 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/avf_ahistogram: properly name pads
by Paul B Mahol 29 Apr '19

29 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Apr 29 12:28:38 2019 +0200| [a66324cd52f5f77559c5b36c8dc3cda401c9eddc] | committer: Paul B Mahol avfilter/avf_ahistogram: properly name pads > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a66324cd52f5f7755… --- libavfilter/avf_ahistogram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/avf_ahistogram.c b/libavfilter/avf_ahistogram.c index 587415175b..6daafb0746 100644 --- a/libavfilter/avf_ahistogram.c +++ b/libavfilter/avf_ahistogram.c @@ -382,7 +382,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->in[i]); } -static const AVFilterPad audiovectorscope_inputs[] = { +static const AVFilterPad ahistogram_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, @@ -392,7 +392,7 @@ static const AVFilterPad audiovectorscope_inputs[] = { { NULL } }; -static const AVFilterPad audiovectorscope_outputs[] = { +static const AVFilterPad ahistogram_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -407,7 +407,7 @@ AVFilter ff_avf_ahistogram = { .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(AudioHistogramContext), - .inputs = audiovectorscope_inputs, - .outputs = audiovectorscope_outputs, + .inputs = ahistogram_inputs, + .outputs = ahistogram_outputs, .priv_class = &ahistogram_class, };

1 0

avfilter/avf_showspectrum: add log scale for frequency plot
by Paul B Mahol 29 Apr '19

29 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Apr 28 20:15:17 2019 +0200| [ce774e30ffe3caf6ba5141b38b8d37de6ecd7d5b] | committer: Paul B Mahol avfilter/avf_showspectrum: add log scale for frequency plot > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce774e30ffe3caf6b… --- doc/filters.texi | 26 +++++ libavfilter/avf_showspectrum.c | 239 ++++++++++++++++++++++++++++++----------- 2 files changed, 200 insertions(+), 65 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 14c33ecf90..7cc3937b40 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -22226,6 +22226,19 @@ logarithmic Default value is @samp{sqrt}. +@item fscale +Specify frequency scale. + +It accepts the following values: +@table @samp +@item lin +linear +@item log +logarithmic +@end table + +Default value is @samp{lin}. + @item saturation Set saturation modifier for displayed colors. Negative values provide alternative color scheme. @code{0} is no saturation at all. @@ -22398,6 +22411,19 @@ logarithmic @end table Default value is @samp{log}. +@item fscale +Specify frequency scale. + +It accepts the following values: +@table @samp +@item lin +linear +@item log +logarithmic +@end table + +Default value is @samp{lin}. + @item saturation Set saturation modifier for displayed colors. Negative values provide alternative color scheme. @code{0} is no saturation at all. diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index e8d3f1ec8d..8186023a0a 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -45,6 +45,7 @@ enum DisplayMode { COMBINED, SEPARATE, NB_MODES }; enum DataMode { D_MAGNITUDE, D_PHASE, NB_DMODES }; +enum FrequencyScale { F_LINEAR, F_LOG, NB_FSCALES }; enum DisplayScale { LINEAR, SQRT, CBRT, LOG, FOURTHRT, FIFTHRT, NB_SCALES }; enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, FIRE, FIERY, FRUIT, COOL, MAGMA, GREEN, VIRIDIS, PLASMA, CIVIDIS, TERRAIN, NB_CLMODES }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; @@ -65,6 +66,7 @@ typedef struct ShowSpectrumContext { int mode; ///< channel display mode int color_mode; ///< display color scheme int scale; + int fscale; float saturation; ///< color saturation multiplier float rotation; ///< color rotation int start, stop; ///< zoom mode @@ -95,6 +97,7 @@ typedef struct ShowSpectrumContext { int single_pic; int legend; int start_x, start_y; + int (*plot_channel)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } ShowSpectrumContext; #define OFFSET(x) offsetof(ShowSpectrumContext, x) @@ -134,6 +137,9 @@ static const AVOption showspectrum_options[] = { { "log", "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=LOG}, 0, 0, FLAGS, "scale" }, { "4thrt","4th root", 0, AV_OPT_TYPE_CONST, {.i64=FOURTHRT}, 0, 0, FLAGS, "scale" }, { "5thrt","5th root", 0, AV_OPT_TYPE_CONST, {.i64=FIFTHRT}, 0, 0, FLAGS, "scale" }, + { "fscale", "set frequency scale", OFFSET(fscale), AV_OPT_TYPE_INT, {.i64=F_LINEAR}, 0, NB_FSCALES-1, FLAGS, "fscale" }, + { "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=F_LINEAR}, 0, 0, FLAGS, "fscale" }, + { "log", "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=F_LOG}, 0, 0, FLAGS, "fscale" }, { "saturation", "color saturation multiplier", OFFSET(saturation), AV_OPT_TYPE_FLOAT, {.dbl = 1}, -10, 10, FLAGS }, { "win_func", "set window function", OFFSET(win_func), AV_OPT_TYPE_INT, {.i64 = WFUNC_HANNING}, 0, NB_WFUNC-1, FLAGS, "win_func" }, { "rect", "Rectangular", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_RECT}, 0, 0, FLAGS, "win_func" }, @@ -623,6 +629,56 @@ static char *get_time(AVFilterContext *ctx, float seconds, int x) return units; } +static float log_scale(const float value, const float min, const float max) +{ + if (value < min) + return min; + if (value > max) + return max; + + { + const float b = logf(max / min) / (max - min); + const float a = max / expf(max * b); + + return expf(value * b) * a; + } +} + +static float get_log_hz(const int bin, const int num_bins, const float sample_rate) +{ + const float max_freq = sample_rate / 2; + const float hz_per_bin = max_freq / num_bins; + const float freq = hz_per_bin * bin; + const float scaled_freq = log_scale(freq + 1, 21, max_freq) - 1; + + return num_bins * scaled_freq / max_freq; +} + +static float inv_log_scale(const float value, const float min, const float max) +{ + if (value < min) + return min; + if (value > max) + return max; + + { + const float b = logf(max / min) / (max - min); + const float a = max / expf(max * b); + + return logf(value / a) / b; + } +} + +static float bin_pos(const int bin, const int num_bins, const float sample_rate) +{ + const float max_freq = sample_rate / 2; + const float hz_per_bin = max_freq / num_bins; + const float freq = hz_per_bin * bin; + const float scaled_freq = inv_log_scale(freq + 1, 21, max_freq) - 1; + + return num_bins * scaled_freq / max_freq; +} + static int draw_legend(AVFilterContext *ctx, int samples) { ShowSpectrumContext *s = ctx->priv; @@ -691,7 +747,8 @@ static int draw_legend(AVFilterContext *ctx, int samples) } for (y = 0; y < h; y += 40) { float range = s->stop ? s->stop - s->start : inlink->sample_rate / 2; - float hertz = s->start + y * range / (float)(1 << (int)ceil(log2(h))); + float bin = s->fscale == F_LINEAR ? y : get_log_hz(y, h, inlink->sample_rate); + float hertz = s->start + bin * range / (float)(1 << (int)ceil(log2(h))); char *units; if (hertz == 0) @@ -746,7 +803,8 @@ static int draw_legend(AVFilterContext *ctx, int samples) } for (x = 0; x < w - 79; x += 80) { float range = s->stop ? s->stop - s->start : inlink->sample_rate / 2; - float hertz = s->start + x * range / (float)(1 << (int)ceil(log2(w))); + float bin = s->fscale == F_LINEAR ? x : get_log_hz(x, w, inlink->sample_rate); + float hertz = s->start + bin * range / (float)(1 << (int)ceil(log2(w))); char *units; if (hertz == 0) @@ -812,6 +870,110 @@ static int draw_legend(AVFilterContext *ctx, int samples) return 0; } +static float get_value(AVFilterContext *ctx, int ch, int y) +{ + ShowSpectrumContext *s = ctx->priv; + float *magnitudes = s->magnitudes[ch]; + float *phases = s->phases[ch]; + float a; + + switch (s->data) { + case D_MAGNITUDE: + /* get magnitude */ + a = magnitudes[y]; + break; + case D_PHASE: + /* get phase */ + a = phases[y]; + break; + default: + av_assert0(0); + } + + /* apply scale */ + switch (s->scale) { + case LINEAR: + a = av_clipf(a, 0, 1); + break; + case SQRT: + a = av_clipf(sqrt(a), 0, 1); + break; + case CBRT: + a = av_clipf(cbrt(a), 0, 1); + break; + case FOURTHRT: + a = av_clipf(sqrt(sqrt(a)), 0, 1); + break; + case FIFTHRT: + a = av_clipf(pow(a, 0.20), 0, 1); + break; + case LOG: + a = 1 + log10(av_clipd(a, 1e-6, 1)) / 6; // zero = -120dBFS + break; + default: + av_assert0(0); + } + + return a; +} + +static int plot_channel_lin(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ShowSpectrumContext *s = ctx->priv; + const int h = s->orientation == VERTICAL ? s->channel_height : s->channel_width; + const int ch = jobnr; + float yf, uf, vf; + int y; + + /* decide color range */ + color_range(s, ch, &yf, &uf, &vf); + + /* draw the channel */ + for (y = 0; y < h; y++) { + int row = (s->mode == COMBINED) ? y : ch * h + y; + float *out = &s->color_buffer[ch][3 * row]; + float a = get_value(ctx, ch, y); + + pick_color(s, yf, uf, vf, a, out); + } + + return 0; +} + +static int plot_channel_log(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ShowSpectrumContext *s = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + const int h = s->orientation == VERTICAL ? s->channel_height : s->channel_width; + const int ch = jobnr; + float y, yf, uf, vf; + int yy = 0; + + /* decide color range */ + color_range(s, ch, &yf, &uf, &vf); + + /* draw the channel */ + for (y = 0; y < h && yy < h; yy++) { + float pos0 = bin_pos(yy+0, h, inlink->sample_rate); + float pos1 = bin_pos(yy+1, h, inlink->sample_rate); + float delta = pos1 - pos0; + float a0, a1; + + a0 = get_value(ctx, ch, yy+0); + a1 = get_value(ctx, ch, FFMIN(yy+1, h-1)); + for (float j = pos0; j < pos1 && y + j - pos0 < h; j++) { + float row = (s->mode == COMBINED) ? y + j - pos0 : ch * h + y + j - pos0; + float *out = &s->color_buffer[ch][3 * FFMIN(lrintf(row), h-1)]; + float lerpfrac = (j - pos0) / delta; + + pick_color(s, yf, uf, vf, lerpfrac * a1 + (1.f-lerpfrac) * a0, out); + } + y += delta; + } + + return 0; +} + static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -820,6 +982,12 @@ static int config_output(AVFilterLink *outlink) int i, fft_bits, h, w; float overlap; + switch (s->fscale) { + case F_LINEAR: s->plot_channel = plot_channel_lin; break; + case F_LOG: s->plot_channel = plot_channel_log; break; + default: return AVERROR_BUG; + } + s->stop = FFMIN(s->stop, inlink->sample_rate / 2); if (s->stop && s->stop <= s->start) { av_log(ctx, AV_LOG_ERROR, "Stop frequency should be greater than start.\n"); @@ -1099,68 +1267,6 @@ static void clear_combine_buffer(ShowSpectrumContext *s, int size) } } -static int plot_channel(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) -{ - ShowSpectrumContext *s = ctx->priv; - const int h = s->orientation == VERTICAL ? s->channel_height : s->channel_width; - const int ch = jobnr; - float *magnitudes = s->magnitudes[ch]; - float *phases = s->phases[ch]; - float yf, uf, vf; - int y; - - /* decide color range */ - color_range(s, ch, &yf, &uf, &vf); - - /* draw the channel */ - for (y = 0; y < h; y++) { - int row = (s->mode == COMBINED) ? y : ch * h + y; - float *out = &s->color_buffer[ch][3 * row]; - float a; - - switch (s->data) { - case D_MAGNITUDE: - /* get magnitude */ - a = magnitudes[y]; - break; - case D_PHASE: - /* get phase */ - a = phases[y]; - break; - default: - av_assert0(0); - } - - /* apply scale */ - switch (s->scale) { - case LINEAR: - a = av_clipf(a, 0, 1); - break; - case SQRT: - a = av_clipf(sqrt(a), 0, 1); - break; - case CBRT: - a = av_clipf(cbrt(a), 0, 1); - break; - case FOURTHRT: - a = av_clipf(sqrt(sqrt(a)), 0, 1); - break; - case FIFTHRT: - a = av_clipf(pow(a, 0.20), 0, 1); - break; - case LOG: - a = 1 + log10(av_clipd(a, 1e-6, 1)) / 6; // zero = -120dBFS - break; - default: - av_assert0(0); - } - - pick_color(s, yf, uf, vf, a, out); - } - - return 0; -} - static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) { AVFilterContext *ctx = inlink->dst; @@ -1173,7 +1279,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) /* initialize buffer for combining to black */ clear_combine_buffer(s, z); - ctx->internal->execute(ctx, plot_channel, NULL, NULL, s->nb_display_channels); + ctx->internal->execute(ctx, s->plot_channel, NULL, NULL, s->nb_display_channels); for (y = 0; y < z * 3; y++) { for (x = 0; x < s->nb_display_channels; x++) { @@ -1447,6 +1553,9 @@ static const AVOption showspectrumpic_options[] = { { "log", "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=LOG}, 0, 0, FLAGS, "scale" }, { "4thrt","4th root", 0, AV_OPT_TYPE_CONST, {.i64=FOURTHRT}, 0, 0, FLAGS, "scale" }, { "5thrt","5th root", 0, AV_OPT_TYPE_CONST, {.i64=FIFTHRT}, 0, 0, FLAGS, "scale" }, + { "fscale", "set frequency scale", OFFSET(fscale), AV_OPT_TYPE_INT, {.i64=F_LINEAR}, 0, NB_FSCALES-1, FLAGS, "fscale" }, + { "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=F_LINEAR}, 0, 0, FLAGS, "fscale" }, + { "log", "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=F_LOG}, 0, 0, FLAGS, "fscale" }, { "saturation", "color saturation multiplier", OFFSET(saturation), AV_OPT_TYPE_FLOAT, {.dbl = 1}, -10, 10, FLAGS }, { "win_func", "set window function", OFFSET(win_func), AV_OPT_TYPE_INT, {.i64 = WFUNC_HANNING}, 0, NB_WFUNC-1, FLAGS, "win_func" }, { "rect", "Rectangular", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_RECT}, 0, 0, FLAGS, "win_func" },

1 0

avfilter/af_astats: fix msvc compile error
by Matthias Troffaes 29 Apr '19

29 Apr '19

ffmpeg | branch: master | Matthias Troffaes <matthias.troffaes(a)gmail.com> | Mon Apr 29 11:03:52 2019 +0200| [90b21ae5b5f8858e5af92c3e096af7ec56f17c6e] | committer: Paul B Mahol avfilter/af_astats: fix msvc compile error MSVC requires an explicit cast from void * to void when applying the ternary conditional operator to switch between methods that return void. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90b21ae5b5f8858e5… --- libavfilter/af_astats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index 1ec56d72cc..bb9a23a017 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -496,7 +496,7 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) #define UPDATE_STATS(planar, type, sample, normalizer_suffix, int_sample) \ if ((s->measure_overall | s->measure_perchannel) & ~MEASURE_MINMAXPEAK) { \ - UPDATE_STATS_##planar(type, update_stat(s, p, sample, sample normalizer_suffix, int_sample), s->is_float ? update_float_stat(s, p, sample) : s->is_double ? update_double_stat(s, p, sample) : NULL, ); \ + UPDATE_STATS_##planar(type, update_stat(s, p, sample, sample normalizer_suffix, int_sample), s->is_float ? update_float_stat(s, p, sample) : s->is_double ? update_double_stat(s, p, sample) : (void)NULL, ); \ } else { \ UPDATE_STATS_##planar(type, update_minmax(s, p, sample), , p->nmin = p->min normalizer_suffix; p->nmax = p->max normalizer_suffix;); \ }

1 0

avcodec/cbs_h2645: use the fixed() macro for forbidden_zero_bit
by James Almer 28 Apr '19

28 Apr '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Apr 16 23:00:49 2019 -0300| [45048ece81d395431d5604cf30596aaa62692da3] | committer: James Almer avcodec/cbs_h2645: use the fixed() macro for forbidden_zero_bit This follows the spec definition, and removes a field from the relevant structs. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45048ece81d395431… --- libavcodec/cbs_h264.h | 1 - libavcodec/cbs_h264_syntax_template.c | 2 +- libavcodec/cbs_h265.h | 1 - libavcodec/cbs_h265_syntax_template.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index b5eee7c370..cc46eeb3b0 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -38,7 +38,6 @@ enum { typedef struct H264RawNALUnitHeader { - uint8_t forbidden_zero_bit; uint8_t nal_ref_idc; uint8_t nal_unit_type; diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index cc9bd07590..95fc6d7194 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -33,7 +33,7 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, { int err; - u(1, forbidden_zero_bit, 0, 0); + fixed(1, forbidden_zero_bit, 0); ub(2, nal_ref_idc); ub(5, nal_unit_type); diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index 0c0e4f84b0..c9bc90187b 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -35,7 +35,6 @@ enum { }; typedef struct H265RawNALUnitHeader { - uint8_t forbidden_zero_bit; uint8_t nal_unit_type; uint8_t nuh_layer_id; uint8_t nuh_temporal_id_plus1; diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 4402de355a..f279d283d9 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -33,7 +33,7 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, { int err; - u(1, forbidden_zero_bit, 0, 0); + fixed(1, forbidden_zero_bit, 0); if (expected_nal_unit_type >= 0) u(6, nal_unit_type, expected_nal_unit_type,

1 0

avcodec/cbs_h2645: add macros to read and write fields with no custom range of values
by James Almer 28 Apr '19

28 Apr '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Apr 16 22:32:05 2019 -0300| [16c50abb5016fd260c3dcea21aeb335337fe5362] | committer: James Almer avcodec/cbs_h2645: add macros to read and write fields with no custom range of values Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16c50abb5016fd260… --- libavcodec/cbs_h2645.c | 10 ++- libavcodec/cbs_h264_syntax_template.c | 60 +++++++--------- libavcodec/cbs_h265_syntax_template.c | 130 +++++++++++++++------------------- 3 files changed, 92 insertions(+), 108 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index a205293b3c..319202fc48 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -252,22 +252,30 @@ static int cbs_write_se_golomb(CodedBitstreamContext *ctx, PutBitContext *pbc, #define u(width, name, range_min, range_max) \ xu(width, name, current->name, range_min, range_max, 0) -#define flag(name) u(1, name, 0, 1) +#define ub(width, name) \ + xu(width, name, current->name, 0, MAX_UINT_BITS(width), 0) +#define flag(name) ub(1, name) #define ue(name, range_min, range_max) \ xue(name, current->name, range_min, range_max, 0) #define i(width, name, range_min, range_max) \ xi(width, name, current->name, range_min, range_max, 0) +#define ib(width, name) \ + xi(width, name, current->name, MIN_INT_BITS(width), MAX_INT_BITS(width), 0) #define se(name, range_min, range_max) \ xse(name, current->name, range_min, range_max, 0) #define us(width, name, range_min, range_max, subs, ...) \ xu(width, name, current->name, range_min, range_max, subs, __VA_ARGS__) +#define ubs(width, name, subs, ...) \ + xu(width, name, current->name, 0, MAX_UINT_BITS(width), subs, __VA_ARGS__) #define flags(name, subs, ...) \ xu(1, name, current->name, 0, 1, subs, __VA_ARGS__) #define ues(name, range_min, range_max, subs, ...) \ xue(name, current->name, range_min, range_max, subs, __VA_ARGS__) #define is(width, name, range_min, range_max, subs, ...) \ xi(width, name, current->name, range_min, range_max, subs, __VA_ARGS__) +#define ibs(width, name, subs, ...) \ + xi(width, name, current->name, MIN_INT_BITS(width), MAX_INT_BITS(width), subs, __VA_ARGS__) #define ses(name, range_min, range_max, subs, ...) \ xse(name, current->name, range_min, range_max, subs, __VA_ARGS__) diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 07b4cddb5e..cc9bd07590 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -34,8 +34,8 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, int err; u(1, forbidden_zero_bit, 0, 0); - u(2, nal_ref_idc, 0, 3); - u(5, nal_unit_type, 0, 31); + ub(2, nal_ref_idc); + ub(5, nal_unit_type); if (!(1 << current->nal_unit_type & valid_type_mask)) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid NAL unit type %d.\n", @@ -91,8 +91,8 @@ static int FUNC(hrd_parameters)(CodedBitstreamContext *ctx, RWContext *rw, int err, i; ue(cpb_cnt_minus1, 0, 31); - u(4, bit_rate_scale, 0, 15); - u(4, cpb_size_scale, 0, 15); + ub(4, bit_rate_scale); + ub(4, cpb_size_scale); for (i = 0; i <= current->cpb_cnt_minus1; i++) { ues(bit_rate_value_minus1[i], 0, UINT32_MAX - 1, 1, i); @@ -100,10 +100,10 @@ static int FUNC(hrd_parameters)(CodedBitstreamContext *ctx, RWContext *rw, flags(cbr_flag[i], 1, i); } - u(5, initial_cpb_removal_delay_length_minus1, 0, 31); - u(5, cpb_removal_delay_length_minus1, 0, 31); - u(5, dpb_output_delay_length_minus1, 0, 31); - u(5, time_offset_length, 0, 31); + ub(5, initial_cpb_removal_delay_length_minus1); + ub(5, cpb_removal_delay_length_minus1); + ub(5, dpb_output_delay_length_minus1); + ub(5, time_offset_length); return 0; } @@ -115,10 +115,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, flag(aspect_ratio_info_present_flag); if (current->aspect_ratio_info_present_flag) { - u(8, aspect_ratio_idc, 0, 255); + ub(8, aspect_ratio_idc); if (current->aspect_ratio_idc == 255) { - u(16, sar_width, 0, 65535); - u(16, sar_height, 0, 65535); + ub(16, sar_width); + ub(16, sar_height); } } else { infer(aspect_ratio_idc, 0); @@ -130,13 +130,13 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, flag(video_signal_type_present_flag); if (current->video_signal_type_present_flag) { - u(3, video_format, 0, 7); + ub(3, video_format); flag(video_full_range_flag); flag(colour_description_present_flag); if (current->colour_description_present_flag) { - u(8, colour_primaries, 0, 255); - u(8, transfer_characteristics, 0, 255); - u(8, matrix_coefficients, 0, 255); + ub(8, colour_primaries); + ub(8, transfer_characteristics); + ub(8, matrix_coefficients); } } else { infer(video_format, 5); @@ -263,7 +263,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(nal_unit_header)(ctx, rw, &current->nal_unit_header, 1 << H264_NAL_SPS)); - u(8, profile_idc, 0, 255); + ub(8, profile_idc); flag(constraint_set0_flag); flag(constraint_set1_flag); @@ -274,7 +274,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, u(2, reserved_zero_2bits, 0, 0); - u(8, level_idc, 0, 255); + ub(8, level_idc); ue(seq_parameter_set_id, 0, 31); @@ -386,8 +386,8 @@ static int FUNC(sps_extension)(CodedBitstreamContext *ctx, RWContext *rw, flag(alpha_incr_flag); bits = current->bit_depth_aux_minus8 + 9; - u(bits, alpha_opaque_value, 0, MAX_UINT_BITS(bits)); - u(bits, alpha_transparent_value, 0, MAX_UINT_BITS(bits)); + ub(bits, alpha_opaque_value); + ub(bits, alpha_transparent_value); } flag(additional_extension_flag); @@ -565,7 +565,7 @@ static int FUNC(sei_pic_timestamp)(CodedBitstreamContext *ctx, RWContext *rw, flag(full_timestamp_flag); flag(discontinuity_flag); flag(cnt_dropped_flag); - u(8, n_frames, 0, 255); + ub(8, n_frames); if (current->full_timestamp_flag) { u(6, seconds_value, 0, 59); u(6, minutes_value, 0, 59); @@ -592,9 +592,7 @@ static int FUNC(sei_pic_timestamp)(CodedBitstreamContext *ctx, RWContext *rw, time_offset_length = 24; if (time_offset_length > 0) - i(time_offset_length, time_offset, - MIN_INT_BITS(time_offset_length), - MAX_INT_BITS(time_offset_length)); + ib(time_offset_length, time_offset); else infer(time_offset, 0); @@ -647,10 +645,8 @@ static int FUNC(sei_pic_timing)(CodedBitstreamContext *ctx, RWContext *rw, return AVERROR_INVALIDDATA; } - u(hrd->cpb_removal_delay_length_minus1 + 1, cpb_removal_delay, - 0, MAX_UINT_BITS(hrd->cpb_removal_delay_length_minus1 + 1)); - u(hrd->dpb_output_delay_length_minus1 + 1, dpb_output_delay, - 0, MAX_UINT_BITS(hrd->dpb_output_delay_length_minus1 + 1)); + ub(hrd->cpb_removal_delay_length_minus1 + 1, cpb_removal_delay); + ub(hrd->dpb_output_delay_length_minus1 + 1, dpb_output_delay); } if (sps->vui.pic_struct_present_flag) { @@ -790,7 +786,7 @@ static int FUNC(sei_display_orientation)(CodedBitstreamContext *ctx, RWContext * if (!current->display_orientation_cancel_flag) { flag(hor_flip); flag(ver_flip); - u(16, anticlockwise_rotation, 0, 65535); + ub(16, anticlockwise_rotation); ue(display_orientation_repetition_period, 0, 16384); flag(display_orientation_extension_flag); } @@ -996,7 +992,7 @@ static int FUNC(aud)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(nal_unit_header)(ctx, rw, &current->nal_unit_header, 1 << H264_NAL_AUD)); - u(3, primary_pic_type, 0, 7); + ub(3, primary_pic_type); CHECK(FUNC(rbsp_trailing_bits)(ctx, rw)); @@ -1232,8 +1228,7 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw, if (sps->separate_colour_plane_flag) u(2, colour_plane_id, 0, 2); - u(sps->log2_max_frame_num_minus4 + 4, frame_num, - 0, MAX_UINT_BITS(sps->log2_max_frame_num_minus4 + 4)); + ub(sps->log2_max_frame_num_minus4 + 4, frame_num); if (!sps->frame_mbs_only_flag) { flag(field_pic_flag); @@ -1250,8 +1245,7 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw, ue(idr_pic_id, 0, 65535); if (sps->pic_order_cnt_type == 0) { - u(sps->log2_max_pic_order_cnt_lsb_minus4 + 4, pic_order_cnt_lsb, - 0, MAX_UINT_BITS(sps->log2_max_pic_order_cnt_lsb_minus4 + 4)); + ub(sps->log2_max_pic_order_cnt_lsb_minus4 + 4, pic_order_cnt_lsb); if (pps->bottom_field_pic_order_in_frame_present_flag && !current->field_pic_flag) se(delta_pic_order_cnt_bottom, INT32_MIN + 1, INT32_MAX); diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index bbd363a389..4402de355a 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -39,7 +39,7 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, u(6, nal_unit_type, expected_nal_unit_type, expected_nal_unit_type); else - u(6, nal_unit_type, 0, 63); + ub(6, nal_unit_type); u(6, nuh_layer_id, 0, 62); u(3, nuh_temporal_id_plus1, 1, 7); @@ -95,7 +95,7 @@ static int FUNC(profile_tier_level)(CodedBitstreamContext *ctx, RWContext *rw, if (profile_present_flag) { u(2, general_profile_space, 0, 0); flag(general_tier_flag); - u(5, general_profile_idc, 0, 31); + ub(5, general_profile_idc); for (j = 0; j < 32; j++) flags(general_profile_compatibility_flag[j], 1, j); @@ -150,7 +150,7 @@ static int FUNC(profile_tier_level)(CodedBitstreamContext *ctx, RWContext *rw, #undef profile_compatible } - u(8, general_level_idc, 0, 255); + ub(8, general_level_idc); for (i = 0; i < max_num_sub_layers_minus1; i++) { flags(sub_layer_profile_present_flag[i], 1, i); @@ -166,7 +166,7 @@ static int FUNC(profile_tier_level)(CodedBitstreamContext *ctx, RWContext *rw, if (current->sub_layer_profile_present_flag[i]) { us(2, sub_layer_profile_space[i], 0, 0, 1, i); flags(sub_layer_tier_flag[i], 1, i); - us(5, sub_layer_profile_idc[i], 0, 31, 1, i); + ubs(5, sub_layer_profile_idc[i], 1, i); for (j = 0; j < 32; j++) flags(sub_layer_profile_compatibility_flag[i][j], 2, i, j); @@ -220,7 +220,7 @@ static int FUNC(profile_tier_level)(CodedBitstreamContext *ctx, RWContext *rw, #undef profile_compatible } if (current->sub_layer_level_present_flag[i]) - us(8, sub_layer_level_idc[i], 0, 255, 1, i); + ubs(8, sub_layer_level_idc[i], 1, i); } return 0; @@ -265,20 +265,20 @@ static int FUNC(hrd_parameters)(CodedBitstreamContext *ctx, RWContext *rw, current->vcl_hrd_parameters_present_flag) { flag(sub_pic_hrd_params_present_flag); if (current->sub_pic_hrd_params_present_flag) { - u(8, tick_divisor_minus2, 0, 255); - u(5, du_cpb_removal_delay_increment_length_minus1, 0, 31); + ub(8, tick_divisor_minus2); + ub(5, du_cpb_removal_delay_increment_length_minus1); flag(sub_pic_cpb_params_in_pic_timing_sei_flag); - u(5, dpb_output_delay_du_length_minus1, 0, 31); + ub(5, dpb_output_delay_du_length_minus1); } - u(4, bit_rate_scale, 0, 15); - u(4, cpb_size_scale, 0, 15); + ub(4, bit_rate_scale); + ub(4, cpb_size_scale); if (current->sub_pic_hrd_params_present_flag) - u(4, cpb_size_du_scale, 0, 15); + ub(4, cpb_size_du_scale); - u(5, initial_cpb_removal_delay_length_minus1, 0, 31); - u(5, au_cpb_removal_delay_length_minus1, 0, 31); - u(5, dpb_output_delay_length_minus1, 0, 31); + ub(5, initial_cpb_removal_delay_length_minus1); + ub(5, au_cpb_removal_delay_length_minus1); + ub(5, dpb_output_delay_length_minus1); } else { infer(sub_pic_hrd_params_present_flag, 0); @@ -323,10 +323,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, flag(aspect_ratio_info_present_flag); if (current->aspect_ratio_info_present_flag) { - u(8, aspect_ratio_idc, 0, 255); + ub(8, aspect_ratio_idc); if (current->aspect_ratio_idc == 255) { - u(16, sar_width, 0, 65535); - u(16, sar_height, 0, 65535); + ub(16, sar_width); + ub(16, sar_height); } } else { infer(aspect_ratio_idc, 0); @@ -338,13 +338,13 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, flag(video_signal_type_present_flag); if (current->video_signal_type_present_flag) { - u(3, video_format, 0, 7); + ub(3, video_format); flag(video_full_range_flag); flag(colour_description_present_flag); if (current->colour_description_present_flag) { - u(8, colour_primaries, 0, 255); - u(8, transfer_characteristics, 0, 255); - u(8, matrix_coefficients, 0, 255); + ub(8, colour_primaries); + ub(8, transfer_characteristics); + ub(8, matrix_coefficients); } else { infer(colour_primaries, 2); infer(transfer_characteristics, 2); @@ -426,7 +426,7 @@ static int FUNC(vps)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(nal_unit_header)(ctx, rw, &current->nal_unit_header, HEVC_NAL_VPS)); - u(4, vps_video_parameter_set_id, 0, 15); + ub(4, vps_video_parameter_set_id); flag(vps_base_layer_internal_flag); flag(vps_base_layer_available_flag); @@ -723,8 +723,7 @@ static int FUNC(sps_scc_extension)(CodedBitstreamContext *ctx, RWContext *rw, int bit_depth = comp == 0 ? current->bit_depth_luma_minus8 + 8 : current->bit_depth_chroma_minus8 + 8; for (i = 0; i <= current->sps_num_palette_predictor_initializer_minus1; i++) - us(bit_depth, sps_palette_predictor_initializers[comp][i], - 0, MAX_UINT_BITS(bit_depth), 2, comp, i); + ubs(bit_depth, sps_palette_predictor_initializers[comp][i], 2, comp, i); } } } @@ -748,7 +747,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(nal_unit_header)(ctx, rw, &current->nal_unit_header, HEVC_NAL_SPS)); - u(4, sps_video_parameter_set_id, 0, 15); + ub(4, sps_video_parameter_set_id); h265->active_vps = vps = h265->vps[current->sps_video_parameter_set_id]; u(3, sps_max_sub_layers_minus1, 0, HEVC_MAX_SUB_LAYERS - 1); @@ -887,9 +886,8 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, if (current->long_term_ref_pics_present_flag) { ue(num_long_term_ref_pics_sps, 0, HEVC_MAX_LONG_TERM_REF_PICS); for (i = 0; i < current->num_long_term_ref_pics_sps; i++) { - us(current->log2_max_pic_order_cnt_lsb_minus4 + 4, - lt_ref_pic_poc_lsb_sps[i], - 0, MAX_UINT_BITS(current->log2_max_pic_order_cnt_lsb_minus4 + 4), 1, i); + ubs(current->log2_max_pic_order_cnt_lsb_minus4 + 4, + lt_ref_pic_poc_lsb_sps[i], 1, i); flags(used_by_curr_pic_lt_sps_flag[i], 1, i); } } @@ -907,7 +905,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, flag(sps_multilayer_extension_flag); flag(sps_3d_extension_flag); flag(sps_scc_extension_flag); - u(4, sps_extension_4bits, 0, MAX_UINT_BITS(4)); + ub(4, sps_extension_4bits); } if (current->sps_range_extension_flag) @@ -986,8 +984,7 @@ static int FUNC(pps_scc_extension)(CodedBitstreamContext *ctx, RWContext *rw, int bit_depth = comp == 0 ? current->luma_bit_depth_entry_minus8 + 8 : current->chroma_bit_depth_entry_minus8 + 8; for (i = 0; i < current->pps_num_palette_predictor_initializer; i++) - us(bit_depth, pps_palette_predictor_initializers[comp][i], - 0, MAX_UINT_BITS(bit_depth), 2, comp, i); + ubs(bit_depth, pps_palette_predictor_initializers[comp][i], 2, comp, i); } } } @@ -1018,7 +1015,7 @@ static int FUNC(pps)(CodedBitstreamContext *ctx, RWContext *rw, flag(dependent_slice_segments_enabled_flag); flag(output_flag_present_flag); - u(3, num_extra_slice_header_bits, 0, 7); + ub(3, num_extra_slice_header_bits); flag(sign_data_hiding_enabled_flag); flag(cabac_init_present_flag); @@ -1100,7 +1097,7 @@ static int FUNC(pps)(CodedBitstreamContext *ctx, RWContext *rw, flag(pps_multilayer_extension_flag); flag(pps_3d_extension_flag); flag(pps_scc_extension_flag); - u(4, pps_extension_4bits, 0, MAX_UINT_BITS(4)); + ub(4, pps_extension_4bits); } if (current->pps_range_extension_flag) CHECK(FUNC(pps_range_extension)(ctx, rw, current)); @@ -1335,8 +1332,7 @@ static int FUNC(slice_segment_header)(CodedBitstreamContext *ctx, RWContext *rw, current->nal_unit_header.nal_unit_type != HEVC_NAL_IDR_N_LP) { const H265RawSTRefPicSet *rps; - u(sps->log2_max_pic_order_cnt_lsb_minus4 + 4, slice_pic_order_cnt_lsb, - 0, MAX_UINT_BITS(sps->log2_max_pic_order_cnt_lsb_minus4 + 4)); + ub(sps->log2_max_pic_order_cnt_lsb_minus4 + 4, slice_pic_order_cnt_lsb); flag(short_term_ref_pic_set_sps_flag); if (!current->short_term_ref_pic_set_sps_flag) { @@ -1382,8 +1378,7 @@ static int FUNC(slice_segment_header)(CodedBitstreamContext *ctx, RWContext *rw, if (sps->used_by_curr_pic_lt_sps_flag[current->lt_idx_sps[i]]) ++num_pic_total_curr; } else { - us(sps->log2_max_pic_order_cnt_lsb_minus4 + 4, poc_lsb_lt[i], - 0, MAX_UINT_BITS(sps->log2_max_pic_order_cnt_lsb_minus4 + 4), 1, i); + ubs(sps->log2_max_pic_order_cnt_lsb_minus4 + 4, poc_lsb_lt[i], 1, i); flags(used_by_curr_pic_lt_flag[i], 1, i); if (current->used_by_curr_pic_lt_flag[i]) ++num_pic_total_curr; @@ -1548,8 +1543,7 @@ static int FUNC(slice_segment_header)(CodedBitstreamContext *ctx, RWContext *rw, if (current->num_entry_point_offsets > 0) { ue(offset_len_minus1, 0, 31); for (i = 0; i < current->num_entry_point_offsets; i++) - us(current->offset_len_minus1 + 1, entry_point_offset_minus1[i], - 0, MAX_UINT_BITS(current->offset_len_minus1 + 1), 1, i); + ubs(current->offset_len_minus1 + 1, entry_point_offset_minus1[i], 1, i); } } @@ -1610,9 +1604,9 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, infer(irap_cpb_params_present_flag, 0); if (current->irap_cpb_params_present_flag) { length = hrd->au_cpb_removal_delay_length_minus1 + 1; - u(length, cpb_delay_offset, 0, MAX_UINT_BITS(length)); + ub(length, cpb_delay_offset); length = hrd->dpb_output_delay_length_minus1 + 1; - u(length, dpb_delay_offset, 0, MAX_UINT_BITS(length)); + ub(length, dpb_delay_offset); } else { infer(cpb_delay_offset, 0); infer(dpb_delay_offset, 0); @@ -1621,23 +1615,19 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, flag(concatenation_flag); length = hrd->au_cpb_removal_delay_length_minus1 + 1; - u(length, au_cpb_removal_delay_delta_minus1, 0, MAX_UINT_BITS(length)); + ub(length, au_cpb_removal_delay_delta_minus1); if (hrd->nal_hrd_parameters_present_flag) { for (i = 0; i <= hrd->cpb_cnt_minus1[0]; i++) { length = hrd->initial_cpb_removal_delay_length_minus1 + 1; - us(length, nal_initial_cpb_removal_delay[i], - 0, MAX_UINT_BITS(length), 1, i); - us(length, nal_initial_cpb_removal_offset[i], - 0, MAX_UINT_BITS(length), 1, i); + ubs(length, nal_initial_cpb_removal_delay[i], 1, i); + ubs(length, nal_initial_cpb_removal_offset[i], 1, i); if (hrd->sub_pic_hrd_params_present_flag || current->irap_cpb_params_present_flag) { - us(length, nal_initial_alt_cpb_removal_delay[i], - 0, MAX_UINT_BITS(length), 1, i); - us(length, nal_initial_alt_cpb_removal_offset[i], - 0, MAX_UINT_BITS(length), 1, i); + ubs(length, nal_initial_alt_cpb_removal_delay[i], 1, i); + ubs(length, nal_initial_alt_cpb_removal_offset[i], 1, i); } } } @@ -1645,17 +1635,13 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, for (i = 0; i <= hrd->cpb_cnt_minus1[0]; i++) { length = hrd->initial_cpb_removal_delay_length_minus1 + 1; - us(length, vcl_initial_cpb_removal_delay[i], - 0, MAX_UINT_BITS(length), 1, i); - us(length, vcl_initial_cpb_removal_offset[i], - 0, MAX_UINT_BITS(length), 1, i); + ubs(length, vcl_initial_cpb_removal_delay[i], 1, i); + ubs(length, vcl_initial_cpb_removal_offset[i], 1, i); if (hrd->sub_pic_hrd_params_present_flag || current->irap_cpb_params_present_flag) { - us(length, vcl_initial_alt_cpb_removal_delay[i], - 0, MAX_UINT_BITS(length), 1, i); - us(length, vcl_initial_alt_cpb_removal_offset[i], - 0, MAX_UINT_BITS(length), 1, i); + ubs(length, vcl_initial_alt_cpb_removal_delay[i], 1, i); + ubs(length, vcl_initial_alt_cpb_removal_offset[i], 1, i); } } } @@ -1720,14 +1706,14 @@ static int FUNC(sei_pic_timing)(CodedBitstreamContext *ctx, RWContext *rw, if (hrd && (hrd->nal_hrd_parameters_present_flag || hrd->vcl_hrd_parameters_present_flag)) { length = hrd->au_cpb_removal_delay_length_minus1 + 1; - u(length, au_cpb_removal_delay_minus1, 0, MAX_UINT_BITS(length)); + ub(length, au_cpb_removal_delay_minus1); length = hrd->dpb_output_delay_length_minus1 + 1; - u(length, pic_dpb_output_delay, 0, MAX_UINT_BITS(length)); + ub(length, pic_dpb_output_delay); if (hrd->sub_pic_hrd_params_present_flag) { length = hrd->dpb_output_delay_du_length_minus1 + 1; - u(length, pic_dpb_output_du_delay, 0, MAX_UINT_BITS(length)); + ub(length, pic_dpb_output_du_delay); } if (hrd->sub_pic_hrd_params_present_flag && @@ -1738,16 +1724,14 @@ static int FUNC(sei_pic_timing)(CodedBitstreamContext *ctx, RWContext *rw, length = hrd->du_cpb_removal_delay_increment_length_minus1 + 1; if (current->du_common_cpb_removal_delay_flag) - u(length, du_common_cpb_removal_delay_increment_minus1, - 0, MAX_UINT_BITS(length)); + ub(length, du_common_cpb_removal_delay_increment_minus1); for (i = 0; i <= current->num_decoding_units_minus1; i++) { ues(num_nalus_in_du_minus1[i], 0, HEVC_MAX_SLICE_SEGMENTS, 1, i); if (!current->du_common_cpb_removal_delay_flag && i < current->num_decoding_units_minus1) - us(length, du_cpb_removal_delay_increment_minus1[i], - 0, MAX_UINT_BITS(length), 1, i); + ubs(length, du_cpb_removal_delay_increment_minus1[i], 1, i); } } } @@ -1871,7 +1855,7 @@ static int FUNC(sei_display_orientation)(CodedBitstreamContext *ctx, RWContext * if (!current->display_orientation_cancel_flag) { flag(hor_flip); flag(ver_flip); - u(16, anticlockwise_rotation, 0, 65535); + ub(16, anticlockwise_rotation); flag(display_orientation_persistence_flag); } @@ -1964,7 +1948,7 @@ static int FUNC(sei_time_code)(CodedBitstreamContext *ctx, RWContext *rw, flags(discontinuity_flag[i], 1, i); flags(cnt_dropped_flag[i], 1, i); - us(9, n_frames[i], 0, MAX_UINT_BITS(9), 1, i); + ubs(9, n_frames[i], 1, i); if (current->full_timestamp_flag[i]) { us(6, seconds_value[i], 0, 59, 1, i); @@ -1984,11 +1968,9 @@ static int FUNC(sei_time_code)(CodedBitstreamContext *ctx, RWContext *rw, } } - us(5, time_offset_length[i], 0, 31, 1, i); + ubs(5, time_offset_length[i], 1, i); if (current->time_offset_length[i] > 0) - is(current->time_offset_length[i], time_offset_value[i], - MIN_INT_BITS(current->time_offset_length[i]), - MAX_INT_BITS(current->time_offset_length[i]), 1, i); + ibs(current->time_offset_length[i], time_offset_value[i], 1, i); else infer(time_offset_value[i], 0); } @@ -2027,8 +2009,8 @@ static int FUNC(sei_content_light_level)(CodedBitstreamContext *ctx, RWContext * HEADER("Content Light Level"); - u(16, max_content_light_level, 0, MAX_UINT_BITS(16)); - u(16, max_pic_average_light_level, 0, MAX_UINT_BITS(16)); + ub(16, max_content_light_level); + ub(16, max_pic_average_light_level); return 0; } @@ -2041,7 +2023,7 @@ static int FUNC(sei_alternative_transfer_characteristics)(CodedBitstreamContext HEADER("Alternative Transfer Characteristics"); - u(8, preferred_transfer_characteristics, 0, 255); + ub(8, preferred_transfer_characteristics); return 0; }

1 0

avcodec/cbs_av1: add missing value range constrains to timecode Metadata OBU
by James Almer 28 Apr '19

28 Apr '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Apr 17 01:23:36 2019 -0300| [67f9d3f461f65395f39d3e01801ce8b572d0aa12] | committer: James Almer avcodec/cbs_av1: add missing value range constrains to timecode Metadata OBU Also infer the value time_offset_length as 0 when it's not present. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67f9d3f461f65395f… --- libavcodec/cbs_av1_syntax_template.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 59a98b18c9..b04cd51d55 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1753,19 +1753,19 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, fb(9, n_frames); if (current->full_timestamp_flag) { - fb(6, seconds_value); - fb(6, minutes_value); - fb(5, hours_value); + fc(6, seconds_value, 0, 59); + fc(6, minutes_value, 0, 59); + fc(5, hours_value, 0, 23); } else { flag(seconds_flag); if (current->seconds_flag) { - fb(6, seconds_value); + fc(6, seconds_value, 0, 59); flag(minutes_flag); if (current->minutes_flag) { - fb(6, minutes_value); + fc(6, minutes_value, 0, 59); flag(hours_flag); if (current->hours_flag) - fb(5, hours_value); + fc(5, hours_value, 0, 23); } } } @@ -1773,6 +1773,8 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, fb(5, time_offset_length); if (current->time_offset_length > 0) fb(current->time_offset_length, time_offset_value); + else + infer(time_offset_length, 0); return 0; }

1 0

avformat/mxfdec: fix and enhance RIP KLV length checks
by Marton Balint 28 Apr '19

28 Apr '19

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Thu Apr 4 23:08:42 2019 +0200| [3dee6c09970dd0defad91e8270f66a4be3b6570d] | committer: Marton Balint avformat/mxfdec: fix and enhance RIP KLV length checks KLV length is BER encoded (variable size), but the code assumed the encoding to always use 4 bytes. Fixes parsing Random Index Pack in samples/MXF/issue2160/PW0805A0V01.4C5B5636.EFA330.mxf. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3dee6c09970dd0def… --- libavformat/mxfdec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 0f80d27534..bb72fb9841 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3138,9 +3138,12 @@ static void mxf_read_random_index_pack(AVFormatContext *s) goto end; avio_seek(s->pb, file_size - length, SEEK_SET); if (klv_read_packet(&klv, s->pb) < 0 || - !IS_KLV_KEY(klv.key, mxf_random_index_pack_key) || - klv.length != length - 20) + !IS_KLV_KEY(klv.key, mxf_random_index_pack_key)) goto end; + if (klv.next_klv != file_size || klv.length <= 4 || (klv.length - 4) % 12) { + av_log(s, AV_LOG_WARNING, "Invalid RIP KLV length\n"); + goto end; + } avio_skip(s->pb, klv.length - 12); mxf->footer_partition = avio_rb64(s->pb);

1 0

avformat/mxfdec: take into account run-in in find_partition_by_offset
by Marton Balint 28 Apr '19

28 Apr '19

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Wed Apr 3 01:46:59 2019 +0200| [fc15e8306f84396fa26798587552500ff2746ada] | committer: Marton Balint avformat/mxfdec: take into account run-in in find_partition_by_offset Also rename the function to find_partition_by_absolute_offset to make it clear offset is absolute. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc15e8306f84396fa… --- libavformat/mxfdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 034025bcaa..0f80d27534 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -429,19 +429,19 @@ static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv, int body_sid return s->nb_streams == 1 && s->streams[0]->priv_data ? 0 : -1; } -static int find_body_sid_by_offset(MXFContext *mxf, int64_t offset) +static int find_body_sid_by_absolute_offset(MXFContext *mxf, int64_t offset) { // we look for partition where the offset is placed int a, b, m; - int64_t this_partition; + int64_t pack_ofs; a = -1; b = mxf->partitions_count; while (b - a > 1) { - m = (a + b) >> 1; - this_partition = mxf->partitions[m].this_partition; - if (this_partition <= offset) + m = (a + b) >> 1; + pack_ofs = mxf->partitions[m].pack_ofs; + if (pack_ofs <= offset) a = m; else b = m; @@ -590,7 +590,7 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv if (!IS_KLV_KEY(klv, mxf_essence_element_key)) return AVERROR_INVALIDDATA; - body_sid = find_body_sid_by_offset(mxf, klv->offset); + body_sid = find_body_sid_by_absolute_offset(mxf, klv->offset); index = mxf_get_stream_index(s, klv, body_sid); if (index < 0) return AVERROR_INVALIDDATA; @@ -3471,7 +3471,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) if (IS_KLV_KEY(klv.key, mxf_essence_element_key) || IS_KLV_KEY(klv.key, mxf_canopus_essence_element_key) || IS_KLV_KEY(klv.key, mxf_avid_essence_element_key)) { - int body_sid = find_body_sid_by_offset(mxf, klv.offset); + int body_sid = find_body_sid_by_absolute_offset(mxf, klv.offset); int index = mxf_get_stream_index(s, &klv, body_sid); int64_t next_ofs; AVStream *st;

1 0

avformat/mxfdec: guess wrapping of tracks by other tracks with the same body sid
by Marton Balint 28 Apr '19

28 Apr '19

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sun Apr 7 02:27:49 2019 +0200| [5b6960f955a8914594182baeb1ab8f523acc5323] | committer: Marton Balint avformat/mxfdec: guess wrapping of tracks by other tracks with the same body sid This affects the following samples: samples/ffmpeg-bugs/roundup/issue1775/av_seek_frame_failure.mxf samples/ffmpeg-bugs/trac/ticket1957/16ch.mxf samples/ffmpeg-bugs/trac/ticket5016/r0.mxf samples/ffmpeg-bugs/trac/ticket5016/r1.mxf samples/ffmpeg-bugs/trac/ticket5316/hq.MXF samples/ffmpeg-bugs/trac/ticket5316/hqx.MXF Some AVPacket->pos values are changed because for frame wrapped tracks we point to the KLV offset and not the data. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b6960f955a891459… --- libavformat/mxfdec.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 2c44852062..034025bcaa 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2553,6 +2553,24 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) } } + for (int i = 0; i < mxf->fc->nb_streams; i++) { + MXFTrack *track1 = mxf->fc->streams[i]->priv_data; + if (track1 && track1->body_sid) { + for (int j = i + 1; j < mxf->fc->nb_streams; j++) { + MXFTrack *track2 = mxf->fc->streams[j]->priv_data; + if (track2 && track1->body_sid == track2->body_sid && track1->wrapping != track2->wrapping) { + if (track1->wrapping == UnknownWrapped) + track1->wrapping = track2->wrapping; + else if (track2->wrapping == UnknownWrapped) + track2->wrapping = track1->wrapping; + else + av_log(mxf->fc, AV_LOG_ERROR, "stream %d and stream %d have the same BodySID (%d) " + "with different wrapping\n", i, j, track1->body_sid); + } + } + } + } + ret = 0; fail_and_free: return ret;

1 0

avformat/mxfdec: rework mxf_essence_container_end
by Marton Balint 28 Apr '19

28 Apr '19

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sun Apr 7 02:06:35 2019 +0200| [a5136426a73261e5b5a493f33944be82b6b659c6] | committer: Marton Balint avformat/mxfdec: rework mxf_essence_container_end We find the last essence container much faster if we go through the partitions backwards... Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5136426a73261e5b… --- libavformat/mxfdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 3ea8de1666..2c44852062 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1545,10 +1545,7 @@ static int mxf_absolute_bodysid_offset(MXFContext *mxf, int body_sid, int64_t of */ static int64_t mxf_essence_container_end(MXFContext *mxf, int body_sid) { - int x; - int64_t ret = 0; - - for (x = 0; x < mxf->partitions_count; x++) { + for (int x = mxf->partitions_count - 1; x >= 0; x--) { MXFPartition *p = &mxf->partitions[x]; if (p->body_sid != body_sid) @@ -1557,10 +1554,10 @@ static int64_t mxf_essence_container_end(MXFContext *mxf, int body_sid) if (!p->essence_length) return 0; - ret = p->essence_offset + p->essence_length; + return p->essence_offset + p->essence_length; } - return ret; + return 0; } /* EditUnit -> absolute offset */

1 0