Re: [FFmpeg-devel] [PATCH 5/7] avcodec/dpx: improve decoding of 10 bit gray images

[Carl Eugen Hoyos]

2018-12-06 20:34 GMT+01:00, Paul B Mahol :

> +temp = *lbuf >> shift & 0x3FF;
> +*lbuf = *lbuf >> 10;
> +
> +return temp;
> +}
> +
>  static uint16_t read10in32(const uint8_t **ptr, uint32_t * lbuf,
>int * n_datum, int is_big, int shift)
>  {
> @@ -385,13 +403,17 @@ static int decode_frame(AVCodecContext *avctx,
>  (uint16_t*)ptr[1],
>  (uint16_t*)ptr[2],
>  (uint16_t*)ptr[3]};
> -int shift = packing == 1 ? 22 : 20;
> +int shift = elements > 1 ? packing == 1 ? 22 : 20 : packing ==
> 1 ? 2 : 0;

I still find this hard to read but if you cannot simplify please commit.

Thank you, Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 5/7] avcodec/dpx: improve decoding of 10 bit gray images

[Paul B Mahol]

Signed-off-by: Paul B Mahol 
---
 libavcodec/dpx.c | 28 +---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index cfe601..ed17bf3858 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -51,6 +51,24 @@ static unsigned int read32(const uint8_t **ptr, int is_big)
 return temp;
 }
 
+static uint16_t read10in32_gray(const uint8_t **ptr, uint32_t *lbuf,
+int *n_datum, int is_big, int shift)
+{
+uint16_t temp;
+
+if (*n_datum)
+(*n_datum)--;
+else {
+*lbuf = read32(ptr, is_big);
+*n_datum = 2;
+}
+
+temp = *lbuf >> shift & 0x3FF;
+*lbuf = *lbuf >> 10;
+
+return temp;
+}
+
 static uint16_t read10in32(const uint8_t **ptr, uint32_t * lbuf,
   int * n_datum, int is_big, int shift)
 {
@@ -385,13 +403,17 @@ static int decode_frame(AVCodecContext *avctx,
 (uint16_t*)ptr[1],
 (uint16_t*)ptr[2],
 (uint16_t*)ptr[3]};
-int shift = packing == 1 ? 22 : 20;
+int shift = elements > 1 ? packing == 1 ? 22 : 20 : packing == 1 ? 
2 : 0;
 for (y = 0; y < avctx->width; y++) {
 if (elements >= 3)
 *dst[2]++ = read10in32(, ,
_datum, endian, shift);
-*dst[0]++ = read10in32(, ,
-   _datum, endian, shift);
+if (elements == 1)
+*dst[0]++ = read10in32_gray(, ,
+_datum, endian, shift);
+else
+*dst[0]++ = read10in32(, ,
+   _datum, endian, shift);
 if (elements >= 2)
 *dst[1]++ = read10in32(, ,
_datum, endian, shift);
-- 
2.17.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel