[FFmpeg-devel] [PATCH 1/5] avcodec/decode: decode_simple_internal() only implements audio and video

[FFmpeg-devel] [PATCH 1/5] avcodec/decode: decode_simple_internal() only implements audio and video

[Michael Niedermayer]

Fixes: CID1538861 Uninitialized scalar variable

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/decode.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index d031b1ca176..900b0c07a35 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -431,7 +431,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
     } else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
         ret =  !got_frame ? AVERROR(EAGAIN)
                           : discard_samples(avctx, frame, discarded_samples);
-    }
+    } else
+        av_assert0(0);
 
     if (ret == AVERROR(EAGAIN))
         av_frame_unref(frame);
-- 
2.43.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".

[FFmpeg-devel] [PATCH 2/5] avcodec/dovi_rpuenc: initialize profile

[Michael Niedermayer]

Code is taken from dovi_rpudec

Fixes: CID1596604 Uninitialized scalar variable

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dovi_rpuenc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
index 3feaa04b9ed..80dc22234a9 100644
--- a/libavcodec/dovi_rpuenc.c
+++ b/libavcodec/dovi_rpuenc.c
@@ -571,6 +571,8 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata,
     set_ue_golomb(pb, vdr_rpu_id);
     s->mapping = &s->vdr[vdr_rpu_id]->mapping;
 
+    profile = s->cfg.dv_profile ? s->cfg.dv_profile : ff_dovi_guess_profile_hevc(hdr);
+
     if (!use_prev_vdr_rpu) {
         set_ue_golomb(pb, mapping->mapping_color_space);
         set_ue_golomb(pb, mapping->mapping_chroma_format_idc);
-- 
2.43.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".

[FFmpeg-devel] [PATCH 3/5] avcodec/dovi_rpuenc: fix compaatibility

[Michael Niedermayer]

Fixes: a frequency
Found while reviewing: CID1596607

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dovi_rpuenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
index 80dc22234a9..7e0292533bd 100644
--- a/libavcodec/dovi_rpuenc.c
+++ b/libavcodec/dovi_rpuenc.c
@@ -139,7 +139,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
     if (!dv_profile || bl_compat_id < 0) {
         if (s->enable > 0) {
             av_log(s->logctx, AV_LOG_ERROR, "Dolby Vision enabled, but could "
-                   "not determine profile and compaatibility mode. Double-check "
+                   "not determine profile and compatibility mode. Double-check "
                    "colorspace and format settings for compatibility?\n");
             return AVERROR(EINVAL);
         }
-- 
2.43.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".

[FFmpeg-devel] [PATCH 4/5] avcodec/dovi_rpuenc: Initialize bl_compat_id

[Michael Niedermayer]

Fixes: CID1596607 Uninitialized scalar variable

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dovi_rpuenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
index 7e0292533bd..c5e452957b5 100644
--- a/libavcodec/dovi_rpuenc.c
+++ b/libavcodec/dovi_rpuenc.c
@@ -57,7 +57,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
     AVDOVIDecoderConfigurationRecord *cfg;
     const AVDOVIRpuDataHeader *hdr = NULL;
     const AVFrameSideData *sd;
-    int dv_profile, dv_level, bl_compat_id;
+    int dv_profile, dv_level, bl_compat_id = -1;
     size_t cfg_size;
     uint64_t pps;
 
-- 
2.43.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".

Re: [FFmpeg-devel] [PATCH 4/5] avcodec/dovi_rpuenc: Initialize bl_compat_id

[Andreas Rheinhardt]

Michael Niedermayer:
> Fixes: CID1596607 Uninitialized scalar variable
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/dovi_rpuenc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
> index 7e0292533bd..c5e452957b5 100644
> --- a/libavcodec/dovi_rpuenc.c
> +++ b/libavcodec/dovi_rpuenc.c
> @@ -57,7 +57,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
>      AVDOVIDecoderConfigurationRecord *cfg;
>      const AVDOVIRpuDataHeader *hdr = NULL;
>      const AVFrameSideData *sd;
> -    int dv_profile, dv_level, bl_compat_id;
> +    int dv_profile, dv_level, bl_compat_id = -1;
>      size_t cfg_size;
>      uint64_t pps;
>  

This is unnecessary, as the dv_profile switch is exhaustive (i.e. the
default case is never taken); but if you do this, then you can also
remove the other "bl_compat_id = -1" assignments (which conveys that
everything is treated as invalid unless we found it to have a valid
compatibility id).

- Andreas

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH 4/5] avcodec/dovi_rpuenc: Initialize bl_compat_id

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1540 bytes --]

On Sat, May 04, 2024 at 12:21:03AM +0200, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: CID1596607 Uninitialized scalar variable
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/dovi_rpuenc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
> > index 7e0292533bd..c5e452957b5 100644
> > --- a/libavcodec/dovi_rpuenc.c
> > +++ b/libavcodec/dovi_rpuenc.c
> > @@ -57,7 +57,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
> >      AVDOVIDecoderConfigurationRecord *cfg;
> >      const AVDOVIRpuDataHeader *hdr = NULL;
> >      const AVFrameSideData *sd;
> > -    int dv_profile, dv_level, bl_compat_id;
> > +    int dv_profile, dv_level, bl_compat_id = -1;
> >      size_t cfg_size;
> >      uint64_t pps;
> >  
> 
> This is unnecessary, as the dv_profile switch is exhaustive (i.e. the
> default case is never taken); but if you do this, then you can also
> remove the other "bl_compat_id = -1" assignments (which conveys that
> everything is treated as invalid unless we found it to have a valid
> compatibility id).

i see
case AV_CODEC_ID_H264: dv_profile = 9;  break;

the dv_profile switch only contains 0 4 7 5 10 8 no 9

what am i missing ?

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No snowflake in an avalanche ever feels responsible. -- Voltaire

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 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".

Re: [FFmpeg-devel] [PATCH 4/5] avcodec/dovi_rpuenc: Initialize bl_compat_id

[Andreas Rheinhardt]

Michael Niedermayer:
> On Sat, May 04, 2024 at 12:21:03AM +0200, Andreas Rheinhardt wrote:
>> Michael Niedermayer:
>>> Fixes: CID1596607 Uninitialized scalar variable
>>>
>>> Sponsored-by: Sovereign Tech Fund
>>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>>> ---
>>>  libavcodec/dovi_rpuenc.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
>>> index 7e0292533bd..c5e452957b5 100644
>>> --- a/libavcodec/dovi_rpuenc.c
>>> +++ b/libavcodec/dovi_rpuenc.c
>>> @@ -57,7 +57,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
>>>      AVDOVIDecoderConfigurationRecord *cfg;
>>>      const AVDOVIRpuDataHeader *hdr = NULL;
>>>      const AVFrameSideData *sd;
>>> -    int dv_profile, dv_level, bl_compat_id;
>>> +    int dv_profile, dv_level, bl_compat_id = -1;
>>>      size_t cfg_size;
>>>      uint64_t pps;
>>>  
>>
>> This is unnecessary, as the dv_profile switch is exhaustive (i.e. the
>> default case is never taken); but if you do this, then you can also
>> remove the other "bl_compat_id = -1" assignments (which conveys that
>> everything is treated as invalid unless we found it to have a valid
>> compatibility id).
> 
> i see
> case AV_CODEC_ID_H264: dv_profile = 9;  break;
> 
> the dv_profile switch only contains 0 4 7 5 10 8 no 9
> 
> what am i missing ?
> 

Ok, I was wrong. (Well, I could counter that ff_dovi_configure() is
currently not called for H.264 at all, but it would be a waste of time.)

- Andreas

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH 4/5] avcodec/dovi_rpuenc: Initialize bl_compat_id

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1410 bytes --]

On Sat, May 04, 2024 at 12:21:03AM +0200, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: CID1596607 Uninitialized scalar variable
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/dovi_rpuenc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
> > index 7e0292533bd..c5e452957b5 100644
> > --- a/libavcodec/dovi_rpuenc.c
> > +++ b/libavcodec/dovi_rpuenc.c
> > @@ -57,7 +57,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
> >      AVDOVIDecoderConfigurationRecord *cfg;
> >      const AVDOVIRpuDataHeader *hdr = NULL;
> >      const AVFrameSideData *sd;
> > -    int dv_profile, dv_level, bl_compat_id;
> > +    int dv_profile, dv_level, bl_compat_id = -1;
> >      size_t cfg_size;
> >      uint64_t pps;
> >  
> 
[...]
> default case is never taken); but if you do this, then you can also
> remove the other "bl_compat_id = -1" assignments (which conveys that
> everything is treated as invalid unless we found it to have a valid
> compatibility id).

will apply with the other bl_compat_id = -1 removed

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The misfortune of the wise is better than the prosperity of the fool.
-- Epicurus

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 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".

[FFmpeg-devel] [PATCH 5/5] avcodec/exr: Fix preview overflow

[Michael Niedermayer]

Fixes: CID1515456 Unintentional integer overflow

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/exr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 8bd39f78a45..4bac0be89b2 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1943,7 +1943,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
                                                      "preview", 16)) >= 0) {
             uint32_t pw = bytestream2_get_le32(gb);
             uint32_t ph = bytestream2_get_le32(gb);
-            uint64_t psize = pw * ph;
+            uint64_t psize = pw * (uint64_t)ph;
             if (psize > INT64_MAX / 4) {
                 ret = AVERROR_INVALIDDATA;
                 goto fail;
-- 
2.43.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".

Re: [FFmpeg-devel] [PATCH 1/5] avcodec/decode: decode_simple_internal() only implements audio and video

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 568 bytes --]

On Fri, May 03, 2024 at 11:54:58PM +0200, Michael Niedermayer wrote:
> Fixes: CID1538861 Uninitialized scalar variable
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/decode.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

will apply what remains from this patchset

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Elect your leaders based on what they did after the last election, not
based on what they say before an election.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 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".