X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbethsoftvideo.c;h=54bc46c555f8a2f1defb7a245d1e04765c4d0180;hb=6708cfc4d3a079527409b2ba2fc75997a7975104;hp=f3150d42bfb1b735767ea7a5e0fdb37bb9260688;hpb=bbbd775714101641093391d1de98bd505bdc34c2;p=ffmpeg

diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index f3150d42bfb..54bc46c555f 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,7 +36,7 @@ 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;
@@ -46,7 +46,7 @@ static int bethsoftvid_decode_init(AVCodecContext *avctx)
     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;
@@ -58,22 +58,22 @@ static void set_palette(AVFrame * frame, uint8_t * palette_buffer)
 
 static int bethsoftvid_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
-                              uint8_t *buf, int buf_size)
+                              const uint8_t *buf, int buf_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;
-    int rle_num_bytes;
+    int code;
     int yoffset;
 
     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++){
@@ -84,33 +84,33 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
             yoffset = bytestream_get_le16(&buf);
             if(yoffset >= avctx->height)
                 return -1;
-            destination += vid->frame.linesize[0] * yoffset;
+            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);
+        while(length > remaining){
+            if(code < 0x80)
+                bytestream_get_buffer(&buf, dst, remaining);
             else if(block_type == VIDEO_I_FRAME)
-                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)
+                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);
+        if(code < 0x80)
+            bytestream_get_buffer(&buf, dst, length);
         else if(block_type == VIDEO_I_FRAME)
-            memset(destination, *buf++, length);
-        line_remaining -= length;
-        destination += length;
+            memset(dst, *buf++, length);
+        remaining -= length;
+        dst += length;
     }
     end:
 
@@ -120,7 +120,7 @@ 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;
     if(vid->frame.data[0])
@@ -136,4 +136,5 @@ AVCodec bethsoftvid_decoder = {
     .init = bethsoftvid_decode_init,
     .close = bethsoftvid_decode_end,
     .decode = bethsoftvid_decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"),
 };