From: Marton Balint <cus@passwd.hu>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 1/7] avcodec/v210dec: properly support odd widths
Date: Mon, 20 Jun 2022 23:06:00 +0200 (CEST)
Message-ID: <151e762-ce39-d9bf-843e-919c6473899f@passwd.hu> (raw)
In-Reply-To: <20220612171845.8122-1-cus@passwd.hu>
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".
>
_______________________________________________
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".
prev parent reply other threads:[~2022-06-20 21:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-12 17:18 Marton Balint
2022-06-12 17:18 ` [FFmpeg-devel] [PATCH 2/7] avcodec/v210dec: factorize row decoding Marton Balint
2022-06-12 17:18 ` [FFmpeg-devel] [PATCH 3/7] avcodec/v210dec: disallow negative custom stride Marton Balint
2022-06-12 17:18 ` [FFmpeg-devel] [PATCH 4/7] avcodec/v210dec: do not use accelerated code for the last pixels of a row Marton Balint
2022-06-12 17:18 ` [FFmpeg-devel] [PATCH 5/7] avcodec/v210dec: add support for invalid paddings up to 16 bytes Marton Balint
2022-06-12 17:18 ` [FFmpeg-devel] [PATCH 6/7] avcodec/v210dec: add support for strideless v210 as in BOXX files Marton Balint
2022-06-12 17:18 ` [FFmpeg-devel] [PATCH 7/7] doc/decoders: add docs for v210 decoder Marton Balint
2022-06-20 21:06 ` Marton Balint [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=151e762-ce39-d9bf-843e-919c6473899f@passwd.hu \
--to=cus@passwd.hu \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git