Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] avcodec/mjpegenc: take into account component count when writing the SOF header size
@ 2022-11-24 23:00 James Almer
  2022-11-24 23:12 ` Carl Eugen Hoyos
  0 siblings, 1 reply; 4+ messages in thread
From: James Almer @ 2022-11-24 23:00 UTC (permalink / raw)
  To: ffmpeg-devel

Fixes ticket #10069

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/mjpegenc_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 6dfc4469a5..049ae3d929 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -308,7 +308,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
     default: av_assert0(0);
     }
 
-    put_bits(pb, 16, 17);
+    put_bits(pb, 16, 8 + 3 * components);
     if (lossless && (  avctx->pix_fmt == AV_PIX_FMT_BGR0
                     || avctx->pix_fmt == AV_PIX_FMT_BGRA
                     || avctx->pix_fmt == AV_PIX_FMT_BGR24))
-- 
2.38.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".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH] avcodec/mjpegenc: take into account component count when writing the SOF header size
  2022-11-24 23:00 [FFmpeg-devel] [PATCH] avcodec/mjpegenc: take into account component count when writing the SOF header size James Almer
@ 2022-11-24 23:12 ` Carl Eugen Hoyos
  2022-11-24 23:24   ` James Almer
  0 siblings, 1 reply; 4+ messages in thread
From: Carl Eugen Hoyos @ 2022-11-24 23:12 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Am Fr., 25. Nov. 2022 um 00:00 Uhr schrieb James Almer <jamrial@gmail.com>:
>
> Fixes ticket #10069
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/mjpegenc_common.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
> index 6dfc4469a5..049ae3d929 100644
> --- a/libavcodec/mjpegenc_common.c
> +++ b/libavcodec/mjpegenc_common.c
> @@ -308,7 +308,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
>      default: av_assert0(0);
>      }
>
> -    put_bits(pb, 16, 17);
> +    put_bits(pb, 16, 8 + 3 * components);

Could this also fix #2967?

Carl Eugen
_______________________________________________
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] avcodec/mjpegenc: take into account component count when writing the SOF header size
  2022-11-24 23:12 ` Carl Eugen Hoyos
@ 2022-11-24 23:24   ` James Almer
  2022-11-24 23:31     ` StreamNG Harold Camargo
  0 siblings, 1 reply; 4+ messages in thread
From: James Almer @ 2022-11-24 23:24 UTC (permalink / raw)
  To: ffmpeg-devel

On 11/24/2022 8:12 PM, Carl Eugen Hoyos wrote:
> Am Fr., 25. Nov. 2022 um 00:00 Uhr schrieb James Almer <jamrial@gmail.com>:
>>
>> Fixes ticket #10069
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   libavcodec/mjpegenc_common.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
>> index 6dfc4469a5..049ae3d929 100644
>> --- a/libavcodec/mjpegenc_common.c
>> +++ b/libavcodec/mjpegenc_common.c
>> @@ -308,7 +308,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
>>       default: av_assert0(0);
>>       }
>>
>> -    put_bits(pb, 16, 17);
>> +    put_bits(pb, 16, 8 + 3 * components);
> 
> Could this also fix #2967?
> 
> Carl Eugen

Doesn't look like. The examples in that ticket have all three 
components, which was the hardcoded len value (17) before this patch.
_______________________________________________
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] avcodec/mjpegenc: take into account component count when writing the SOF header size
  2022-11-24 23:24   ` James Almer
@ 2022-11-24 23:31     ` StreamNG Harold Camargo
  0 siblings, 0 replies; 4+ messages in thread
From: StreamNG Harold Camargo @ 2022-11-24 23:31 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

please unsuscribe.

Harold F. Camargo R.
Stream NG
Cel. 318 3227862
Bogotá Colombia
www.stream-ng.com


El jue, 24 nov 2022 a las 18:24, James Almer (<jamrial@gmail.com>) escribió:

> On 11/24/2022 8:12 PM, Carl Eugen Hoyos wrote:
> > Am Fr., 25. Nov. 2022 um 00:00 Uhr schrieb James Almer <
> jamrial@gmail.com>:
> >>
> >> Fixes ticket #10069
> >>
> >> Signed-off-by: James Almer <jamrial@gmail.com>
> >> ---
> >>   libavcodec/mjpegenc_common.c | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
> >> index 6dfc4469a5..049ae3d929 100644
> >> --- a/libavcodec/mjpegenc_common.c
> >> +++ b/libavcodec/mjpegenc_common.c
> >> @@ -308,7 +308,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext
> *avctx, PutBitContext *pb,
> >>       default: av_assert0(0);
> >>       }
> >>
> >> -    put_bits(pb, 16, 17);
> >> +    put_bits(pb, 16, 8 + 3 * components);
> >
> > Could this also fix #2967?
> >
> > Carl Eugen
>
> Doesn't look like. The examples in that ticket have all three
> components, which was the hardcoded len value (17) before this patch.
> _______________________________________________
> 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".

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-11-24 23:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-24 23:00 [FFmpeg-devel] [PATCH] avcodec/mjpegenc: take into account component count when writing the SOF header size James Almer
2022-11-24 23:12 ` Carl Eugen Hoyos
2022-11-24 23:24   ` James Almer
2022-11-24 23:31     ` StreamNG Harold Camargo

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