diff mbox

[FFmpeg-devel] lavc/dpx: Support 10-bit packing method b (msbpad)

Message ID CAB0OVGrYW-CtnoWnnZwV_LaDcBD_S1jzXqPUOGF67wAoZxU6VA@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos June 16, 2018, 9:03 p.m. UTC 
2018-06-16 21:32 GMT+02:00, Jerome Martinez <jerome@mediaarea.net>:
> On 16/06/2018 17:49, Carl Eugen Hoyos wrote:

>> +    *lbuf = (*lbuf << 10) | (*lbuf >> shift);
>
> Padding bits are 0 in all DPX files I have seen up to now
> but in theory padding bits are not defined

Of course not, new patch attached.
Thank you!

Please comment, Carl Eugen

Comments

Carl Eugen Hoyos June 21, 2018, 5:46 p.m. UTC | #1 
2018-06-16 23:03 GMT+02:00, Carl Eugen Hoyos <ceffmpeg@gmail.com>:
> 2018-06-16 21:32 GMT+02:00, Jerome Martinez <jerome@mediaarea.net>:
>> On 16/06/2018 17:49, Carl Eugen Hoyos wrote:
>
>>> +    *lbuf = (*lbuf << 10) | (*lbuf >> shift);
>>
>> Padding bits are 0 in all DPX files I have seen up to now
>> but in theory padding bits are not defined
>
> Of course not, new patch attached.

Patch applied.

Carl Eugen
diff mbox

Patch

From 401bdebba6dc8fa2253c720107a971b3fbf2c312 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Sat, 16 Jun 2018 17:47:46 +0200
Subject: [PATCH] lavc/dpx: Support 10-bit packing method b (msbpad).

---
 libavcodec/dpx.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 69d594b..0650a20 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -51,7 +51,7 @@  static unsigned int read32(const uint8_t **ptr, int is_big)
 }
 
 static uint16_t read10in32(const uint8_t **ptr, uint32_t * lbuf,
-                                  int * n_datum, int is_big)
+                                  int * n_datum, int is_big, int shift)
 {
     if (*n_datum)
         (*n_datum)--;
@@ -60,7 +60,7 @@  static uint16_t read10in32(const uint8_t **ptr, uint32_t * lbuf,
         *n_datum = 2;
     }
 
-    *lbuf = (*lbuf << 10) | (*lbuf >> 22);
+    *lbuf = *lbuf << 10 | *lbuf >> shift & 0x3FFFFF;
 
     return *lbuf & 0x3FF;
 }
@@ -221,7 +221,7 @@  static int decode_frame(AVCodecContext *avctx,
         stride = avctx->width * elements;
         break;
     case 10:
-        if (!packing || packing > 1) {
+        if (!packing) {
             av_log(avctx, AV_LOG_ERROR, "Packing to 32bit required\n");
             return -1;
         }
@@ -360,17 +360,18 @@  static int decode_frame(AVCodecContext *avctx,
                                 (uint16_t*)ptr[1],
                                 (uint16_t*)ptr[2],
                                 (uint16_t*)ptr[3]};
+            int shift = packing == 1 ? 22 : 20;
             for (y = 0; y < avctx->width; y++) {
                 *dst[2]++ = read10in32(&buf, &rgbBuffer,
-                                       &n_datum, endian);
+                                       &n_datum, endian, shift);
                 *dst[0]++ = read10in32(&buf, &rgbBuffer,
-                                       &n_datum, endian);
+                                       &n_datum, endian, shift);
                 *dst[1]++ = read10in32(&buf, &rgbBuffer,
-                                       &n_datum, endian);
+                                       &n_datum, endian, shift);
                 if (elements == 4)
                     *dst[3]++ =
                     read10in32(&buf, &rgbBuffer,
-                               &n_datum, endian);
+                               &n_datum, endian, shift);
             }
             n_datum = 0;
             for (i = 0; i < elements; i++)
-- 
1.7.10.4