X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Finterplayvideo.c;h=db98bec9c515bbf3b9628c30005cf4bf80baea0f;hb=b12d21733975f9001eecb480fc28e5e4473b1327;hp=40f7cd79228c33b6e2b17ccfdc4078f089896430;hpb=5e8b83ac3be00dc7a8d19f503a29c7b7d949b6ad;p=ffmpeg

diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 40f7cd79228..db98bec9c51 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -2,25 +2,25 @@
  * Interplay MVE Video Decoder
  * Copyright (C) 2003 the ffmpeg project
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file libavcodec/interplayvideo.c
+ * @file
  * Interplay MVE Video Decoder by Mike Melanson (melanson@pcisys.net)
  * For more information about the Interplay MVE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/interplay-mve.txt
@@ -37,22 +37,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "dsputil.h"
+#define BITSTREAM_READER_LE
+#include "get_bits.h"
 
 #define PALETTE_COUNT 256
 
-/* debugging support */
-#define DEBUG_INTERPLAY 0
-#if DEBUG_INTERPLAY
-#define debug_interplay(x,...) av_log(NULL, AV_LOG_DEBUG, x, __VA_ARGS__)
-#else
-static inline void debug_interplay(const char *format, ...) { }
-#endif
-
 typedef struct IpvideoContext {
 
     AVCodecContext *avctx;
@@ -66,26 +59,31 @@ typedef struct IpvideoContext {
     const unsigned char *buf;
     int size;
 
+    int is_16bpp;
     const unsigned char *stream_ptr;
     const unsigned char *stream_end;
+    const uint8_t *mv_ptr;
+    const uint8_t *mv_end;
     unsigned char *pixel_ptr;
     int line_inc;
     int stride;
     int upper_motion_limit_offset;
 
+    uint32_t pal[256];
 } IpvideoContext;
 
-#define CHECK_STREAM_PTR(n) \
-  if (s->stream_end - s->stream_ptr < n) { \
-    av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \
-      s->stream_ptr + n, s->stream_end); \
-    return -1; \
-  }
+#define CHECK_STREAM_PTR(stream_ptr, stream_end, n) \
+    if (stream_end - stream_ptr < n) { \
+        av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \
+               stream_ptr + n, stream_end); \
+        return -1; \
+    }
 
 static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
 {
     int current_offset = s->pixel_ptr - s->current_frame.data[0];
-    int motion_offset = current_offset + delta_y * s->stride + delta_x;
+    int motion_offset = current_offset + delta_y * s->current_frame.linesize[0]
+                       + delta_x * (1 + s->is_16bpp);
     if (motion_offset < 0) {
         av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset);
         return -1;
@@ -94,7 +92,12 @@ static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
             motion_offset, s->upper_motion_limit_offset);
         return -1;
     }
-    s->dsp.put_pixels_tab[1][0](s->pixel_ptr, src->data[0] + motion_offset, s->stride, 8);
+    if (src->data[0] == NULL) {
+        av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n");
+        return AVERROR(EINVAL);
+    }
+    s->dsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
+                                           s->current_frame.linesize[0], 8);
     return 0;
 }
 
@@ -114,8 +117,13 @@ static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s)
     int x, y;
 
     /* copy block from 2 frames ago using a motion vector; need 1 more byte */
-    CHECK_STREAM_PTR(1);
-    B = *s->stream_ptr++;
+    if (!s->is_16bpp) {
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
+        B = *s->stream_ptr++;
+    } else {
+        CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
+        B = *s->mv_ptr++;
+    }
 
     if (B < 56) {
         x = 8 + (B % 7);
@@ -125,7 +133,7 @@ static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s)
         y =   8 + ((B - 56) / 29);
     }
 
-    debug_interplay ("    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
+    av_dlog(NULL, "    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
     return copy_from(s, &s->second_last_frame, x, y);
 }
 
@@ -137,8 +145,13 @@ static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s)
     /* copy 8x8 block from current frame from an up/left block */
 
     /* need 1 more byte for motion */
-    CHECK_STREAM_PTR(1);
-    B = *s->stream_ptr++;
+    if (!s->is_16bpp) {
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
+        B = *s->stream_ptr++;
+    } else {
+        CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
+        B = *s->mv_ptr++;
+    }
 
     if (B < 56) {
         x = -(8 + (B % 7));
@@ -148,7 +161,7 @@ static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s)
         y = -(  8 + ((B - 56) / 29));
     }
 
-    debug_interplay ("    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
+    av_dlog(NULL, "    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
     return copy_from(s, &s->current_frame, x, y);
 }
 
@@ -158,15 +171,20 @@ static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s)
     unsigned char B, BL, BH;
 
     /* copy a block from the previous frame; need 1 more byte */
-    CHECK_STREAM_PTR(1);
+    if (!s->is_16bpp) {
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
+        B = *s->stream_ptr++;
+    } else {
+        CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
+        B = *s->mv_ptr++;
+    }
 
-    B = *s->stream_ptr++;
     BL = B & 0x0F;
     BH = (B >> 4) & 0x0F;
     x = -8 + BL;
     y = -8 + BH;
 
-    debug_interplay ("    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
+    av_dlog(NULL, "    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
     return copy_from(s, &s->last_frame, x, y);
 }
 
@@ -176,12 +194,12 @@ static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s)
 
     /* copy a block from the previous frame using an expanded range;
      * need 2 more bytes */
-    CHECK_STREAM_PTR(2);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
 
     x = *s->stream_ptr++;
     y = *s->stream_ptr++;
 
-    debug_interplay ("    motion bytes = %d, %d\n", x, y);
+    av_dlog(NULL, "    motion bytes = %d, %d\n", x, y);
     return copy_from(s, &s->last_frame, x, y);
 }
 
@@ -201,7 +219,7 @@ static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s)
     unsigned int flags;
 
     /* 2-color encoding */
-    CHECK_STREAM_PTR(2);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
 
     P[0] = *s->stream_ptr++;
     P[1] = *s->stream_ptr++;
@@ -209,20 +227,19 @@ static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s)
     if (P[0] <= P[1]) {
 
         /* need 8 more bytes from the stream */
-        CHECK_STREAM_PTR(8);
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
 
         for (y = 0; y < 8; y++) {
             flags = *s->stream_ptr++ | 0x100;
-            for (; flags != 1; flags >>= 1) {
+            for (; flags != 1; flags >>= 1)
                 *s->pixel_ptr++ = P[flags & 1];
-            }
             s->pixel_ptr += s->line_inc;
         }
 
     } else {
 
         /* need 2 more bytes from the stream */
-        CHECK_STREAM_PTR(2);
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
 
         flags = bytestream_get_le16(&s->stream_ptr);
         for (y = 0; y < 8; y += 2) {
@@ -248,14 +265,14 @@ static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
 
     /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on
      * either top and bottom or left and right halves */
-    CHECK_STREAM_PTR(2);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
 
     P[0] = *s->stream_ptr++;
     P[1] = *s->stream_ptr++;
 
     if (P[0] <= P[1]) {
 
-        CHECK_STREAM_PTR(14);
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 14);
         s->stream_ptr -= 2;
 
         for (y = 0; y < 16; y++) {
@@ -265,9 +282,8 @@ static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
                 flags = bytestream_get_le16(&s->stream_ptr);
             }
 
-            for (x = 0; x < 4; x++, flags >>= 1) {
+            for (x = 0; x < 4; x++, flags >>= 1)
                 *s->pixel_ptr++ = P[flags & 1];
-            }
             s->pixel_ptr += s->stride - 4;
             // switch to right half
             if (y == 7) s->pixel_ptr -= 8 * s->stride - 4;
@@ -276,7 +292,7 @@ static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
     } else {
 
         /* need 10 more bytes */
-        CHECK_STREAM_PTR(10);
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 10);
 
         if (s->stream_ptr[4] <= s->stream_ptr[5]) {
 
@@ -285,9 +301,8 @@ static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
             /* vertical split; left & right halves are 2-color encoded */
 
             for (y = 0; y < 16; y++) {
-                for (x = 0; x < 4; x++, flags >>= 1) {
+                for (x = 0; x < 4; x++, flags >>= 1)
                     *s->pixel_ptr++ = P[flags & 1];
-                }
                 s->pixel_ptr += s->stride - 4;
                 // switch to right half
                 if (y == 7) {
@@ -308,10 +323,8 @@ static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
                 }
                 flags = *s->stream_ptr++ | 0x100;
 
-                for (; flags != 1; flags >>= 1) {
-
+                for (; flags != 1; flags >>= 1)
                     *s->pixel_ptr++ = P[flags & 1];
-                }
                 s->pixel_ptr += s->line_inc;
             }
         }
@@ -327,7 +340,7 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
     unsigned char P[4];
 
     /* 4-color encoding */
-    CHECK_STREAM_PTR(4);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
 
     memcpy(P, s->stream_ptr, 4);
     s->stream_ptr += 4;
@@ -336,14 +349,13 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
         if (P[2] <= P[3]) {
 
             /* 1 of 4 colors for each pixel, need 16 more bytes */
-            CHECK_STREAM_PTR(16);
+            CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 16);
 
             for (y = 0; y < 8; y++) {
                 /* get the next set of 8 2-bit flags */
                 int flags = bytestream_get_le16(&s->stream_ptr);
-                for (x = 0; x < 8; x++, flags >>= 2) {
+                for (x = 0; x < 8; x++, flags >>= 2)
                     *s->pixel_ptr++ = P[flags & 0x03];
-                }
                 s->pixel_ptr += s->line_inc;
             }
 
@@ -351,7 +363,7 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
             uint32_t flags;
 
             /* 1 of 4 colors for each 2x2 block, need 4 more bytes */
-            CHECK_STREAM_PTR(4);
+            CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
 
             flags = bytestream_get_le32(&s->stream_ptr);
 
@@ -370,7 +382,7 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
         uint64_t flags;
 
         /* 1 of 4 colors for each 2x1 or 1x2 block, need 8 more bytes */
-        CHECK_STREAM_PTR(8);
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
 
         flags = bytestream_get_le64(&s->stream_ptr);
         if (P[2] <= P[3]) {
@@ -399,23 +411,17 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
 static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s)
 {
     int x, y;
-    unsigned char P[8];
-    unsigned char B[16];
+    unsigned char P[4];
     int flags = 0;
-    int split;
 
     /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on
      * either top and bottom or left and right halves */
-    CHECK_STREAM_PTR(4);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 24);
 
-    memcpy(P, s->stream_ptr, 4);
-    s->stream_ptr += 4;
+    if (s->stream_ptr[0] <= s->stream_ptr[1]) {
 
-    if (P[0] <= P[1]) {
-
-        /* 4-color encoding for each quadrant; need 28 more bytes */
-        CHECK_STREAM_PTR(28);
-        s->stream_ptr -= 4;
+        /* 4-color encoding for each quadrant; need 32 bytes */
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 32);
 
         for (y = 0; y < 16; y++) {
             // new values for each 4x4 block
@@ -425,9 +431,8 @@ static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s)
                 flags = bytestream_get_le32(&s->stream_ptr);
             }
 
-            for (x = 0; x < 4; x++, flags >>= 2) {
+            for (x = 0; x < 4; x++, flags >>= 2)
                 *s->pixel_ptr++ = P[flags & 0x03];
-            }
 
             s->pixel_ptr += s->stride - 4;
             // switch to right half
@@ -435,50 +440,29 @@ static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s)
         }
 
     } else {
+        // vertical split?
+        int vert = s->stream_ptr[12] <= s->stream_ptr[13];
+        uint64_t flags = 0;
 
         /* 4-color encoding for either left and right or top and bottom
-         * halves; need 20 more bytes */
-        CHECK_STREAM_PTR(20);
-
-        memcpy(B, s->stream_ptr, 8);
-        s->stream_ptr += 8;
-        memcpy(P + 4, s->stream_ptr, 4);
-        s->stream_ptr += 4;
-        memcpy(B + 8, s->stream_ptr, 8);
-        s->stream_ptr += 8;
-
-        if (P[4] <= P[5]) {
+         * halves */
 
-            /* block is divided into left and right halves */
-            for (y = 0; y < 8; y++) {
-
-                flags = (B[y + 8] << 8) | B[y];
-                split = 0;
-
-                for (x = 0; x < 8; x++, flags >>= 2) {
-                    if (x == 4)
-                        split = 4;
-                    *s->pixel_ptr++ = P[split + (flags & 0x03)];
-                }
-
-                s->pixel_ptr += s->line_inc;
+        for (y = 0; y < 16; y++) {
+            // load values for each half
+            if (!(y & 7)) {
+                memcpy(P, s->stream_ptr, 4);
+                s->stream_ptr += 4;
+                flags = bytestream_get_le64(&s->stream_ptr);
             }
 
-        } else {
-
-            /* block is divided into top and bottom halves */
-            split = 0;
-            for (y = 0; y < 8; y++) {
-
-                flags = (B[y * 2 + 1] << 8) | B[y * 2];
-                if (y == 4)
-                    split = 4;
-
-                for (x = 0; x < 8; x++, flags >>= 2)
-                    *s->pixel_ptr++ = P[split + (flags & 0x03)];
+            for (x = 0; x < 4; x++, flags >>= 2)
+                *s->pixel_ptr++ = P[flags & 0x03];
 
-                s->pixel_ptr += s->line_inc;
-            }
+            if (vert) {
+                s->pixel_ptr += s->stride - 4;
+                // switch to right half
+                if (y == 7) s->pixel_ptr -= 8 * s->stride - 4;
+            } else if (y & 1) s->pixel_ptr += s->line_inc;
         }
     }
 
@@ -491,7 +475,7 @@ static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s)
     int y;
 
     /* 64-color encoding (each pixel in block is a different color) */
-    CHECK_STREAM_PTR(64);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 64);
 
     for (y = 0; y < 8; y++) {
         memcpy(s->pixel_ptr, s->stream_ptr, 8);
@@ -508,7 +492,7 @@ static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s)
     int x, y;
 
     /* 16-color block encoding: each 2x2 block is a different color */
-    CHECK_STREAM_PTR(16);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 16);
 
     for (y = 0; y < 8; y += 2) {
         for (x = 0; x < 8; x += 2) {
@@ -527,23 +511,18 @@ static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s)
 static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s)
 {
     int y;
-    unsigned char P[4];
-    unsigned char index = 0;
+    unsigned char P[2];
 
     /* 4-color block encoding: each 4x4 block is a different color */
-    CHECK_STREAM_PTR(4);
-
-    memcpy(P, s->stream_ptr, 4);
-    s->stream_ptr += 4;
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
 
     for (y = 0; y < 8; y++) {
-        if (y < 4)
-            index = 0;
-        else
-            index = 2;
-
-        memset(s->pixel_ptr    , P[index    ], 4);
-        memset(s->pixel_ptr + 4, P[index + 1], 4);
+        if (!(y & 3)) {
+            P[0] = *s->stream_ptr++;
+            P[1] = *s->stream_ptr++;
+        }
+        memset(s->pixel_ptr,     P[0], 4);
+        memset(s->pixel_ptr + 4, P[1], 4);
         s->pixel_ptr += s->stride;
     }
 
@@ -557,7 +536,7 @@ static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s)
     unsigned char pix;
 
     /* 1-color encoding: the whole block is 1 solid color */
-    CHECK_STREAM_PTR(1);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
     pix = *s->stream_ptr++;
 
     for (y = 0; y < 8; y++) {
@@ -575,7 +554,7 @@ static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s)
     unsigned char sample[2];
 
     /* dithered encoding */
-    CHECK_STREAM_PTR(2);
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
     sample[0] = *s->stream_ptr++;
     sample[1] = *s->stream_ptr++;
 
@@ -591,6 +570,363 @@ static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s)
     return 0;
 }
 
+static int ipvideo_decode_block_opcode_0x6_16(IpvideoContext *s)
+{
+    signed char x, y;
+
+    /* copy a block from the second last frame using an expanded range */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
+
+    x = *s->stream_ptr++;
+    y = *s->stream_ptr++;
+
+    av_dlog(NULL, "    motion bytes = %d, %d\n", x, y);
+    return copy_from(s, &s->second_last_frame, x, y);
+}
+
+static int ipvideo_decode_block_opcode_0x7_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t P[2];
+    unsigned int flags;
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 2-color encoding */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
+
+    P[0] = bytestream_get_le16(&s->stream_ptr);
+    P[1] = bytestream_get_le16(&s->stream_ptr);
+
+    if (!(P[0] & 0x8000)) {
+
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+        for (y = 0; y < 8; y++) {
+            flags = *s->stream_ptr++ | 0x100;
+            for (; flags != 1; flags >>= 1)
+                *pixel_ptr++ = P[flags & 1];
+            pixel_ptr += s->line_inc;
+        }
+
+    } else {
+
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
+
+        flags = bytestream_get_le16(&s->stream_ptr);
+        for (y = 0; y < 8; y += 2) {
+            for (x = 0; x < 8; x += 2, flags >>= 1) {
+                pixel_ptr[x                ] =
+                pixel_ptr[x + 1            ] =
+                pixel_ptr[x +     s->stride] =
+                pixel_ptr[x + 1 + s->stride] = P[flags & 1];
+            }
+            pixel_ptr += s->stride * 2;
+        }
+    }
+
+    return 0;
+}
+
+static int ipvideo_decode_block_opcode_0x8_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t P[2];
+    unsigned int flags = 0;
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on
+     * either top and bottom or left and right halves */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
+
+    P[0] = bytestream_get_le16(&s->stream_ptr);
+    P[1] = bytestream_get_le16(&s->stream_ptr);
+
+    if (!(P[0] & 0x8000)) {
+
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 24);
+        s->stream_ptr -= 4;
+
+        for (y = 0; y < 16; y++) {
+            // new values for each 4x4 block
+            if (!(y & 3)) {
+                P[0] = bytestream_get_le16(&s->stream_ptr);
+                P[1] = bytestream_get_le16(&s->stream_ptr);
+                flags = bytestream_get_le16(&s->stream_ptr);
+            }
+
+            for (x = 0; x < 4; x++, flags >>= 1)
+                *pixel_ptr++ = P[flags & 1];
+            pixel_ptr += s->stride - 4;
+            // switch to right half
+            if (y == 7) pixel_ptr -= 8 * s->stride - 4;
+        }
+
+    } else {
+
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 12);
+
+        if (!(AV_RL16(s->stream_ptr + 4) & 0x8000)) {
+
+            flags = bytestream_get_le32(&s->stream_ptr);
+
+            /* vertical split; left & right halves are 2-color encoded */
+
+            for (y = 0; y < 16; y++) {
+                for (x = 0; x < 4; x++, flags >>= 1)
+                    *pixel_ptr++ = P[flags & 1];
+                pixel_ptr += s->stride - 4;
+                // switch to right half
+                if (y == 7) {
+                    pixel_ptr -= 8 * s->stride - 4;
+                    P[0] = bytestream_get_le16(&s->stream_ptr);
+                    P[1] = bytestream_get_le16(&s->stream_ptr);
+                    flags = bytestream_get_le32(&s->stream_ptr);
+                }
+            }
+
+        } else {
+
+            /* horizontal split; top & bottom halves are 2-color encoded */
+
+            for (y = 0; y < 8; y++) {
+                if (y == 4) {
+                    P[0] = bytestream_get_le16(&s->stream_ptr);
+                    P[1] = bytestream_get_le16(&s->stream_ptr);
+                }
+                flags = *s->stream_ptr++ | 0x100;
+
+                for (; flags != 1; flags >>= 1)
+                    *pixel_ptr++ = P[flags & 1];
+                pixel_ptr += s->line_inc;
+            }
+        }
+    }
+
+    /* report success */
+    return 0;
+}
+
+static int ipvideo_decode_block_opcode_0x9_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t P[4];
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 4-color encoding */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+    for (x = 0; x < 4; x++)
+        P[x] = bytestream_get_le16(&s->stream_ptr);
+
+    if (!(P[0] & 0x8000)) {
+        if (!(P[2] & 0x8000)) {
+
+            /* 1 of 4 colors for each pixel */
+            CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 16);
+
+            for (y = 0; y < 8; y++) {
+                /* get the next set of 8 2-bit flags */
+                int flags = bytestream_get_le16(&s->stream_ptr);
+                for (x = 0; x < 8; x++, flags >>= 2)
+                    *pixel_ptr++ = P[flags & 0x03];
+                pixel_ptr += s->line_inc;
+            }
+
+        } else {
+            uint32_t flags;
+
+            /* 1 of 4 colors for each 2x2 block */
+            CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
+
+            flags = bytestream_get_le32(&s->stream_ptr);
+
+            for (y = 0; y < 8; y += 2) {
+                for (x = 0; x < 8; x += 2, flags >>= 2) {
+                    pixel_ptr[x                ] =
+                    pixel_ptr[x + 1            ] =
+                    pixel_ptr[x +     s->stride] =
+                    pixel_ptr[x + 1 + s->stride] = P[flags & 0x03];
+                }
+                pixel_ptr += s->stride * 2;
+            }
+
+        }
+    } else {
+        uint64_t flags;
+
+        /* 1 of 4 colors for each 2x1 or 1x2 block */
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+        flags = bytestream_get_le64(&s->stream_ptr);
+        if (!(P[2] & 0x8000)) {
+            for (y = 0; y < 8; y++) {
+                for (x = 0; x < 8; x += 2, flags >>= 2) {
+                    pixel_ptr[x    ] =
+                    pixel_ptr[x + 1] = P[flags & 0x03];
+                }
+                pixel_ptr += s->stride;
+            }
+        } else {
+            for (y = 0; y < 8; y += 2) {
+                for (x = 0; x < 8; x++, flags >>= 2) {
+                    pixel_ptr[x            ] =
+                    pixel_ptr[x + s->stride] = P[flags & 0x03];
+                }
+                pixel_ptr += s->stride * 2;
+            }
+        }
+    }
+
+    /* report success */
+    return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xA_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t P[4];
+    int flags = 0;
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on
+     * either top and bottom or left and right halves */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 24);
+
+    if (!(AV_RL16(s->stream_ptr) & 0x8000)) {
+
+        /* 4-color encoding for each quadrant */
+        CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 48);
+
+        for (y = 0; y < 16; y++) {
+            // new values for each 4x4 block
+            if (!(y & 3)) {
+                for (x = 0; x < 4; x++)
+                    P[x] = bytestream_get_le16(&s->stream_ptr);
+                flags = bytestream_get_le32(&s->stream_ptr);
+            }
+
+            for (x = 0; x < 4; x++, flags >>= 2)
+                *pixel_ptr++ = P[flags & 0x03];
+
+            pixel_ptr += s->stride - 4;
+            // switch to right half
+            if (y == 7) pixel_ptr -= 8 * s->stride - 4;
+        }
+
+    } else {
+        // vertical split?
+        int vert = !(AV_RL16(s->stream_ptr + 16) & 0x8000);
+        uint64_t flags = 0;
+
+        /* 4-color encoding for either left and right or top and bottom
+         * halves */
+
+        for (y = 0; y < 16; y++) {
+            // load values for each half
+            if (!(y & 7)) {
+                for (x = 0; x < 4; x++)
+                    P[x] = bytestream_get_le16(&s->stream_ptr);
+                flags = bytestream_get_le64(&s->stream_ptr);
+            }
+
+            for (x = 0; x < 4; x++, flags >>= 2)
+                *pixel_ptr++ = P[flags & 0x03];
+
+            if (vert) {
+                pixel_ptr += s->stride - 4;
+                // switch to right half
+                if (y == 7) pixel_ptr -= 8 * s->stride - 4;
+            } else if (y & 1) pixel_ptr += s->line_inc;
+        }
+    }
+
+    /* report success */
+    return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xB_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 64-color encoding (each pixel in block is a different color) */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 128);
+
+    for (y = 0; y < 8; y++) {
+        for (x = 0; x < 8; x++)
+            pixel_ptr[x] = bytestream_get_le16(&s->stream_ptr);
+        pixel_ptr  += s->stride;
+    }
+
+    /* report success */
+    return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xC_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 16-color block encoding: each 2x2 block is a different color */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 32);
+
+    for (y = 0; y < 8; y += 2) {
+        for (x = 0; x < 8; x += 2) {
+            pixel_ptr[x                ] =
+            pixel_ptr[x + 1            ] =
+            pixel_ptr[x +     s->stride] =
+            pixel_ptr[x + 1 + s->stride] = bytestream_get_le16(&s->stream_ptr);
+        }
+        pixel_ptr += s->stride * 2;
+    }
+
+    /* report success */
+    return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xD_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t P[2];
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 4-color block encoding: each 4x4 block is a different color */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+    for (y = 0; y < 8; y++) {
+        if (!(y & 3)) {
+            P[0] = bytestream_get_le16(&s->stream_ptr);
+            P[1] = bytestream_get_le16(&s->stream_ptr);
+        }
+        for (x = 0; x < 8; x++)
+            pixel_ptr[x] = P[x >> 2];
+        pixel_ptr += s->stride;
+    }
+
+    /* report success */
+    return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xE_16(IpvideoContext *s)
+{
+    int x, y;
+    uint16_t pix;
+    uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+    /* 1-color encoding: the whole block is 1 solid color */
+    CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
+    pix = bytestream_get_le16(&s->stream_ptr);
+
+    for (y = 0; y < 8; y++) {
+        for (x = 0; x < 8; x++)
+            pixel_ptr[x] = pix;
+        pixel_ptr += s->stride;
+    }
+
+    /* report success */
+    return 0;
+}
+
 static int (* const ipvideo_decode_block[])(IpvideoContext *s) = {
     ipvideo_decode_block_opcode_0x0, ipvideo_decode_block_opcode_0x1,
     ipvideo_decode_block_opcode_0x2, ipvideo_decode_block_opcode_0x3,
@@ -602,54 +938,73 @@ static int (* const ipvideo_decode_block[])(IpvideoContext *s) = {
     ipvideo_decode_block_opcode_0xE, ipvideo_decode_block_opcode_0xF,
 };
 
+static int (* const ipvideo_decode_block16[])(IpvideoContext *s) = {
+    ipvideo_decode_block_opcode_0x0,    ipvideo_decode_block_opcode_0x1,
+    ipvideo_decode_block_opcode_0x2,    ipvideo_decode_block_opcode_0x3,
+    ipvideo_decode_block_opcode_0x4,    ipvideo_decode_block_opcode_0x5,
+    ipvideo_decode_block_opcode_0x6_16, ipvideo_decode_block_opcode_0x7_16,
+    ipvideo_decode_block_opcode_0x8_16, ipvideo_decode_block_opcode_0x9_16,
+    ipvideo_decode_block_opcode_0xA_16, ipvideo_decode_block_opcode_0xB_16,
+    ipvideo_decode_block_opcode_0xC_16, ipvideo_decode_block_opcode_0xD_16,
+    ipvideo_decode_block_opcode_0xE_16, ipvideo_decode_block_opcode_0x1,
+};
+
 static void ipvideo_decode_opcodes(IpvideoContext *s)
 {
     int x, y;
-    int index = 0;
     unsigned char opcode;
     int ret;
-    int code_counts[16] = {0};
     static int frame = 0;
+    GetBitContext gb;
 
-    debug_interplay("------------------ frame %d\n", frame);
+    av_dlog(NULL, "------------------ frame %d\n", frame);
     frame++;
 
-    /* this is PAL8, so make the palette available */
-    memcpy(s->current_frame.data[1], s->avctx->palctrl->palette, PALETTE_COUNT * 4);
+    if (!s->is_16bpp) {
+        /* this is PAL8, so make the palette available */
+        memcpy(s->current_frame.data[1], s->pal, AVPALETTE_SIZE);
 
-    s->stride = s->current_frame.linesize[0];
-    s->stream_ptr = s->buf + 14;  /* data starts 14 bytes in */
-    s->stream_end = s->buf + s->size;
+        s->stride = s->current_frame.linesize[0];
+        s->stream_ptr = s->buf + 14;  /* data starts 14 bytes in */
+        s->stream_end = s->buf + s->size;
+    } else {
+        s->stride = s->current_frame.linesize[0] >> 1;
+        s->stream_ptr = s->buf + 16;
+        s->stream_end =
+        s->mv_ptr = s->buf + 14 + AV_RL16(s->buf+14);
+        s->mv_end = s->buf + s->size;
+    }
     s->line_inc = s->stride - 8;
-    s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride
-        + s->avctx->width - 8;
-
-    for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) {
-        for (x = y; x < y + s->avctx->width; x += 8) {
-            /* bottom nibble first, then top nibble (which makes it
-             * hard to use a GetBitcontext) */
-            if (index & 1)
-                opcode = s->decoding_map[index >> 1] >> 4;
-            else
-                opcode = s->decoding_map[index >> 1] & 0xF;
-            index++;
-
-            debug_interplay("  block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
-                x - y, y / s->stride, opcode, s->stream_ptr);
-            code_counts[opcode]++;
-
-            s->pixel_ptr = s->current_frame.data[0] + x;
-            ret = ipvideo_decode_block[opcode](s);
+    s->upper_motion_limit_offset = (s->avctx->height - 8) * s->current_frame.linesize[0]
+                                  + (s->avctx->width - 8) * (1 + s->is_16bpp);
+
+    init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8);
+    for (y = 0; y < s->avctx->height; y += 8) {
+        for (x = 0; x < s->avctx->width; x += 8) {
+            opcode = get_bits(&gb, 4);
+
+            av_dlog(NULL, "  block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
+                    x, y, opcode, s->stream_ptr);
+
+            if (!s->is_16bpp) {
+                s->pixel_ptr = s->current_frame.data[0] + x
+                              + y*s->current_frame.linesize[0];
+                ret = ipvideo_decode_block[opcode](s);
+            } else {
+                s->pixel_ptr = s->current_frame.data[0] + x*2
+                              + y*s->current_frame.linesize[0];
+                ret = ipvideo_decode_block16[opcode](s);
+            }
             if (ret != 0) {
                 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n",
-                    frame, x - y, y / s->stride);
+                       frame, x, y);
                 return;
             }
         }
     }
     if (s->stream_end - s->stream_ptr > 1) {
         av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n",
-            s->stream_end - s->stream_ptr);
+               s->stream_end - s->stream_ptr);
     }
 }
 
@@ -659,12 +1014,9 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx)
 
     s->avctx = avctx;
 
-    if (s->avctx->palctrl == NULL) {
-        av_log(avctx, AV_LOG_ERROR, " Interplay video: palette expected.\n");
-        return -1;
-    }
+    s->is_16bpp = avctx->bits_per_coded_sample == 16;
+    avctx->pix_fmt = s->is_16bpp ? PIX_FMT_RGB555 : PIX_FMT_PAL8;
 
-    avctx->pix_fmt = PIX_FMT_PAL8;
     dsputil_init(&s->dsp, avctx);
 
     /* decoding map contains 4 bits of information per 8x8 block */
@@ -678,10 +1030,11 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx)
 
 static int ipvideo_decode_frame(AVCodecContext *avctx,
                                 void *data, int *data_size,
-                                const uint8_t *buf, int buf_size)
+                                AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     IpvideoContext *s = avctx->priv_data;
-    AVPaletteControl *palette_control = avctx->palctrl;
 
     /* compressed buffer needs to be large enough to at least hold an entire
      * decoding map */
@@ -698,13 +1051,16 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
         return -1;
     }
 
-    ipvideo_decode_opcodes(s);
-
-    if (palette_control->palette_changed) {
-        palette_control->palette_changed = 0;
-        s->current_frame.palette_has_changed = 1;
+    if (!s->is_16bpp) {
+        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+        if (pal) {
+            s->current_frame.palette_has_changed = 1;
+            memcpy(s->pal, pal, AVPALETTE_SIZE);
+        }
     }
 
+    ipvideo_decode_opcodes(s);
+
     *data_size = sizeof(AVFrame);
     *(AVFrame*)data = s->current_frame;
 
@@ -732,15 +1088,14 @@ static av_cold int ipvideo_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec interplay_video_decoder = {
-    "interplayvideo",
-    CODEC_TYPE_VIDEO,
-    CODEC_ID_INTERPLAY_VIDEO,
-    sizeof(IpvideoContext),
-    ipvideo_decode_init,
-    NULL,
-    ipvideo_decode_end,
-    ipvideo_decode_frame,
-    CODEC_CAP_DR1,
+AVCodec ff_interplay_video_decoder = {
+    .name           = "interplayvideo",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = CODEC_ID_INTERPLAY_VIDEO,
+    .priv_data_size = sizeof(IpvideoContext),
+    .init           = ipvideo_decode_init,
+    .close          = ipvideo_decode_end,
+    .decode         = ipvideo_decode_frame,
+    .capabilities   = CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"),
 };