[FFmpeg-devel] [PATCH 1/2] avcodec/mpegvideo_enc: Reject input incompatible with chroma subsampling

[FFmpeg-devel] [PATCH 1/2] avcodec/mpegvideo_enc: Reject input incompatible with chroma subsampling

[Andreas Rheinhardt]

Fixes ticket #10952.

Discovered by: Zeng Yunxiang
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
I am pretty sure that a lot of other encoders don't handle this well
either. Maybe we should handle this more generically in
ff_encode_preinit?

 libavcodec/mpegvideo_enc.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index d1b1917824..a65ecc6839 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -314,6 +314,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
     AVCPBProperties *cpb_props;
     int i, ret;
     int mb_array_size, mv_table_size;
+    int chroma_h_subsampling = 1, chroma_v_subsampling = 1;
 
     mpv_encode_defaults(s);
 
@@ -325,14 +326,25 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
     case AV_PIX_FMT_YUVJ422P:
     case AV_PIX_FMT_YUV422P:
         s->chroma_format = CHROMA_422;
+        chroma_h_subsampling = 2;
         break;
     case AV_PIX_FMT_YUVJ420P:
     case AV_PIX_FMT_YUV420P:
     default:
         s->chroma_format = CHROMA_420;
+        chroma_h_subsampling = 2;
+        chroma_v_subsampling = 2;
         break;
     }
 
+    if (avctx->width &  (chroma_h_subsampling - 1) ||
+        avctx->height & (chroma_v_subsampling - 1)) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Dimensions %dx%d incompatible with chroma subsampling.\n",
+               avctx->width, avctx->height);
+        return AVERROR(EINVAL);
+    }
+
     avctx->bits_per_raw_sample = av_clip(avctx->bits_per_raw_sample, 0, 8);
 
     s->bit_rate = avctx->bit_rate;
-- 
2.40.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] [PATCH 2/2] avcodec/mpegvideo_enc: Remove custom plane copying code

[Andreas Rheinhardt]

It caused errors (see e.g. a066b8a809fa6d8b31398d41787822803f8762f2)
and would not support negative linesizes (this is currently
impossible to trigger as avcodec_default_get_buffer2() (used
internally by ff_encode_alloc_frame()) does not use negative
linesizes at all).

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

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index a65ecc6839..f3e45c18d2 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -36,6 +36,7 @@
 #include <stdint.h>
 
 #include "libavutil/emms.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/intmath.h"
 #include "libavutil/mathematics.h"
@@ -1214,28 +1215,16 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
                 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];
+                uint8_t *dst = pic->f->data[i] + !s->avctx->rc_buffer_size * INPLACE_OFFSET;
                 int vpad = 16;
 
+                av_image_copy_plane(dst, dst_stride, src, src_stride, w, h);
+
                 if (   s->codec_id == AV_CODEC_ID_MPEG2VIDEO
                     && !s->progressive_sequence
                     && FFALIGN(s->height, 32) - s->height > 16)
                     vpad = 32;
 
-                if (!s->avctx->rc_buffer_size)
-                    dst += INPLACE_OFFSET;
-
-                if (src_stride == dst_stride)
-                    memcpy(dst, src, src_stride * h - src_stride + w);
-                else {
-                    int h2 = h;
-                    uint8_t *dst2 = dst;
-                    while (h2--) {
-                        memcpy(dst2, src, w);
-                        dst2 += dst_stride;
-                        src += src_stride;
-                    }
-                }
                 if ((s->width & 15) || (s->height & (vpad-1))) {
                     s->mpvencdsp.draw_edges(dst, dst_stride,
                                             w, h,
-- 
2.40.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 1/2] avcodec/mpegvideo_enc: Reject input incompatible with chroma subsampling

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Fixes ticket #10952.
> 
> Discovered by: Zeng Yunxiang
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> I am pretty sure that a lot of other encoders don't handle this well
> either. Maybe we should handle this more generically in
> ff_encode_preinit?
> 
>  libavcodec/mpegvideo_enc.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
> index d1b1917824..a65ecc6839 100644
> --- a/libavcodec/mpegvideo_enc.c
> +++ b/libavcodec/mpegvideo_enc.c
> @@ -314,6 +314,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
>      AVCPBProperties *cpb_props;
>      int i, ret;
>      int mb_array_size, mv_table_size;
> +    int chroma_h_subsampling = 1, chroma_v_subsampling = 1;
>  
>      mpv_encode_defaults(s);
>  
> @@ -325,14 +326,25 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
>      case AV_PIX_FMT_YUVJ422P:
>      case AV_PIX_FMT_YUV422P:
>          s->chroma_format = CHROMA_422;
> +        chroma_h_subsampling = 2;
>          break;
>      case AV_PIX_FMT_YUVJ420P:
>      case AV_PIX_FMT_YUV420P:
>      default:
>          s->chroma_format = CHROMA_420;
> +        chroma_h_subsampling = 2;
> +        chroma_v_subsampling = 2;
>          break;
>      }
>  
> +    if (avctx->width &  (chroma_h_subsampling - 1) ||
> +        avctx->height & (chroma_v_subsampling - 1)) {
> +        av_log(avctx, AV_LOG_ERROR,
> +               "Dimensions %dx%d incompatible with chroma subsampling.\n",
> +               avctx->width, avctx->height);
> +        return AVERROR(EINVAL);
> +    }
> +
>      avctx->bits_per_raw_sample = av_clip(avctx->bits_per_raw_sample, 0, 8);
>  
>      s->bit_rate = avctx->bit_rate;

Will apply this patchset tomorrow unless there are objections.

- 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 1/2] avcodec/mpegvideo_enc: Reject input incompatible with chroma subsampling

[Anton Khirnov]

Quoting Andreas Rheinhardt (2024-04-06 12:23:49)
> Fixes ticket #10952.
> 
> Discovered by: Zeng Yunxiang
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> I am pretty sure that a lot of other encoders don't handle this well
> either. Maybe we should handle this more generically in
> ff_encode_preinit?

We should.

-- 
Anton Khirnov
_______________________________________________
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/2] avcodec/mpegvideo_enc: Reject input incompatible with chroma subsampling

[Michael Niedermayer]

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

On Mon, Apr 08, 2024 at 12:51:08AM +0200, Andreas Rheinhardt wrote:
> Andreas Rheinhardt:
> > Fixes ticket #10952.
> > 
> > Discovered by: Zeng Yunxiang
> > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> > ---
> > I am pretty sure that a lot of other encoders don't handle this well
> > either. Maybe we should handle this more generically in
> > ff_encode_preinit?
> > 
> >  libavcodec/mpegvideo_enc.c | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
> > index d1b1917824..a65ecc6839 100644
> > --- a/libavcodec/mpegvideo_enc.c
> > +++ b/libavcodec/mpegvideo_enc.c
> > @@ -314,6 +314,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
> >      AVCPBProperties *cpb_props;
> >      int i, ret;
> >      int mb_array_size, mv_table_size;
> > +    int chroma_h_subsampling = 1, chroma_v_subsampling = 1;
> >  
> >      mpv_encode_defaults(s);
> >  
> > @@ -325,14 +326,25 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
> >      case AV_PIX_FMT_YUVJ422P:
> >      case AV_PIX_FMT_YUV422P:
> >          s->chroma_format = CHROMA_422;
> > +        chroma_h_subsampling = 2;
> >          break;
> >      case AV_PIX_FMT_YUVJ420P:
> >      case AV_PIX_FMT_YUV420P:
> >      default:
> >          s->chroma_format = CHROMA_420;
> > +        chroma_h_subsampling = 2;
> > +        chroma_v_subsampling = 2;
> >          break;
> >      }
> >  
> > +    if (avctx->width &  (chroma_h_subsampling - 1) ||
> > +        avctx->height & (chroma_v_subsampling - 1)) {
> > +        av_log(avctx, AV_LOG_ERROR,
> > +               "Dimensions %dx%d incompatible with chroma subsampling.\n",
> > +               avctx->width, avctx->height);
> > +        return AVERROR(EINVAL);
> > +    }
> > +
> >      avctx->bits_per_raw_sample = av_clip(avctx->bits_per_raw_sample, 0, 8);
> >  
> >      s->bit_rate = avctx->bit_rate;
> 
> Will apply this patchset tomorrow unless there are objections.

this breaks
./ffmpeg -i 'samples.multimedia.cx/game-formats/sierra-vmd/lastdynasty/HG060808.VMD' -y test.avi


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle

[-- 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 1/2] avcodec/mpegvideo_enc: Reject input incompatible with chroma subsampling

[Michael Niedermayer]

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

On Mon, Apr 08, 2024 at 12:51:08AM +0200, Andreas Rheinhardt wrote:
> Andreas Rheinhardt:
> > Fixes ticket #10952.
> > 
> > Discovered by: Zeng Yunxiang
> > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> > ---
> > I am pretty sure that a lot of other encoders don't handle this well
> > either. Maybe we should handle this more generically in
> > ff_encode_preinit?
> > 
> >  libavcodec/mpegvideo_enc.c | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
> > index d1b1917824..a65ecc6839 100644
> > --- a/libavcodec/mpegvideo_enc.c
> > +++ b/libavcodec/mpegvideo_enc.c
> > @@ -314,6 +314,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
> >      AVCPBProperties *cpb_props;
> >      int i, ret;
> >      int mb_array_size, mv_table_size;
> > +    int chroma_h_subsampling = 1, chroma_v_subsampling = 1;
> >  
> >      mpv_encode_defaults(s);
> >  
> > @@ -325,14 +326,25 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
> >      case AV_PIX_FMT_YUVJ422P:
> >      case AV_PIX_FMT_YUV422P:
> >          s->chroma_format = CHROMA_422;
> > +        chroma_h_subsampling = 2;
> >          break;
> >      case AV_PIX_FMT_YUVJ420P:
> >      case AV_PIX_FMT_YUV420P:
> >      default:
> >          s->chroma_format = CHROMA_420;
> > +        chroma_h_subsampling = 2;
> > +        chroma_v_subsampling = 2;
> >          break;
> >      }
> >  
> > +    if (avctx->width &  (chroma_h_subsampling - 1) ||
> > +        avctx->height & (chroma_v_subsampling - 1)) {
> > +        av_log(avctx, AV_LOG_ERROR,
> > +               "Dimensions %dx%d incompatible with chroma subsampling.\n",
> > +               avctx->width, avctx->height);
> > +        return AVERROR(EINVAL);
> > +    }
> > +
> >      avctx->bits_per_raw_sample = av_clip(avctx->bits_per_raw_sample, 0, 8);
> >  
> >      s->bit_rate = avctx->bit_rate;
> 
> Will apply this patchset tomorrow unless there are objections.

Also please dont apply stuff like this with a 1 day warning, i just saw this now

dropping support for odd resolutions is a major change and not ok

thanks

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

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/mpegvideo_enc: Reject input incompatible with chroma subsampling

[Anton Khirnov]

Quoting Michael Niedermayer (2024-04-08 18:07:31)
> Also please dont apply stuff like this with a 1 day warning, i just saw this now
> 
> dropping support for odd resolutions is a major change and not ok

Maybe such things would happen less frequently if your private testsuite
was less private.

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