* [FFmpeg-devel] [PATCH] ffv1dec: fix threaded decode failures
@ 2025-02-05 14:47 Lynne
2025-02-05 14:51 ` James Almer
0 siblings, 1 reply; 4+ messages in thread
From: Lynne @ 2025-02-05 14:47 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Lynne
Fixes 7187eadf8c0f0c640f1d23811c55fad0cba60aa5
The issue is that while avctx->pix_fmt is synchronized between
threads, f->pix_fmt was not.
Fixes fate-vsynth1-ffv1-2pass10 with THREADS=2.
---
libavcodec/ffv1dec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index fcf3d525ac..0284845503 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -1114,6 +1114,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
fdst->plane_count = fsrc->plane_count;
fdst->ac = fsrc->ac;
fdst->colorspace = fsrc->colorspace;
+ fdst->pix_fmt = fsrc->pix_fmt;
fdst->ec = fsrc->ec;
fdst->intra = fsrc->intra;
--
2.47.2
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] ffv1dec: fix threaded decode failures
2025-02-05 14:47 [FFmpeg-devel] [PATCH] ffv1dec: fix threaded decode failures Lynne
@ 2025-02-05 14:51 ` James Almer
2025-02-05 16:26 ` Lynne
0 siblings, 1 reply; 4+ messages in thread
From: James Almer @ 2025-02-05 14:51 UTC (permalink / raw)
To: ffmpeg-devel
[-- Attachment #1.1.1: Type: text/plain, Size: 1019 bytes --]
On 2/5/2025 11:47 AM, Lynne wrote:
> Fixes 7187eadf8c0f0c640f1d23811c55fad0cba60aa5
>
> The issue is that while avctx->pix_fmt is synchronized between
> threads, f->pix_fmt was not.
>
> Fixes fate-vsynth1-ffv1-2pass10 with THREADS=2.
Can confirm "make fate-vsynth{1,2,3,_lena} THREADS=2" (as well as higher
thread count) passes with this patch.
> ---
> libavcodec/ffv1dec.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
> index fcf3d525ac..0284845503 100644
> --- a/libavcodec/ffv1dec.c
> +++ b/libavcodec/ffv1dec.c
> @@ -1114,6 +1114,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
> fdst->plane_count = fsrc->plane_count;
> fdst->ac = fsrc->ac;
> fdst->colorspace = fsrc->colorspace;
> + fdst->pix_fmt = fsrc->pix_fmt;
>
> fdst->ec = fsrc->ec;
> fdst->intra = fsrc->intra;
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] ffv1dec: fix threaded decode failures
2025-02-05 14:51 ` James Almer
@ 2025-02-05 16:26 ` Lynne
2025-02-06 6:59 ` Lynne
0 siblings, 1 reply; 4+ messages in thread
From: Lynne @ 2025-02-05 16:26 UTC (permalink / raw)
To: ffmpeg-devel
[-- Attachment #1.1.1.1: Type: text/plain, Size: 1533 bytes --]
On 05/02/2025 15:51, James Almer wrote:
> On 2/5/2025 11:47 AM, Lynne wrote:
>> Fixes 7187eadf8c0f0c640f1d23811c55fad0cba60aa5
>>
>> The issue is that while avctx->pix_fmt is synchronized between
>> threads, f->pix_fmt was not.
>>
>> Fixes fate-vsynth1-ffv1-2pass10 with THREADS=2.
>
> Can confirm "make fate-vsynth{1,2,3,_lena} THREADS=2" (as well as higher
> thread count) passes with this patch.
>
>> ---
>> libavcodec/ffv1dec.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
>> index fcf3d525ac..0284845503 100644
>> --- a/libavcodec/ffv1dec.c
>> +++ b/libavcodec/ffv1dec.c
>> @@ -1114,6 +1114,7 @@ static int update_thread_context(AVCodecContext
>> *dst, const AVCodecContext *src)
>> fdst->plane_count = fsrc->plane_count;
>> fdst->ac = fsrc->ac;
>> fdst->colorspace = fsrc->colorspace;
>> + fdst->pix_fmt = fsrc->pix_fmt;
>> fdst->ec = fsrc->ec;
>> fdst->intra = fsrc->intra;
>
>
> _______________________________________________
> 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".
Thanks.
I'll push this soon unless there are objections.
[-- Attachment #1.1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 637 bytes --]
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] ffv1dec: fix threaded decode failures
2025-02-05 16:26 ` Lynne
@ 2025-02-06 6:59 ` Lynne
0 siblings, 0 replies; 4+ messages in thread
From: Lynne @ 2025-02-06 6:59 UTC (permalink / raw)
To: ffmpeg-devel
[-- Attachment #1.1.1.1: Type: text/plain, Size: 1902 bytes --]
On 05/02/2025 17:26, Lynne wrote:
> On 05/02/2025 15:51, James Almer wrote:
>> On 2/5/2025 11:47 AM, Lynne wrote:
>>> Fixes 7187eadf8c0f0c640f1d23811c55fad0cba60aa5
>>>
>>> The issue is that while avctx->pix_fmt is synchronized between
>>> threads, f->pix_fmt was not.
>>>
>>> Fixes fate-vsynth1-ffv1-2pass10 with THREADS=2.
>>
>> Can confirm "make fate-vsynth{1,2,3,_lena} THREADS=2" (as well as
>> higher thread count) passes with this patch.
>>
>>> ---
>>> libavcodec/ffv1dec.c | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
>>> index fcf3d525ac..0284845503 100644
>>> --- a/libavcodec/ffv1dec.c
>>> +++ b/libavcodec/ffv1dec.c
>>> @@ -1114,6 +1114,7 @@ static int update_thread_context(AVCodecContext
>>> *dst, const AVCodecContext *src)
>>> fdst->plane_count = fsrc->plane_count;
>>> fdst->ac = fsrc->ac;
>>> fdst->colorspace = fsrc->colorspace;
>>> + fdst->pix_fmt = fsrc->pix_fmt;
>>> fdst->ec = fsrc->ec;
>>> fdst->intra = fsrc->intra;
>>
>>
>> _______________________________________________
>> 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".
>
> Thanks.
> I'll push this soon unless there are objections.
>
> _______________________________________________
> 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".
Pushed, thanks.
[-- Attachment #1.1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 637 bytes --]
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-06 6:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-05 14:47 [FFmpeg-devel] [PATCH] ffv1dec: fix threaded decode failures Lynne
2025-02-05 14:51 ` James Almer
2025-02-05 16:26 ` Lynne
2025-02-06 6:59 ` Lynne
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