oh yeah, this is it...MPlayer now has 4-bit MS RLE support...I think

MPlayer is basically complete now...:)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5214 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 152 insertions, 16 deletions

diff --git a/libmpcodecs/vd_msrle.c b/libmpcodecs/vd_msrle.c
index 2ef0c9305a..3ed00fb98b 100644
--- a/libmpcodecs/vd_msrle.c
+++ b/libmpcodecs/vd_msrle.c
@@ -24,7 +24,16 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
 
 // init driver
 static int init(sh_video_t *sh){
-    return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24);
+  unsigned char *palette = (unsigned char *)sh->bih+40;
+  int i;
+  unsigned short color;
+
+  // if BGR15 & BGR16, modify palette in place
+  for (i = 0; i < sh->bih->biClrUsed; i++)
+  {
+  }
+
+  return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24);
 }
 
 // uninit driver
@@ -42,6 +51,134 @@ static void uninit(sh_video_t *sh){
     } \
     stream_byte = encoded[stream_ptr++];
 
+void decode_msrle4(
+  unsigned char *encoded,
+  int encoded_size,
+  unsigned char *decoded,
+  int width,
+  int height,
+  unsigned char *palette_map,
+  int bits_per_pixel)
+{
+  int bytes_per_pixel = (bits_per_pixel + 1) / 8;
+  unsigned char r1, g1, b1;
+  unsigned char r2, g2, b2;
+  int stream_ptr = 0;
+  unsigned char rle_code;
+  unsigned char extra_byte;
+  unsigned char stream_byte;
+  int frame_size = width * height * bytes_per_pixel;
+  int pixel_ptr = 0;
+  int row_dec = width * bytes_per_pixel;
+  int row_ptr = (height - 1) * row_dec;
+  int i;
+
+  while (row_ptr >= 0)
+  {
+    FETCH_NEXT_STREAM_BYTE();
+    rle_code = stream_byte;
+    if (rle_code == 0)
+    {
+      // fetch the next byte to see how to handle escape code
+      FETCH_NEXT_STREAM_BYTE();
+      if (stream_byte == 0)
+      {
+        // line is done, goto the next one
+        row_ptr -= row_dec;
+        pixel_ptr = 0;
+      }
+      else if (stream_byte == 1)
+        // decode is done
+        return;
+      else if (stream_byte == 2)
+      {
+        // reposition frame decode coordinates
+        FETCH_NEXT_STREAM_BYTE();
+        pixel_ptr += stream_byte * bytes_per_pixel;
+        FETCH_NEXT_STREAM_BYTE();
+        row_ptr -= stream_byte * row_dec;
+      }
+      else
+      {
+        // copy pixels from encoded stream
+        rle_code = stream_byte;
+        rle_code /= 2;
+        extra_byte = rle_code & 0x01;
+        if ((row_ptr + pixel_ptr + rle_code * bytes_per_pixel > frame_size) ||
+            (row_ptr < 0))
+        {
+          mp_msg(MSGT_DECVIDEO, MSGL_WARN,
+            "MS RLE: frame ptr just went out of bounds (1)\n");
+          return;
+        }
+
+        for (i = 0; i < rle_code; i++)
+        {
+          if (pixel_ptr >= row_dec)
+            break;
+          r1 = palette_map[(encoded[stream_ptr + i] >> 4) * 4 + 2];
+          g1 = palette_map[(encoded[stream_ptr + i] >> 4) * 4 + 1];
+          b1 = palette_map[(encoded[stream_ptr + i] >> 4) * 4 + 0];
+          decoded[row_ptr + pixel_ptr + 0] = b1;
+          decoded[row_ptr + pixel_ptr + 1] = g1;
+          decoded[row_ptr + pixel_ptr + 2] = r1;
+          pixel_ptr += bytes_per_pixel;
+
+          if (pixel_ptr >= row_dec)
+            break;
+          r1 = palette_map[(encoded[stream_ptr + i] & 0x0F) * 4 + 2];
+          g1 = palette_map[(encoded[stream_ptr + i] & 0x0F) * 4 + 1];
+          b1 = palette_map[(encoded[stream_ptr + i] & 0x0F) * 4 + 0];
+          decoded[row_ptr + pixel_ptr + 0] = b1;
+          decoded[row_ptr + pixel_ptr + 1] = g1;
+          decoded[row_ptr + pixel_ptr + 2] = r1;
+          pixel_ptr += bytes_per_pixel;
+        }
+        stream_ptr += rle_code;
+
+        // if the RLE code is odd, skip a byte in the stream
+        if (extra_byte)
+          stream_ptr++;
+      }
+    }
+    else
+    {
+      // decode a run of data
+      FETCH_NEXT_STREAM_BYTE();
+      r1 = palette_map[(stream_byte >> 4) * 4 + 2];
+      g1 = palette_map[(stream_byte >> 4) * 4 + 1];
+      b1 = palette_map[(stream_byte >> 4) * 4 + 0];
+      r2 = palette_map[(stream_byte & 0x0F) * 4 + 2];
+      g2 = palette_map[(stream_byte & 0x0F) * 4 + 1];
+      b2 = palette_map[(stream_byte & 0x0F) * 4 + 0];
+      for (i = 0; i < rle_code; i++)
+      {
+        if (pixel_ptr >= row_dec)
+          break;
+
+        if ((i & 1) == 0)
+        {
+          decoded[row_ptr + pixel_ptr + 0] = b1;
+          decoded[row_ptr + pixel_ptr + 1] = g1;
+          decoded[row_ptr + pixel_ptr + 2] = r1;
+        }
+        else
+        {
+          decoded[row_ptr + pixel_ptr + 0] = b2;
+          decoded[row_ptr + pixel_ptr + 1] = g2;
+          decoded[row_ptr + pixel_ptr + 2] = r2;
+        }
+        pixel_ptr += bytes_per_pixel;
+      }
+    }
+  }
+
+  // one last sanity check on the way out
+  if (stream_ptr < encoded_size)
+    mp_msg(MSGT_DECVIDEO, MSGL_WARN,
+      "MS RLE: ended frame decode with bytes left over (%d < %d)\n",
+      stream_ptr, encoded_size);
+}
 
 void decode_msrle8(
   unsigned char *encoded,
@@ -50,8 +187,9 @@ void decode_msrle8(
   int width,
   int height,
   unsigned char *palette_map,
-  int bytes_per_pixel)
+  int bits_per_pixel)
 {
+  int bytes_per_pixel = (bits_per_pixel + 1) / 8;
   unsigned char r, g, b;
   int stream_ptr = 0;
   unsigned char rle_code;
@@ -62,18 +200,6 @@ void decode_msrle8(
   int row_dec = width * bytes_per_pixel;
   int row_ptr = (height - 1) * row_dec;
 
-/*
-static int counter = 0;
-int i;
-printf ("run %d: ", counter++);
-for (i = 0; i < 16; i++)
-  printf (" %02X", encoded[i]);
-printf ("\n");
-for (i = encoded_size - 16; i < encoded_size; i++)
-  printf (" (%d)%02X", i, encoded[i]);
-printf ("\n");
-*/
-
   while (row_ptr >= 0)
   {
     FETCH_NEXT_STREAM_BYTE();
@@ -178,11 +304,21 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 	sh->disp_w, sh->disp_h);
     if(!mpi) return NULL;
 
-    decode_msrle8(
+    if (sh->format == 1)
+      decode_msrle8(
         data,len, mpi->planes[0],
         sh->disp_w, sh->disp_h,
         (unsigned char *)sh->bih+40,
-        mpi->bpp/8);
+        mpi->bpp);
+    else if (sh->format == 2)
+      decode_msrle4(
+        data,len, mpi->planes[0],
+        sh->disp_w, sh->disp_h,
+        (unsigned char *)sh->bih+40,
+        mpi->bpp);
+    else
+      mp_msg(MSGT_DECVIDEO, MSGL_WARN,
+        "MS RLE: Don't know how to decode format %08X", sh->format);
     
     return mpi;
 }