[FFmpeg-devel] [PATCH 1/2] avcodec/snowenc: AV_CODEC_CAP_ENCODER_RECON_FRAME support

[Michael Niedermayer]

On Sun, Mar 19, 2023 at 12:34:50PM -0300, James Almer wrote:
> On 3/19/2023 11:15 AM, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >   libavcodec/snowenc.c | 10 +++++++++-
> >   1 file changed, 9 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
> > index 658684c575..a03e4292ee 100644
> > --- a/libavcodec/snowenc.c
> > +++ b/libavcodec/snowenc.c
> > @@ -26,6 +26,7 @@
> >   #include "avcodec.h"
> >   #include "codec_internal.h"
> >   #include "encode.h"
> > +#include "internal.h" //For AVCodecInternal.recon_frame
> >   #include "me_cmp.h"
> >   #include "packet_internal.h"
> >   #include "snow_dwt.h"
> > @@ -1576,6 +1577,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
> >   {
> >       SnowContext *s = avctx->priv_data;
> >       RangeCoder * const c= &s->c;
> > +    AVCodecInternal *avci = avctx->internal;
> >       AVFrame *pic;
> >       const int width= s->avctx->width;
> >       const int height= s->avctx->height;
> > @@ -1877,6 +1879,10 @@ redo_frame:
> >                                      s->encoding_error,
> >                                      (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? SNOW_MAX_PLANES : 0,
> >                                      s->current_picture->pict_type);
> > +    if (avci->recon_frame) {
> 
> The proper check is (s->avctx->flags & AV_CODEC_FLAG_RECON_FRAME).
> avci->recon_frame could start being allocated unconditionally in the future
> for whatever reason.

The docomentation says:
    /**
     * When the AV_CODEC_FLAG_RECON_FRAME flag is used. the encoder should store
     * here the reconstructed frame corresponding to the last returned packet.
     *
     * Not allocated in other cases.
     */
    AVFrame *recon_frame;
    
If thats not meant to be assumed to be true, the documentation should state
this differently

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20230319/6169483f/attachment.sig>