diff mbox

[FFmpeg-devel] lavc/mjpegdec: Support 2:3 subsampling

Message ID CAB0OVGrymmdJHd7W9RhvrXr8ZeWncddifdd82hhbc_OP+1skMw@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos Oct. 17, 2018, 7:01 p.m. UTC 
2018-10-17 17:51 GMT+02:00, Michael Niedermayer <michael@niedermayer.cc>:
> On Wed, Oct 17, 2018 at 12:22:51AM +0200, Carl Eugen Hoyos wrote:
>> Hi!
>>
>> Attached patch allows decoding the sample from ticket #7495.
>>
>> Please review, Carl Eugen
>
>>  mjpegdec.c |   17 ++++++++++++++---
>>  1 file changed, 14 insertions(+), 3 deletions(-)
>> 8f0d03a533b42c35f2bd8d5bdae4dabd24b18f4c
>> 0001-lavc-mjpegdec-Support-2-3-subsampling.patch
>> From 0e9d2ec4e0cba36ba03a6b7470a707c0a3f88b8c Mon Sep 17 00:00:00 2001
>> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
>> Date: Wed, 17 Oct 2018 00:21:26 +0200
>> Subject: [PATCH] lavc/mjpegdec: Support 2:3 subsampling.
>>
>> Fixes ticket #7495.
>> ---
>>  libavcodec/mjpegdec.c |   17 ++++++++++++++---
>>  1 file changed, 14 insertions(+), 3 deletions(-)
>
> breaks
> make -j12 fate-tdsc

New patch attached, please review.

Thank you, Carl Eugen

Comments

Michael Niedermayer Oct. 17, 2018, 8:12 p.m. UTC | #1 
On Wed, Oct 17, 2018 at 09:01:30PM +0200, Carl Eugen Hoyos wrote:
> 2018-10-17 17:51 GMT+02:00, Michael Niedermayer <michael@niedermayer.cc>:
> > On Wed, Oct 17, 2018 at 12:22:51AM +0200, Carl Eugen Hoyos wrote:
> >> Hi!
> >>
> >> Attached patch allows decoding the sample from ticket #7495.
> >>
> >> Please review, Carl Eugen
> >
> >>  mjpegdec.c |   17 ++++++++++++++---
> >>  1 file changed, 14 insertions(+), 3 deletions(-)
> >> 8f0d03a533b42c35f2bd8d5bdae4dabd24b18f4c
> >> 0001-lavc-mjpegdec-Support-2-3-subsampling.patch
> >> From 0e9d2ec4e0cba36ba03a6b7470a707c0a3f88b8c Mon Sep 17 00:00:00 2001
> >> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> >> Date: Wed, 17 Oct 2018 00:21:26 +0200
> >> Subject: [PATCH] lavc/mjpegdec: Support 2:3 subsampling.
> >>
> >> Fixes ticket #7495.
> >> ---
> >>  libavcodec/mjpegdec.c |   17 ++++++++++++++---
> >>  1 file changed, 14 insertions(+), 3 deletions(-)
> >
> > breaks
> > make -j12 fate-tdsc
> 
> New patch attached, please review.
> 
> Thank you, Carl Eugen

>  mjpegdec.c |   11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 45ffa2918d1236d99637c96f84803a646e757cab  0001-lavc-mjpegdec-Support-2-3-subsampling.patch
> From 2a8917ad5f82184c10e41be776bf3d138b676a85 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Wed, 17 Oct 2018 21:00:37 +0200
> Subject: [PATCH] lavc/mjpegdec: Support 2:3 subsampling.
> 
> Fixes ticket #7495.
> ---
>  libavcodec/mjpegdec.c |   11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
> index 35ee10d..cfc5de8 100644
> --- a/libavcodec/mjpegdec.c
> +++ b/libavcodec/mjpegdec.c
> @@ -594,6 +594,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
>          s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
>          break;
>      case 0x22111100:
> +    case 0x23111100:
>      case 0x42111100:
>      case 0x24111100:
>          if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUVJ420P;
> @@ -607,6 +608,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
>              if (s->bits > 8)
>                  goto unk_pixfmt;
>              s->upscale_v[1] = s->upscale_v[2] = 1;
> +        } else if (pix_fmt_id == 0x23111100) {
> +            if (s->bits > 8)
> +                goto unk_pixfmt;
> +            s->upscale_v[1] = s->upscale_v[2] = 2;
>          }
>          break;
>      case 0x41111100:

there remains code which does:
            if (s->upscale_v[p])
                h = (h+1)>>1;
                
didnt deeply check but doesnt this need an update or a assert upscale_v == 1 ?

no more comments from me about this patch

thx

[...]
Carl Eugen Hoyos Oct. 17, 2018, 10:33 p.m. UTC | #2 
2018-10-17 22:12 GMT+02:00, Michael Niedermayer <michael@niedermayer.cc>:
> On Wed, Oct 17, 2018 at 09:01:30PM +0200, Carl Eugen Hoyos wrote:
>> 2018-10-17 17:51 GMT+02:00, Michael Niedermayer <michael@niedermayer.cc>:
>> > On Wed, Oct 17, 2018 at 12:22:51AM +0200, Carl Eugen Hoyos wrote:
>> >> Hi!
>> >>
>> >> Attached patch allows decoding the sample from ticket #7495.
>> >>
>> >> Please review, Carl Eugen
>> >
>> >>  mjpegdec.c |   17 ++++++++++++++---
>> >>  1 file changed, 14 insertions(+), 3 deletions(-)
>> >> 8f0d03a533b42c35f2bd8d5bdae4dabd24b18f4c
>> >> 0001-lavc-mjpegdec-Support-2-3-subsampling.patch
>> >> From 0e9d2ec4e0cba36ba03a6b7470a707c0a3f88b8c Mon Sep 17 00:00:00 2001
>> >> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
>> >> Date: Wed, 17 Oct 2018 00:21:26 +0200
>> >> Subject: [PATCH] lavc/mjpegdec: Support 2:3 subsampling.
>> >>
>> >> Fixes ticket #7495.
>> >> ---
>> >>  libavcodec/mjpegdec.c |   17 ++++++++++++++---
>> >>  1 file changed, 14 insertions(+), 3 deletions(-)
>> >
>> > breaks
>> > make -j12 fate-tdsc
>>
>> New patch attached, please review.
>>
>> Thank you, Carl Eugen
>
>>  mjpegdec.c |   11 ++++++++---
>>  1 file changed, 8 insertions(+), 3 deletions(-)
>> 45ffa2918d1236d99637c96f84803a646e757cab
>> 0001-lavc-mjpegdec-Support-2-3-subsampling.patch
>> From 2a8917ad5f82184c10e41be776bf3d138b676a85 Mon Sep 17 00:00:00 2001
>> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
>> Date: Wed, 17 Oct 2018 21:00:37 +0200
>> Subject: [PATCH] lavc/mjpegdec: Support 2:3 subsampling.
>>
>> Fixes ticket #7495.
>> ---
>>  libavcodec/mjpegdec.c |   11 ++++++++---
>>  1 file changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
>> index 35ee10d..cfc5de8 100644
>> --- a/libavcodec/mjpegdec.c
>> +++ b/libavcodec/mjpegdec.c
>> @@ -594,6 +594,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
>>          s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG :
>> AVCOL_RANGE_JPEG;
>>          break;
>>      case 0x22111100:
>> +    case 0x23111100:
>>      case 0x42111100:
>>      case 0x24111100:
>>          if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ?
>> AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUVJ420P;
>> @@ -607,6 +608,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
>>              if (s->bits > 8)
>>                  goto unk_pixfmt;
>>              s->upscale_v[1] = s->upscale_v[2] = 1;
>> +        } else if (pix_fmt_id == 0x23111100) {
>> +            if (s->bits > 8)
>> +                goto unk_pixfmt;
>> +            s->upscale_v[1] = s->upscale_v[2] = 2;
>>          }
>>          break;
>>      case 0x41111100:
>
> there remains code which does:
>             if (s->upscale_v[p])
>                 h = (h+1)>>1;
>
> didnt deeply check but doesnt this need an update or a assert upscale_v == 1
> ?

I updated the condition.

> no more comments from me about this patch

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

From 2a8917ad5f82184c10e41be776bf3d138b676a85 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Wed, 17 Oct 2018 21:00:37 +0200
Subject: [PATCH] lavc/mjpegdec: Support 2:3 subsampling.

Fixes ticket #7495.
---
 libavcodec/mjpegdec.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 35ee10d..cfc5de8 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -594,6 +594,7 @@  int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
         s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
         break;
     case 0x22111100:
+    case 0x23111100:
     case 0x42111100:
     case 0x24111100:
         if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUVJ420P;
@@ -607,6 +608,10 @@  int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
             if (s->bits > 8)
                 goto unk_pixfmt;
             s->upscale_v[1] = s->upscale_v[2] = 1;
+        } else if (pix_fmt_id == 0x23111100) {
+            if (s->bits > 8)
+                goto unk_pixfmt;
+            s->upscale_v[1] = s->upscale_v[2] = 2;
         }
         break;
     case 0x41111100:
@@ -2592,9 +2597,9 @@  the_end:
             }
             dst = &((uint8_t *)s->picture_ptr->data[p])[(h - 1) * s->linesize[p]];
             for (i = h - 1; i; i--) {
-                uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[p])[i / 2 * s->linesize[p]];
-                uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[p])[(i + 1) / 2 * s->linesize[p]];
-                if (src1 == src2 || i == h - 1) {
+                uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[p])[i * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]];
+                uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[p])[(i + 1) * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]];
+                if (s->upscale_v[p] != 2 && (src1 == src2 || i == h - 1)) {
                     memcpy(dst, src1, w);
                 } else {
                     for (index = 0; index < w; index++)
-- 
1.7.10.4