[FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: Fix 1 line and one column images

[FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: Fix 1 line and one column images

[Michael Niedermayer]

Fixes: Ticket10952
Fixes: poc21ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/mpegvideo_enc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index d1b19178247..40844b2f682 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1199,8 +1199,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
                 ptrdiff_t dst_stride = i ? s->uvlinesize : s->linesize;
                 int h_shift = i ? s->chroma_x_shift : 0;
                 int v_shift = i ? s->chroma_y_shift : 0;
-                int w = s->width  >> h_shift;
-                int h = s->height >> v_shift;
+                int w = -((-s->width)  >> h_shift);
+                int h = -((-s->height) >> v_shift);
                 const uint8_t *src = pic_arg->data[i];
                 uint8_t *dst = pic->f->data[i];
                 int vpad = 16;
-- 
2.17.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".

Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: Fix 1 line and one column images

[Paul B Mahol]

On Mon, Apr 8, 2024 at 6:49 PM Michael Niedermayer <michael@niedermayer.cc>
wrote:

> Fixes: Ticket10952
> Fixes: poc21ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mpegvideo_enc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
> index d1b19178247..40844b2f682 100644
> --- a/libavcodec/mpegvideo_enc.c
> +++ b/libavcodec/mpegvideo_enc.c
> @@ -1199,8 +1199,8 @@ static int load_input_picture(MpegEncContext *s,
> const AVFrame *pic_arg)
>                  ptrdiff_t dst_stride = i ? s->uvlinesize : s->linesize;
>                  int h_shift = i ? s->chroma_x_shift : 0;
>                  int v_shift = i ? s->chroma_y_shift : 0;
> -                int w = s->width  >> h_shift;
> -                int h = s->height >> v_shift;
> +                int w = -((-s->width)  >> h_shift);
> +                int h = -((-s->height) >> v_shift);
>                  const uint8_t *src = pic_arg->data[i];
>                  uint8_t *dst = pic->f->data[i];
>                  int vpad = 16;
>

What that does? Its not same as aligned rshift macro?


> --
> 2.17.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".
>
_______________________________________________
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/mpegvideo_enc: Fix 1 line and one column images

[Andreas Rheinhardt]

Paul B Mahol:
> On Mon, Apr 8, 2024 at 6:49 PM Michael Niedermayer <michael@niedermayer.cc>
> wrote:
> 
>> Fixes: Ticket10952
>> Fixes: poc21ffmpeg
>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>> ---
>>  libavcodec/mpegvideo_enc.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
>> index d1b19178247..40844b2f682 100644
>> --- a/libavcodec/mpegvideo_enc.c
>> +++ b/libavcodec/mpegvideo_enc.c
>> @@ -1199,8 +1199,8 @@ static int load_input_picture(MpegEncContext *s,
>> const AVFrame *pic_arg)
>>                  ptrdiff_t dst_stride = i ? s->uvlinesize : s->linesize;
>>                  int h_shift = i ? s->chroma_x_shift : 0;
>>                  int v_shift = i ? s->chroma_y_shift : 0;
>> -                int w = s->width  >> h_shift;
>> -                int h = s->height >> v_shift;
>> +                int w = -((-s->width)  >> h_shift);
>> +                int h = -((-s->height) >> v_shift);
>>                  const uint8_t *src = pic_arg->data[i];
>>                  uint8_t *dst = pic->f->data[i];
>>                  int vpad = 16;
>>
> 
> What that does? Its not same as aligned rshift macro?
> 

It is the same, just more complicated. And maybe with more instructions.

- 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] avcodec/mpegvideo_enc: Fix 1 line and one column images

[Michael Niedermayer]

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

On Mon, Apr 08, 2024 at 08:00:58PM +0200, Andreas Rheinhardt wrote:
> Paul B Mahol:
> > On Mon, Apr 8, 2024 at 6:49 PM Michael Niedermayer <michael@niedermayer.cc>
> > wrote:
> > 
> >> Fixes: Ticket10952
> >> Fixes: poc21ffmpeg
> >> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> >> ---
> >>  libavcodec/mpegvideo_enc.c | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
> >> index d1b19178247..40844b2f682 100644
> >> --- a/libavcodec/mpegvideo_enc.c
> >> +++ b/libavcodec/mpegvideo_enc.c
> >> @@ -1199,8 +1199,8 @@ static int load_input_picture(MpegEncContext *s,
> >> const AVFrame *pic_arg)
> >>                  ptrdiff_t dst_stride = i ? s->uvlinesize : s->linesize;
> >>                  int h_shift = i ? s->chroma_x_shift : 0;
> >>                  int v_shift = i ? s->chroma_y_shift : 0;
> >> -                int w = s->width  >> h_shift;
> >> -                int h = s->height >> v_shift;
> >> +                int w = -((-s->width)  >> h_shift);
> >> +                int h = -((-s->height) >> v_shift);
> >>                  const uint8_t *src = pic_arg->data[i];
> >>                  uint8_t *dst = pic->f->data[i];
> >>                  int vpad = 16;
> >>
> > 
> > What that does? Its not same as aligned rshift macro?
> > 
> 
> It is the same, just more complicated. And maybe with more instructions.

will apply with "aligned rshift" macro

thx

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

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf

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