[FFmpeg-devel] [PATCH 4/4] avcodec/ffv1enc: avoid slices larger than 360x288 if no value is specified

[James Almer]

On 4/6/2025 8:44 PM, Michael Niedermayer wrote:
> On Sun, Apr 06, 2025 at 08:29:42PM -0300, James Almer wrote:
>> On 4/3/2025 7:50 AM, Michael Niedermayer wrote:
>>> This improves speed by providing more independent things for more CPUs
>>>
>>> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
>>> ---
>>>    libavcodec/ffv1enc.c                             |  6 +++++-
>>>    .../ref/fate/matroska-mastering-display-metadata | 16 ++++++++--------
>>>    2 files changed, 13 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
>>> index ce3f8e023e5..221344794e2 100644
>>> --- a/libavcodec/ffv1enc.c
>>> +++ b/libavcodec/ffv1enc.c
>>> @@ -581,7 +581,11 @@ int ff_ffv1_encode_determine_slices(AVCodecContext *avctx)
>>>                    if (  ff_need_new_slices(avctx->width , s->num_h_slices, s->chroma_h_shift)
>>>                        ||ff_need_new_slices(avctx->height, s->num_v_slices, s->chroma_v_shift))
>>>                        continue;
>>> -            if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= MAX_SLICES || !avctx->slices)
>>> +            if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= MAX_SLICES)
>>> +                return 0;
>>> +            if (maxw*maxh > 360*288)
>>> +                continue;
>>> +            if (!avctx->slices)
>>>                    return 0;
>>>            }
>>>        }
>>> diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata
>>> index 91ce6a05584..6a2ff15b1b2 100644
>>> --- a/tests/ref/fate/matroska-mastering-display-metadata
>>> +++ b/tests/ref/fate/matroska-mastering-display-metadata
>>> @@ -1,7 +1,7 @@
>>> -ad5e3c4e338599c81ef7d0f9ae25f871 *tests/data/fate/matroska-mastering-display-metadata.matroska
>>> -1669589 tests/data/fate/matroska-mastering-display-metadata.matroska
>>> +c1e5e2ecf433cf05af8556debc7d4d0b *tests/data/fate/matroska-mastering-display-metadata.matroska
>>> +1669773 tests/data/fate/matroska-mastering-display-metadata.matroska
>>>    #extradata 0:        4, 0x040901a3
>>> -#extradata 3:      200, 0x506463a8
>>> +#extradata 3:      202, 0xfce96279
>>
>> Why did extradata change? Slice dimension value changes?
> 
> yes, any reason you belive theres an issue ?

No, just wanted to know why the size of extradata changed.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250406/025ded04/attachment.sig>