September 2023 - ffmpeg-cvslog

configure: Remove unnecessary vf_spp->fft dependency
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 18:28:55 2023 +0200| [12e9c68bbd16e8a9bcdc92da9f612753238fc361] | committer: Andreas Rheinhardt configure: Remove unnecessary vf_spp->fft dependency The AVDCT API used by this filter does in no way depend upon the FFT subsystem. Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e9c68bbd16e8a9b… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index dd52915cbc..20db1801ed 100755 --- a/configure +++ b/configure @@ -3809,7 +3809,7 @@ smartblur_filter_deps="gpl swscale" sobel_opencl_filter_deps="opencl" sofalizer_filter_deps="libmysofa" spp_filter_deps="gpl avcodec" -spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp" +spp_filter_select="idctdsp fdctdsp me_cmp pixblockdsp" sr_filter_deps="avformat swscale" sr_filter_select="dnn" stereo3d_filter_deps="gpl"

1 0

configure: Remove obsolete ffplay->rdft dependency
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 17:54:52 2023 +0200| [cbba45de68a09b68b5bdab944459a5ae04f65681] | committer: Andreas Rheinhardt configure: Remove obsolete ffplay->rdft dependency Forgotten in 4acd08be6c4f39736179a3d90fd56b508e42ff6d. Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbba45de68a09b68b… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 969bb00eef..dd52915cbc 100755 --- a/configure +++ b/configure @@ -3915,7 +3915,7 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter transpose_filter trim_filter vflip_filter" ffmpeg_suggest="ole32 psapi shell32" ffplay_deps="avcodec avformat avfilter swscale swresample sdl2" -ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" +ffplay_select="crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" ffplay_suggest="shell32" ffprobe_deps="avcodec avformat" ffprobe_suggest="shell32"

1 0

configure: Remove obsolete wmavoice->rdft,dct dependencies
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 17:52:06 2023 +0200| [44aa46184ceb5fb2205699cfd94b0bcc6693b781] | committer: Andreas Rheinhardt configure: Remove obsolete wmavoice->rdft,dct dependencies Forgotten in a810126501e1ef0992d765720ff0d2629c5d1616. Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44aa46184ceb5fb22… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b58dbe37ba..969bb00eef 100755 --- a/configure +++ b/configure @@ -3033,7 +3033,7 @@ wmav1_decoder_select="sinewin wma_freqs" wmav1_encoder_select="sinewin wma_freqs" wmav2_decoder_select="sinewin wma_freqs" wmav2_encoder_select="sinewin wma_freqs" -wmavoice_decoder_select="lsp rdft dct sinewin" +wmavoice_decoder_select="lsp sinewin" wmv1_decoder_select="msmpeg4dec" wmv1_encoder_select="msmpeg4enc" wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp"

1 0

avcodec/snow: Move freeing encoder-only buffers to snowenc.c
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Oct 9 07:03:10 2022 +0200| [7d112c638aaa6483a8e6a05d8b79f07092069b45] | committer: Andreas Rheinhardt avcodec/snow: Move freeing encoder-only buffers to snowenc.c Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d112c638aaa6483a… --- libavcodec/snow.c | 7 ------- libavcodec/snowenc.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 690d8c2ce5..59815d00d9 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -560,18 +560,11 @@ av_cold void ff_snow_common_end(SnowContext *s) av_freep(&s->temp_idwt_buffer); av_freep(&s->run_buffer); - s->m.me.temp= NULL; - av_freep(&s->m.me.scratchpad); - av_freep(&s->m.me.map); - av_freep(&s->m.sc.obmc_scratchpad); - av_freep(&s->block); av_freep(&s->scratchbuf); av_freep(&s->emu_edge_buffer); for(i=0; i<MAX_REF_FRAMES; i++){ - av_freep(&s->ref_mvs[i]); - av_freep(&s->ref_scores[i]); if(s->last_picture[i] && s->last_picture[i]->data[0]) { av_assert0(s->last_picture[i]->data[0] != s->current_picture->data[0]); } diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index a09f81939d..ab15c4e108 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -2022,6 +2022,17 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_snow_common_end(s); ff_rate_control_uninit(&s->m); av_frame_free(&s->input_picture); + + for (int i = 0; i < MAX_REF_FRAMES; i++) { + av_freep(&s->ref_mvs[i]); + av_freep(&s->ref_scores[i]); + } + + s->m.me.temp = NULL; + av_freep(&s->m.me.scratchpad); + av_freep(&s->m.me.map); + av_freep(&s->m.sc.obmc_scratchpad); + av_freep(&avctx->stats_out); return 0;

1 0

avcodec/snow: Move initializing HpelDSPContext to snowenc.c
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Oct 9 06:20:33 2022 +0200| [433925ac4d4a1eb0d2364e81e9f3e51e5d237895] | committer: Andreas Rheinhardt avcodec/snow: Move initializing HpelDSPContext to snowenc.c Only used by the encoder. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=433925ac4d4a1eb0d… --- configure | 2 +- libavcodec/snow.c | 1 - libavcodec/snowenc.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e1afcaa586..b58dbe37ba 100755 --- a/configure +++ b/configure @@ -2979,7 +2979,7 @@ screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" smvjpeg_decoder_select="mjpeg_decoder" -snow_decoder_select="dwt h264qpel hpeldsp rangecoder videodsp" +snow_decoder_select="dwt h264qpel rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 3bf1e8bdf8..690d8c2ce5 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -401,7 +401,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ s->max_ref_frames=1; //just make sure it's not an invalid value in case of no initial keyframe s->spatial_decomposition_count = 1; - ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_videodsp_init(&s->vdsp, 8); ff_dwt_init(&s->dwt); ff_h264qpel_init(&s->h264qpel, 8); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 84a6d1378b..a09f81939d 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -152,6 +152,8 @@ static av_cold int encode_init(AVCodecContext *avctx) s->plane[plane_index].fast_mc= 1; } + // Must be before ff_snow_common_init() + ff_hpeldsp_init(&s->hdsp, avctx->flags); if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; }

1 0

avcodec/snow: Move decoder/encoder-only inline funcs to snow(dec|enc).c
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Oct 9 07:36:22 2022 +0200| [abaf02a7e7653c6fbf99bc4f735f2679d3fe4624] | committer: Andreas Rheinhardt avcodec/snow: Move decoder/encoder-only inline funcs to snow(dec|enc).c Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abaf02a7e7653c6fb… --- libavcodec/snow.h | 219 --------------------------------------------------- libavcodec/snowdec.c | 147 ++++++++++++++++++++++++++++++++++ libavcodec/snowenc.c | 64 +++++++++++++++ 3 files changed, 211 insertions(+), 219 deletions(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 73c4535ec1..1c87577699 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -485,227 +485,8 @@ static inline void set_blocks(SnowContext *s, int level, int x, int y, int l, in } } -static inline void init_ref(MotionEstContext *c, const uint8_t *const src[3], uint8_t *const ref[3], uint8_t *const ref2[3], int x, int y, int ref_index){ - SnowContext *s = c->avctx->priv_data; - const int offset[3]= { - y*c-> stride + x, - ((y*c->uvstride + x)>>s->chroma_h_shift), - ((y*c->uvstride + x)>>s->chroma_h_shift), - }; - int i; - for(i=0; i<3; i++){ - c->src[0][i]= src [i]; - c->ref[0][i]= ref [i] + offset[i]; - } - av_assert2(!ref_index); -} - - -/* bitstream functions */ - extern const int8_t ff_quant3bA[256]; #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0 -static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){ - int i; - - if(v){ - const int a= FFABS(v); - const int e= av_log2(a); - const int el= FFMIN(e, 10); - put_rac(c, state+0, 0); - - for(i=0; i<el; i++){ - put_rac(c, state+1+i, 1); //1..10 - } - for(; i<e; i++){ - put_rac(c, state+1+9, 1); //1..10 - } - put_rac(c, state+1+FFMIN(i,9), 0); - - for(i=e-1; i>=el; i--){ - put_rac(c, state+22+9, (a>>i)&1); //22..31 - } - for(; i>=0; i--){ - put_rac(c, state+22+i, (a>>i)&1); //22..31 - } - - if(is_signed) - put_rac(c, state+11 + el, v < 0); //11..21 - }else{ - put_rac(c, state+0, 1); - } -} - -static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){ - if(get_rac(c, state+0)) - return 0; - else{ - int i, e; - unsigned a; - e= 0; - while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10 - e++; - if (e > 31) - return AVERROR_INVALIDDATA; - } - - a= 1; - for(i=e-1; i>=0; i--){ - a += a + get_rac(c, state+22 + FFMIN(i,9)); //22..31 - } - - e= -(is_signed && get_rac(c, state+11 + FFMIN(e,10))); //11..21 - return (a^e)-e; - } -} - -static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2){ - int i; - int r= log2>=0 ? 1<<log2 : 1; - - av_assert2(v>=0); - av_assert2(log2>=-4); - - while(v >= r){ - put_rac(c, state+4+log2, 1); - v -= r; - log2++; - if(log2>0) r+=r; - } - put_rac(c, state+4+log2, 0); - - for(i=log2-1; i>=0; i--){ - put_rac(c, state+31-i, (v>>i)&1); - } -} - -static inline int get_symbol2(RangeCoder *c, uint8_t *state, int log2){ - int i; - int r= log2>=0 ? 1<<log2 : 1; - int v=0; - - av_assert2(log2>=-4); - - while(log2<28 && get_rac(c, state+4+log2)){ - v+= r; - log2++; - if(log2>0) r+=r; - } - - for(i=log2-1; i>=0; i--){ - v+= get_rac(c, state+31-i)<<i; - } - - return v; -} - -static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){ - const int w= b->width; - const int h= b->height; - int x,y; - - int run, runs; - x_and_coeff *xc= b->x_coeff; - x_and_coeff *prev_xc= NULL; - x_and_coeff *prev2_xc= xc; - x_and_coeff *parent_xc= parent ? parent->x_coeff : NULL; - x_and_coeff *prev_parent_xc= parent_xc; - - runs= get_symbol2(&s->c, b->state[30], 0); - if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3); - else run= INT_MAX; - - for(y=0; y<h; y++){ - int v=0; - int lt=0, t=0, rt=0; - - if(y && prev_xc->x == 0){ - rt= prev_xc->coeff; - } - for(x=0; x<w; x++){ - int p=0; - const int l= v; - - lt= t; t= rt; - - if(y){ - if(prev_xc->x <= x) - prev_xc++; - if(prev_xc->x == x + 1) - rt= prev_xc->coeff; - else - rt=0; - } - if(parent_xc){ - if(x>>1 > parent_xc->x){ - parent_xc++; - } - if(x>>1 == parent_xc->x){ - p= parent_xc->coeff; - } - } - if(/*ll|*/l|lt|t|rt|p){ - int context= av_log2(/*FFABS(ll) + */3*(l>>1) + (lt>>1) + (t&~1) + (rt>>1) + (p>>1)); - - v=get_rac(&s->c, &b->state[0][context]); - if(v){ - v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1); - v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l&0xFF] + 3*ff_quant3bA[t&0xFF]]); - if ((uint16_t)v != v) { - av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); - v = 1; - } - xc->x=x; - (xc++)->coeff= v; - } - }else{ - if(!run){ - if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3); - else run= INT_MAX; - v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1); - v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]); - if ((uint16_t)v != v) { - av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); - v = 1; - } - - xc->x=x; - (xc++)->coeff= v; - }else{ - int max_run; - run--; - v=0; - av_assert2(run >= 0); - if(y) max_run= FFMIN(run, prev_xc->x - x - 2); - else max_run= FFMIN(run, w-x-1); - if(parent_xc) - max_run= FFMIN(max_run, 2*parent_xc->x - x - 1); - av_assert2(max_run >= 0 && max_run <= run); - - x+= max_run; - run-= max_run; - } - } - } - (xc++)->x= w+1; //end marker - prev_xc= prev2_xc; - prev2_xc= xc; - - if(parent_xc){ - if(y&1){ - while(parent_xc->x != parent->width+1) - parent_xc++; - parent_xc++; - prev_parent_xc= parent_xc; - }else{ - parent_xc= prev_parent_xc; - } - } - } - - (xc++)->x= w+1; //end marker -} - #endif /* AVCODEC_SNOW_H */ diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index e77dc8ce8a..70fbab9a49 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -31,6 +31,153 @@ #include "rangecoder.h" #include "mathops.h" +static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed) +{ + if (get_rac(c, state + 0)) + return 0; + else { + int e; + unsigned a; + e = 0; + while (get_rac(c, state + 1 + FFMIN(e, 9))) { //1..10 + e++; + if (e > 31) + return AVERROR_INVALIDDATA; + } + + a = 1; + for (int i = e - 1; i >= 0; i--) + a += a + get_rac(c, state + 22 + FFMIN(i, 9)); //22..31 + + e = -(is_signed && get_rac(c, state + 11 + FFMIN(e, 10))); //11..21 + return (a ^ e) - e; + } +} + +static inline int get_symbol2(RangeCoder *c, uint8_t *state, int log2) +{ + int r = log2 >= 0 ? 1 << log2 : 1; + int v = 0; + + av_assert2(log2 >= -4); + + while (log2 < 28 && get_rac(c, state + 4 + log2)) { + v += r; + log2++; + if (log2 > 0) r += r; + } + + for (int i = log2 - 1; i >= 0; i--) + v += get_rac(c, state + 31 - i) << i; + + return v; +} + +static void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation) +{ + const int w = b->width; + const int h = b->height; + + int run, runs; + x_and_coeff *xc = b->x_coeff; + x_and_coeff *prev_xc = NULL; + x_and_coeff *prev2_xc = xc; + x_and_coeff *parent_xc = parent ? parent->x_coeff : NULL; + x_and_coeff *prev_parent_xc = parent_xc; + + runs = get_symbol2(&s->c, b->state[30], 0); + if (runs-- > 0) run = get_symbol2(&s->c, b->state[1], 3); + else run = INT_MAX; + + for (int y = 0; y < h; y++) { + int v = 0; + int lt = 0, t = 0, rt = 0; + + if (y && prev_xc->x == 0) + rt = prev_xc->coeff; + + for (int x = 0; x < w; x++) { + int p = 0; + const int l = v; + + lt= t; t= rt; + + if (y) { + if (prev_xc->x <= x) + prev_xc++; + if (prev_xc->x == x + 1) + rt = prev_xc->coeff; + else + rt = 0; + } + if (parent_xc) { + if (x>>1 > parent_xc->x) + parent_xc++; + if (x>>1 == parent_xc->x) + p = parent_xc->coeff; + } + if (/*ll|*/l|lt|t|rt|p) { + int context = av_log2(/*FFABS(ll) + */3*(l>>1) + (lt>>1) + (t&~1) + (rt>>1) + (p>>1)); + + v = get_rac(&s->c, &b->state[0][context]); + if (v) { + v = 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1); + v += get_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l&0xFF] + 3 * ff_quant3bA[t&0xFF]]); + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } + xc->x = x; + (xc++)->coeff = v; + } + } else { + if (!run) { + if (runs-- > 0) run = get_symbol2(&s->c, b->state[1], 3); + else run = INT_MAX; + v = 2 * (get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1); + v += get_rac(&s->c, &b->state[0][16 + 1 + 3]); + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } + + xc->x = x; + (xc++)->coeff = v; + } else { + int max_run; + run--; + v = 0; + av_assert2(run >= 0); + if (y) max_run = FFMIN(run, prev_xc->x - x - 2); + else max_run = FFMIN(run, w-x-1); + if (parent_xc) + max_run = FFMIN(max_run, 2*parent_xc->x - x - 1); + av_assert2(max_run >= 0 && max_run <= run); + + x += max_run; + run -= max_run; + } + } + } + (xc++)->x = w+1; //end marker + prev_xc = prev2_xc; + prev2_xc = xc; + + if (parent_xc) { + if (y & 1) { + while (parent_xc->x != parent->width+1) + parent_xc++; + parent_xc++; + prev_parent_xc= parent_xc; + } else { + parent_xc= prev_parent_xc; + } + } + } + + (xc++)->x = w + 1; //end marker +} + static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * old_buffer, int plane_index, int add, int mb_y){ Plane *p= &s->plane[plane_index]; const int mb_w= s->b_width << s->block_max_depth; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 571258c8c9..84a6d1378b 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -39,6 +39,70 @@ #include "mpegvideo.h" #include "h263enc.h" +static void init_ref(MotionEstContext *c, const uint8_t *const src[3], + uint8_t *const ref[3], uint8_t *const ref2[3], + int x, int y, int ref_index) +{ + SnowContext *s = c->avctx->priv_data; + const int offset[3] = { + y*c-> stride + x, + ((y*c->uvstride + x) >> s->chroma_h_shift), + ((y*c->uvstride + x) >> s->chroma_h_shift), + }; + for (int i = 0; i < 3; i++) { + c->src[0][i] = src [i]; + c->ref[0][i] = ref [i] + offset[i]; + } + av_assert2(!ref_index); +} + +static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed) +{ + if (v) { + const int a = FFABS(v); + const int e = av_log2(a); + const int el = FFMIN(e, 10); + int i; + + put_rac(c, state + 0, 0); + + for (i = 0; i < el; i++) + put_rac(c, state + 1 + i, 1); //1..10 + for(; i < e; i++) + put_rac(c, state + 1 + 9, 1); //1..10 + put_rac(c, state + 1 + FFMIN(i, 9), 0); + + for (i = e - 1; i >= el; i--) + put_rac(c, state + 22 + 9, (a >> i) & 1); //22..31 + for(; i >= 0; i--) + put_rac(c, state + 22 + i, (a >> i) & 1); //22..31 + + if (is_signed) + put_rac(c, state + 11 + el, v < 0); //11..21 + } else { + put_rac(c, state + 0, 1); + } +} + +static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2) +{ + int r = log2 >= 0 ? 1<<log2 : 1; + + av_assert2(v >= 0); + av_assert2(log2 >= -4); + + while (v >= r) { + put_rac(c, state + 4 + log2, 1); + v -= r; + log2++; + if (log2 > 0) r += r; + } + put_rac(c, state + 4 + log2, 0); + + for (int i = log2 - 1; i >= 0; i--) + put_rac(c, state + 31 - i, (v >> i) & 1); +} + static int get_encode_buffer(SnowContext *s, AVFrame *frame) { int ret;

1 0

avcodec/snow: Move initializing QpelDSPContext to snowenc.c
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Oct 9 06:14:13 2022 +0200| [10dad7ccc2c613be5d7f4fc339e0ce332e59725b] | committer: Andreas Rheinhardt avcodec/snow: Move initializing QpelDSPContext to snowenc.c Only used by the encoder. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10dad7ccc2c613be5… --- libavcodec/snow.c | 25 ------------------------- libavcodec/snowenc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 90197976fb..3bf1e8bdf8 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -406,31 +406,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ ff_dwt_init(&s->dwt); ff_h264qpel_init(&s->h264qpel, 8); -#define mcf(dx,dy)\ - s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\ - s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ - s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ - s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\ - s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ - s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; - - mcf( 0, 0) - mcf( 4, 0) - mcf( 8, 0) - mcf(12, 0) - mcf( 0, 4) - mcf( 4, 4) - mcf( 8, 4) - mcf(12, 4) - mcf( 0, 8) - mcf( 4, 8) - mcf( 8, 8) - mcf(12, 8) - mcf( 0,12) - mcf( 4,12) - mcf( 8,12) - mcf(12,12) - #define mcfh(dx,dy)\ s->hdsp.put_pixels_tab [0][dy/4+dx/8]=\ s->hdsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\ diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index f954a686c1..571258c8c9 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -91,6 +91,32 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; } + +#define mcf(dx,dy)\ + s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ + s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ + s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ + s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; + + mcf( 0, 0) + mcf( 4, 0) + mcf( 8, 0) + mcf(12, 0) + mcf( 0, 4) + mcf( 4, 4) + mcf( 8, 4) + mcf(12, 4) + mcf( 0, 8) + mcf( 4, 8) + mcf( 8, 8) + mcf(12, 8) + mcf( 0,12) + mcf( 4,12) + mcf( 8,12) + mcf(12,12) + ff_me_cmp_init(&s->mecc, avctx); ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);

1 0

avfilter/vf_pseudocolor: add support for more planar alpha formats
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 28 23:07:24 2023 +0200| [7ce2e5f3ea3acf09b786bf3500989f0955deb71c] | committer: Paul B Mahol avfilter/vf_pseudocolor: add support for more planar alpha formats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ce2e5f3ea3acf09b… --- libavfilter/vf_pseudocolor.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 81b2e5b9bc..9a7a7ff164 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -384,8 +384,8 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUV420P12, - AV_PIX_FMT_YUV422P12, - AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUVA422P12, + AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14, @@ -395,7 +395,7 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, - AV_PIX_FMT_GBRP14, + AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRAP14, AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; @@ -901,6 +901,7 @@ static int config_input(AVFilterLink *inlink) case AV_PIX_FMT_YUV444P10: case AV_PIX_FMT_YUVA444P10: case AV_PIX_FMT_YUV444P12: + case AV_PIX_FMT_YUVA444P12: case AV_PIX_FMT_YUV444P14: case AV_PIX_FMT_YUV444P16: case AV_PIX_FMT_YUVA444P16: @@ -911,6 +912,7 @@ static int config_input(AVFilterLink *inlink) case AV_PIX_FMT_GBRP16: case AV_PIX_FMT_GBRAP10: case AV_PIX_FMT_GBRAP12: + case AV_PIX_FMT_GBRAP14: case AV_PIX_FMT_GBRAP16: case AV_PIX_FMT_GRAY9: case AV_PIX_FMT_GRAY10: @@ -924,6 +926,7 @@ static int config_input(AVFilterLink *inlink) case AV_PIX_FMT_YUV422P10: case AV_PIX_FMT_YUVA422P10: case AV_PIX_FMT_YUV422P12: + case AV_PIX_FMT_YUVA422P12: case AV_PIX_FMT_YUV422P14: case AV_PIX_FMT_YUV422P16: case AV_PIX_FMT_YUVA422P16:

1 0

avfilter/vf_zscale: fix adding >8 bit alpha plane
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 28 22:43:23 2023 +0200| [0aa75a85e6cf6698784ddf8138059399dd89c2b7] | committer: Paul B Mahol avfilter/vf_zscale: fix adding >8 bit alpha plane > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0aa75a85e6cf66987… --- libavfilter/vf_zscale.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index b6f040980c..788870ffaf 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -901,14 +901,22 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) int x, y; if (odesc->flags & AV_PIX_FMT_FLAG_FLOAT) { for (y = 0; y < out->height; y++) { + const ptrdiff_t row = y * out->linesize[3]; for (x = 0; x < out->width; x++) { - AV_WN32(out->data[3] + x * odesc->comp[3].step + y * out->linesize[3], + AV_WN32(out->data[3] + x * odesc->comp[3].step + row, av_float2int(1.0f)); } } - } else { + } else if (s->dst_format.depth == 8) { for (y = 0; y < outlink->h; y++) memset(out->data[3] + y * out->linesize[3], 0xff, outlink->w); + } else { + const uint16_t max = (1 << s->dst_format.depth) - 1; + for (y = 0; y < outlink->h; y++) { + const ptrdiff_t row = y * out->linesize[3]; + for (x = 0; x < out->width; x++) + AV_WN16(out->data[3] + x * odesc->comp[3].step + row, max); + } } } } else {

1 0

avfilter/vf_zscale: add more planar formats with alpha
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 28 22:23:13 2023 +0200| [086c28090177b5255770fdf57af4978d64c20762] | committer: Paul B Mahol avfilter/vf_zscale: add more planar formats with alpha > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=086c28090177b5255… --- libavfilter/vf_zscale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 999147b587..b6f040980c 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -210,10 +210,11 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, + AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, - AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP16, + AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP14, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, AV_PIX_FMT_NONE };

1 0