| Message ID | 20220612171845.8122-1-cus@passwd.hu |
|---|---|
| State | Accepted |
| Commit | 9793760f22ccbaeda2a3462d2d235bd7b6fe013b |
| Headers | show |
| Series | [FFmpeg-devel,1/7] avcodec/v210dec: properly support odd widths | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Sun, 12 Jun 2022, Marton Balint wrote: > Fixes ticket #5195. > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavcodec/v210dec.c | 49 +++++++++++++++++++++++++++++--------------- > 1 file changed, 33 insertions(+), 16 deletions(-) Will apply the series. Regards, Marton > > diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c > index 6c10ef6a7c..48ebe57100 100644 > --- a/libavcodec/v210dec.c > +++ b/libavcodec/v210dec.c > @@ -60,14 +60,16 @@ static int v210_decode_slice(AVCodecContext *avctx, void *arg, int jobnr, int th > int slice_start = (avctx->height * jobnr) / s->thread_count; > int slice_end = (avctx->height * (jobnr+1)) / s->thread_count; > uint8_t *psrc = td->buf + stride * slice_start; > - uint16_t *y, *u, *v; > + int16_t *py = (uint16_t*)frame->data[0] + slice_start * frame->linesize[0] / 2; > + int16_t *pu = (uint16_t*)frame->data[1] + slice_start * frame->linesize[1] / 2; > + int16_t *pv = (uint16_t*)frame->data[2] + slice_start * frame->linesize[2] / 2; > > - y = (uint16_t*)frame->data[0] + slice_start * frame->linesize[0] / 2; > - u = (uint16_t*)frame->data[1] + slice_start * frame->linesize[1] / 2; > - v = (uint16_t*)frame->data[2] + slice_start * frame->linesize[2] / 2; > for (h = slice_start; h < slice_end; h++) { > const uint32_t *src = (const uint32_t*)psrc; > uint32_t val; > + uint16_t *y = py; > + uint16_t *u = pu; > + uint16_t *v = pv; > > w = (avctx->width / 12) * 12; > s->unpack_frame(src, y, u, v, w); > @@ -85,25 +87,40 @@ static int v210_decode_slice(AVCodecContext *avctx, void *arg, int jobnr, int th > w += 6; > } > > - if (w < avctx->width - 1) { > + if (w++ < avctx->width) { > READ_PIXELS(u, y, v); > > - val = av_le2ne32(*src++); > - *y++ = val & 0x3FF; > - if (w < avctx->width - 3) { > - *u++ = (val >> 10) & 0x3FF; > - *y++ = (val >> 20) & 0x3FF; > - > + if (w++ < avctx->width) { > val = av_le2ne32(*src++); > - *v++ = val & 0x3FF; > - *y++ = (val >> 10) & 0x3FF; > + *y++ = val & 0x3FF; > + > + if (w++ < avctx->width) { > + *u++ = (val >> 10) & 0x3FF; > + *y++ = (val >> 20) & 0x3FF; > + val = av_le2ne32(*src++); > + *v++ = val & 0x3FF; > + > + if (w++ < avctx->width) { > + *y++ = (val >> 10) & 0x3FF; > + > + if (w++ < avctx->width) { > + *u++ = (val >> 20) & 0x3FF; > + val = av_le2ne32(*src++); > + *y++ = val & 0x3FF; > + *v++ = (val >> 10) & 0x3FF; > + > + if (w++ < avctx->width) > + *y++ = (val >> 20) & 0x3FF; > + } > + } > + } > } > } > > psrc += stride; > - y += frame->linesize[0] / 2 - avctx->width + (avctx->width & 1); > - u += frame->linesize[1] / 2 - avctx->width / 2; > - v += frame->linesize[2] / 2 - avctx->width / 2; > + py += frame->linesize[0] / 2; > + pu += frame->linesize[1] / 2; > + pv += frame->linesize[2] / 2; > } > > return 0; > -- > 2.34.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index 6c10ef6a7c..48ebe57100 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -60,14 +60,16 @@ static int v210_decode_slice(AVCodecContext *avctx, void *arg, int jobnr, int th int slice_start = (avctx->height * jobnr) / s->thread_count; int slice_end = (avctx->height * (jobnr+1)) / s->thread_count; uint8_t *psrc = td->buf + stride * slice_start; - uint16_t *y, *u, *v; + int16_t *py = (uint16_t*)frame->data[0] + slice_start * frame->linesize[0] / 2; + int16_t *pu = (uint16_t*)frame->data[1] + slice_start * frame->linesize[1] / 2; + int16_t *pv = (uint16_t*)frame->data[2] + slice_start * frame->linesize[2] / 2; - y = (uint16_t*)frame->data[0] + slice_start * frame->linesize[0] / 2; - u = (uint16_t*)frame->data[1] + slice_start * frame->linesize[1] / 2; - v = (uint16_t*)frame->data[2] + slice_start * frame->linesize[2] / 2; for (h = slice_start; h < slice_end; h++) { const uint32_t *src = (const uint32_t*)psrc; uint32_t val; + uint16_t *y = py; + uint16_t *u = pu; + uint16_t *v = pv; w = (avctx->width / 12) * 12; s->unpack_frame(src, y, u, v, w); @@ -85,25 +87,40 @@ static int v210_decode_slice(AVCodecContext *avctx, void *arg, int jobnr, int th w += 6; } - if (w < avctx->width - 1) { + if (w++ < avctx->width) { READ_PIXELS(u, y, v); - val = av_le2ne32(*src++); - *y++ = val & 0x3FF; - if (w < avctx->width - 3) { - *u++ = (val >> 10) & 0x3FF; - *y++ = (val >> 20) & 0x3FF; - + if (w++ < avctx->width) { val = av_le2ne32(*src++); - *v++ = val & 0x3FF; - *y++ = (val >> 10) & 0x3FF; + *y++ = val & 0x3FF; + + if (w++ < avctx->width) { + *u++ = (val >> 10) & 0x3FF; + *y++ = (val >> 20) & 0x3FF; + val = av_le2ne32(*src++); + *v++ = val & 0x3FF; + + if (w++ < avctx->width) { + *y++ = (val >> 10) & 0x3FF; + + if (w++ < avctx->width) { + *u++ = (val >> 20) & 0x3FF; + val = av_le2ne32(*src++); + *y++ = val & 0x3FF; + *v++ = (val >> 10) & 0x3FF; + + if (w++ < avctx->width) + *y++ = (val >> 20) & 0x3FF; + } + } + } } } psrc += stride; - y += frame->linesize[0] / 2 - avctx->width + (avctx->width & 1); - u += frame->linesize[1] / 2 - avctx->width / 2; - v += frame->linesize[2] / 2 - avctx->width / 2; + py += frame->linesize[0] / 2; + pu += frame->linesize[1] / 2; + pv += frame->linesize[2] / 2; } return 0;
Fixes ticket #5195. Signed-off-by: Marton Balint <cus@passwd.hu> --- libavcodec/v210dec.c | 49 +++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 16 deletions(-)