[FFmpeg-devel] [PATCH] avcodec/mpeg12dec: Use proper logcontext

[FFmpeg-devel] [PATCH] avcodec/mpeg12dec: Use proper logcontext

[Andreas Rheinhardt]

[-- Attachment #1: Type: text/plain, Size: 26 bytes --]

Patch attached

- Andreas

[-- Attachment #2: 0001-avcodec-mpeg12dec-Use-proper-logcontext.patch --]
[-- Type: text/x-patch, Size: 1172 bytes --]

From 1095ce36d0e7fd26a290638c2222a6a505dc27c8 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Tue, 4 Mar 2025 23:06:38 +0100
Subject: [PATCH] avcodec/mpeg12dec: Use proper logcontext

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/mpeg12dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 843640edbf..14c028379e 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1655,11 +1655,11 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
     }
 eos: // end of slice
     if (get_bits_left(&s->gb) < 0) {
-        av_log(s, AV_LOG_ERROR, "overread %d\n", -get_bits_left(&s->gb));
+        av_log(s->avctx, AV_LOG_ERROR, "overread %d\n", -get_bits_left(&s->gb));
         return AVERROR_INVALIDDATA;
     }
     *buf += (get_bits_count(&s->gb) - 1) / 8;
-    ff_dlog(s, "Slice start:%d %d  end:%d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
+    ff_dlog(s->avctx, "Slice start:%d %d  end:%d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
     return 0;
 }
 
-- 
2.45.2


[-- Attachment #3: 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] avcodec/mpeg12dec: Use proper logcontext

[Ramiro Polla]

On 3/4/25 23:11, Andreas Rheinhardt wrote:
> Patch attached

> diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
> index 843640edbf..14c028379e 100644
> --- a/libavcodec/mpeg12dec.c
> +++ b/libavcodec/mpeg12dec.c
> @@ -1655,11 +1655,11 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
>      }
>  eos: // end of slice
>      if (get_bits_left(&s->gb) < 0) {
> -        av_log(s, AV_LOG_ERROR, "overread %d\n", -get_bits_left(&s->gb));
> +        av_log(s->avctx, AV_LOG_ERROR, "overread %d\n", -get_bits_left(&s->gb));
>          return AVERROR_INVALIDDATA;
>      }
>      *buf += (get_bits_count(&s->gb) - 1) / 8;
> -    ff_dlog(s, "Slice start:%d %d  end:%d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
> +    ff_dlog(s->avctx, "Slice start:%d %d  end:%d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
>      return 0;
>  }

LGTM.

We could also simplify mpeg_decode_slice() a bit more by using the local 
variables avctx, lowres, and field_pic (which have already been obtained 
from s).

Ramiro

_______________________________________________
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] avcodec/mpeg12dec: Use proper logcontext

[Andreas Rheinhardt]

Ramiro Polla:
> 
> On 3/4/25 23:11, Andreas Rheinhardt wrote:
>> Patch attached
> 
>> diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
>> index 843640edbf..14c028379e 100644
>> --- a/libavcodec/mpeg12dec.c
>> +++ b/libavcodec/mpeg12dec.c
>> @@ -1655,11 +1655,11 @@ static int mpeg_decode_slice(MpegEncContext
>> *s, int mb_y,
>>      }
>>  eos: // end of slice
>>      if (get_bits_left(&s->gb) < 0) {
>> -        av_log(s, AV_LOG_ERROR, "overread %d\n", -get_bits_left(&s-
>> >gb));
>> +        av_log(s->avctx, AV_LOG_ERROR, "overread %d\n", -
>> get_bits_left(&s->gb));
>>          return AVERROR_INVALIDDATA;
>>      }
>>      *buf += (get_bits_count(&s->gb) - 1) / 8;
>> -    ff_dlog(s, "Slice start:%d %d  end:%d %d\n", s->resync_mb_x, s-
>> >resync_mb_y, s->mb_x, s->mb_y);
>> +    ff_dlog(s->avctx, "Slice start:%d %d  end:%d %d\n", s-
>> >resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
>>      return 0;
>>  }
> 
> LGTM.
> 

Applied with an improved commit message.

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