RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vd_lavc: align buffers to multiple of image size 

Fixes: https://github.com/mpv-player/mpv/issues/12672
This commit is contained in:
Niklas Haas 2023-10-19 17:53:30 +02:00 committed by Niklas Haas
parent 50cd363c01
commit f369e65261
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/decode/vd_lavc.c
View File

@ -1022,6 +1022,13 @@ static int get_buffer2_direct(AVCodecContext *avctx, AVFrame *pic, int flags)
for (int n = 0; n < AV_NUM_DATA_POINTERS; n++)
stride_align = MPMAX(stride_align, linesize_align[n]);
// Note: texel sizes may be NPOT, so use full lcm instead of max
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pic->format);
if (!(desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)) {
for (int n = 0; n < desc->nb_components; n++)
stride_align = mp_lcm(stride_align, desc->comp[n].step);
}
int imgfmt = pixfmt2imgfmt(pic->format);
if (!imgfmt)
goto fallback;

4
video/out/vo.h
View File

@ -356,8 +356,8 @@ struct vo_driver {
* allocated image. It's even possible that only 1 plane uses the buffer
* allocated by the get_image function. The VO has to check for this.
*
* stride_align is always a value >=1 that is a power of 2. The stride
* values of the returned image must be divisible by this value.
* stride_align is always a value >=1. The stride values of the returned
* image must be divisible by this value. This may be a non power of two.
*
* flags is a combination of VO_DR_FLAG_* flags.
*