ra288dec: set channel layout

[ffmpeg] / libavcodec / tmv.c

diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c
index 29aaae1fe71b339a063209dd8e6e572ca0f4a88b..8533707f8ba91604cf88936e4252bd8404c8d667 100644 (file)
--- a/libavcodec/tmv.c
+++ b/libavcodec/tmv.c
@@ -2,31 +2,34 @@
  * 8088flex TMV video decoder
  * Copyright (c) 2009 Daniel Verkamp <daniel at drv.nu>
  *
- * 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
  * 8088flex TMV video decoder
- * @file libavcodec/tmv.c
  * @author Daniel Verkamp
- * @sa http://www.oldskool.org/pc/8088_Corruption
+ * @see http://www.oldskool.org/pc/8088_Corruption
  */
 
+#include <string.h>
+
 #include "avcodec.h"
+#include "libavutil/internal.h"
 
 #include "cga_data.h"
 
@@ -39,10 +42,10 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data,
 {
     TMVContext *tmv    = avctx->priv_data;
     const uint8_t *src = avpkt->data;
-    uint8_t *dst, *dst_char;
+    uint8_t *dst;
     unsigned char_cols = avctx->width >> 3;
     unsigned char_rows = avctx->height >> 3;
-    unsigned x, y, mask, char_y, fg, bg, c;
+    unsigned x, y, fg, bg, c;
 
     if (tmv->pic.data[0])
         avctx->release_buffer(avctx, &tmv->pic);
@@ -59,7 +62,7 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data,
         return -1;
     }
 
-    tmv->pic.pict_type = FF_I_TYPE;
+    tmv->pic.pict_type = AV_PICTURE_TYPE_I;
     tmv->pic.key_frame = 1;
     dst                = tmv->pic.data[0];
 
@@ -68,17 +71,11 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data,
 
     for (y = 0; y < char_rows; y++) {
         for (x = 0; x < char_cols; x++) {
-            c  = *src++ * 8;
+            c  = *src++;
             bg = *src  >> 4;
             fg = *src++ & 0xF;
-
-            dst_char = dst + x * 8;
-            for (char_y = 0; char_y < 8; char_y++) {
-                for (mask = 0x80; mask; mask >>= 1) {
-                    *dst_char++ = ff_cga_font[c + char_y] & mask ? fg : bg;
-                }
-                dst_char += tmv->pic.linesize[0] - 8;
-            }
+            ff_draw_pc_font(dst + x * 8, tmv->pic.linesize[0],
+                            ff_cga_font, 8, c, fg, bg);
         }
         dst += tmv->pic.linesize[0] * 8;
     }
@@ -88,6 +85,12 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data,
     return avpkt->size;
 }
 
+static av_cold int tmv_decode_init(AVCodecContext *avctx)
+{
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
+    return 0;
+}
+
 static av_cold int tmv_decode_close(AVCodecContext *avctx)
 {
     TMVContext *tmv = avctx->priv_data;
@@ -98,11 +101,12 @@ static av_cold int tmv_decode_close(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec tmv_decoder = {
+AVCodec ff_tmv_decoder = {
     .name           = "tmv",
-    .type           = CODEC_TYPE_VIDEO,
-    .id             = CODEC_ID_TMV,
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_TMV,
     .priv_data_size = sizeof(TMVContext),
+    .init           = tmv_decode_init,
     .close          = tmv_decode_close,
     .decode         = tmv_decode_frame,
     .capabilities   = CODEC_CAP_DR1,