in TRUNCATED mode, use residual fragments in ParseContext

[ffmpeg] / libavcodec / idcinvideo.c

diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index eeb538c4f0d3680d85f9ac3f3b3cbe7e8e0de69e..e10c1735230431c96931d4cdd2087623bc700b68 100644 (file)
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -1,5 +1,5 @@
 /*
- * Id Quake II CIN Video Decoder
+ * id Quake II CIN Video Decoder
  * Copyright (C) 2003 the ffmpeg project
  *
  * This file is part of FFmpeg.
@@ -21,8 +21,8 @@
 
 /**
  * @file idcinvideo.c
- * Id Quake II Cin Video Decoder by Dr. Tim Ferguson
- * For more information about the Id CIN format, visit:
+ * id Quake II Cin Video Decoder by Dr. Tim Ferguson
+ * For more information about the id CIN format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
  * This video decoder outputs PAL8 colorspace data. Interacting with this
@@ -32,7 +32,7 @@
  * the demuxer must use the same extradata space to transmit an
  * AVPaletteControl structure.
  *
- * Id CIN video is purely Huffman-coded, intraframe-only codec. It achieves
+ * id CIN video is purely Huffman-coded, intraframe-only codec. It achieves
  * a little more compression by exploiting the fact that adjacent pixels
  * tend to be similar.
  *
@@ -50,7 +50,6 @@
 #include <unistd.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 
 #define HUFFMAN_TABLE_SIZE 64 * 1024
 #define HUF_TOKENS 256
@@ -66,10 +65,9 @@ typedef struct
 typedef struct IdcinContext {
 
     AVCodecContext *avctx;
-    DSPContext dsp;
     AVFrame frame;
 
-    unsigned char *buf;
+    const unsigned char *buf;
     int size;
 
     hnode_t huff_nodes[256][HUF_TOKENS*2];
@@ -115,7 +113,7 @@ static int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
  *  num_huff_nodes[prev] - contains the index to the root node of the tree.
  *    That is: huff_nodes[prev][num_huff_nodes[prev]] is the root node.
  */
-static void huff_build_tree(IdcinContext *s, int prev) {
+static av_cold void huff_build_tree(IdcinContext *s, int prev) {
     hnode_t *node, *hnodes;
      int num_hnodes, i;
 
@@ -145,7 +143,7 @@ static void huff_build_tree(IdcinContext *s, int prev) {
     s->num_huff_nodes[prev] = num_hnodes - 1;
 }
 
-static int idcin_decode_init(AVCodecContext *avctx)
+static av_cold int idcin_decode_init(AVCodecContext *avctx)
 {
     IdcinContext *s = avctx->priv_data;
     int i, j, histogram_index = 0;
@@ -153,11 +151,10 @@ static int idcin_decode_init(AVCodecContext *avctx)
 
     s->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_PAL8;
-    dsputil_init(&s->dsp, avctx);
 
     /* make sure the Huffman tables make it */
     if (s->avctx->extradata_size != HUFFMAN_TABLE_SIZE) {
-        av_log(s->avctx, AV_LOG_ERROR, "  Id CIN video: expected extradata size of %d\n", HUFFMAN_TABLE_SIZE);
+        av_log(s->avctx, AV_LOG_ERROR, "  id CIN video: expected extradata size of %d\n", HUFFMAN_TABLE_SIZE);
         return -1;
     }
 
@@ -212,7 +209,7 @@ static void idcin_decode_vlcs(IdcinContext *s)
 
 static int idcin_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
-                              uint8_t *buf, int buf_size)
+                              const uint8_t *buf, int buf_size)
 {
     IdcinContext *s = avctx->priv_data;
     AVPaletteControl *palette_control = avctx->palctrl;
@@ -224,7 +221,7 @@ static int idcin_decode_frame(AVCodecContext *avctx,
         avctx->release_buffer(avctx, &s->frame);
 
     if (avctx->get_buffer(avctx, &s->frame)) {
-        av_log(avctx, AV_LOG_ERROR, "  Id CIN Video: get_buffer() failed\n");
+        av_log(avctx, AV_LOG_ERROR, "  id CIN Video: get_buffer() failed\n");
         return -1;
     }
 
@@ -245,7 +242,7 @@ static int idcin_decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-static int idcin_decode_end(AVCodecContext *avctx)
+static av_cold int idcin_decode_end(AVCodecContext *avctx)
 {
     IdcinContext *s = avctx->priv_data;
 
@@ -265,5 +262,6 @@ AVCodec idcin_decoder = {
     idcin_decode_end,
     idcin_decode_frame,
     CODEC_CAP_DR1,
+    .long_name = "id Quake II CIN video",
 };