• Andreas Rheinhardt's avatar
    avcodec/mpegpicture: Move mb_var, mc_mb_var and mb_mean to MpegEncCtx · bc109a53
    Andreas Rheinhardt authored
    These tables are only used by encoders and only for the current picture;
    ergo they need not be put into the picture at all, but rather into
    the encoder's context. They also don't need to be refcounted,
    because there is only one owner.
    
    In contrast to this, the earlier code refcounts them which
    incurs unnecessary overhead. These references are not unreferenced
    in ff_mpeg_unref_picture() (they are kept in order to have something
    like a buffer pool), so that several buffers are kept at the same
    time, although only one is needed, thereby wasting memory.
    
    The code also propagates references to other pictures not part of
    the pictures array (namely the copy of the current/next/last picture
    in the MpegEncContext which get references of their own). These
    references are not unreferenced in ff_mpeg_unref_picture() (the
    buffers are probably kept in order to have something like a pool),
    yet if the current picture is a B-frame, it gets unreferenced
    at the end of ff_mpv_encode_picture() and its slot in the picture
    array will therefore be reused the next time; but the copy of the
    current picture also still has its references and therefore
    these buffers will be made duplicated in order to make them writable
    in the next call to ff_mpv_encode_picture(). This is of course
    unnecessary.
    
    Finally, ff_find_unused_picture() is supposed to just return
    any unused picture and the code is supposed to work with it;
    yet for the vsynth*-mpeg4-adap tests the result depends upon
    the content of these buffers; given that this patchset
    changes the content of these buffers (the initial content is now
    the state of these buffers after encoding the last frame;
    before this patch the buffers used came from the last picture
    that occupied the same slot in the picture array) their ref-files
    needed to be changed. This points to a bug somewhere (if one removes
    the initialization, one gets uninitialized reads in
    adaptive_quantization in ratecontrol.c).
    Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@outlook.com>
    bc109a53
vsynth_lena-mpeg4-adap 2.67 KB