X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbethsoftvideo.c;h=6b4a5acabd70c13f33f38448662e58fd9a80ada6;hb=e262365d7c84203028b5da5265ffc6b27ac33be8;hp=a59743789ada59ce5d8d6c287d5566b85313ef96;hpb=1e6c67599e34348e00ca556ba1ba1537f88ebc96;p=ffmpeg

diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index a59743789ad..6b4a5acabd7 100644
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -20,14 +20,14 @@
  */
 
 /**
- * @file bethsoftvideo.c
+ * @file libavcodec/bethsoftvideo.c
  * @brief Bethesda Softworks VID Video Decoder
  * @author Nicholas Tung [ntung (at. ntung com] (2007-03)
  * @sa http://wiki.multimedia.cx/index.php?title=Bethsoft_VID
  * @sa http://www.svatopluk.com/andux/docs/dfvid.html
  */
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 #include "bethsoftvideo.h"
 #include "bytestream.h"
@@ -36,81 +36,83 @@ typedef struct BethsoftvidContext {
     AVFrame frame;
 } BethsoftvidContext;
 
-static int bethsoftvid_decode_init(AVCodecContext *avctx)
+static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx)
 {
     BethsoftvidContext *vid = avctx->priv_data;
     vid->frame.reference = 1;
     vid->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
         FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
-    avctx->pix_fmt = PIX_FMT_PAL8;    // palette in vid->frame.data[1]
-    av_log(avctx, AV_LOG_DEBUG, "[bethsoftvid video decoder] init\n");
+    avctx->pix_fmt = PIX_FMT_PAL8;
     return 0;
 }
 
-static void set_palette(AVFrame * frame, uint8_t * palette_buffer)
+static void set_palette(AVFrame * frame, const uint8_t * palette_buffer)
 {
     uint32_t * palette = (uint32_t *)frame->data[1];
     int a;
-    for(a = 0; a < VID_PALETTE_NUMCOLORS; a++)
-    {
-        palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4;    // multiply all colors by 4
+    for(a = 0; a < 256; a++){
+        palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4;
     }
     frame->palette_has_changed = 1;
 }
 
 static int bethsoftvid_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
-                              uint8_t *buf, int buf_size)
+                              AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     BethsoftvidContext * vid = avctx->priv_data;
     char block_type;
-    uint8_t * destination;
+    uint8_t * dst;
     uint8_t * frame_end;
-    int line_remaining = avctx->width;          // number of bytes remaining on a line
+    int remaining = avctx->width;          // number of bytes remaining on a line
     const int wrap_to_next_line = vid->frame.linesize[0] - avctx->width;
-    uint8_t rle_num_bytes;
+    int code;
     int yoffset;
 
-    av_log(avctx, AV_LOG_DEBUG, "[bethsoftvid video decoder] decoding frame\n");
-
-    // reget buffer will copy old data, good for simple difference frames
     if (avctx->reget_buffer(avctx, &vid->frame)) {
         av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
         return -1;
     }
-    destination = vid->frame.data[0];
+    dst = vid->frame.data[0];
     frame_end = vid->frame.data[0] + vid->frame.linesize[0] * avctx->height;
 
-    switch(block_type = *buf++)
-    {
-        case PALETTE_BLOCK: set_palette(&vid->frame, buf); return 0;
-        case VIDEO_YOFFSET_DIFFERENCE_FRAME_BLOCK:
+    switch(block_type = *buf++){
+        case PALETTE_BLOCK:
+            set_palette(&vid->frame, buf);
+            return 0;
+        case VIDEO_YOFF_P_FRAME:
             yoffset = bytestream_get_le16(&buf);
-            if(yoffset >= avctx->height) { return -1; }
-            destination += vid->frame.linesize[0] * yoffset;
+            if(yoffset >= avctx->height)
+                return -1;
+            dst += vid->frame.linesize[0] * yoffset;
     }
 
     // main code
-    while((rle_num_bytes = *buf++))
-    {
-        int length = rle_num_bytes & 0x7f;
+    while((code = *buf++)){
+        int length = code & 0x7f;
 
         // copy any bytes starting at the current position, and ending at the frame width
-        while(length > line_remaining)
-        {
-            if(rle_num_bytes < 0x80) { bytestream_get_buffer(&buf, destination, line_remaining); }
-            else if(block_type == VIDEO_FULL_FRAME_BLOCK) { memset(destination, buf[0], line_remaining); }
-            length -= line_remaining;      // decrement the number of bytes to be copied
-            destination += line_remaining + wrap_to_next_line;    // skip over extra bytes at end of frame
-            line_remaining = avctx->width;
-            if(destination == frame_end) { goto end; }
+        while(length > remaining){
+            if(code < 0x80)
+                bytestream_get_buffer(&buf, dst, remaining);
+            else if(block_type == VIDEO_I_FRAME)
+                memset(dst, buf[0], remaining);
+            length -= remaining;      // decrement the number of bytes to be copied
+            dst += remaining + wrap_to_next_line;    // skip over extra bytes at end of frame
+            remaining = avctx->width;
+            if(dst == frame_end)
+                goto end;
         }
 
         // copy any remaining bytes after / if line overflows
-        if(rle_num_bytes < 0x80) { bytestream_get_buffer(&buf, destination, length); }
-        else if(block_type == VIDEO_FULL_FRAME_BLOCK) { memset(destination, *buf++, length); }
-        line_remaining -= length;
-        destination += length;
+        if(code < 0x80)
+            bytestream_get_buffer(&buf, dst, length);
+        else if(block_type == VIDEO_I_FRAME)
+            memset(dst, *buf++, length);
+        remaining -= length;
+        dst += length;
     }
     end:
 
@@ -120,11 +122,11 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-static int bethsoftvid_decode_end(AVCodecContext *avctx)
+static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx)
 {
     BethsoftvidContext * vid = avctx->priv_data;
-    av_log(avctx, AV_LOG_DEBUG, "[bethsoftvid video decoder] closing\n");
-    if(vid->frame.data[0]) { avctx->release_buffer(avctx, &vid->frame); }
+    if(vid->frame.data[0])
+        avctx->release_buffer(avctx, &vid->frame);
     return 0;
 }
 
@@ -136,4 +138,6 @@ AVCodec bethsoftvid_decoder = {
     .init = bethsoftvid_decode_init,
     .close = bethsoftvid_decode_end,
     .decode = bethsoftvid_decode_frame,
+    .capabilities = CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"),
 };