X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fidcinvideo.c;h=ac56e19442d5da4b4962fef019cdb848bbe420d1;hb=a88ef93b4abbea9f18c8750113dc9e99931f2f8a;hp=79ed6fb1701d422a3f75bc772f8e9ac0c63301a8;hpb=7993df65275a9a9bf0a04c37d1aa31901d3ebb0c;p=ffmpeg diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 79ed6fb1701..ac56e19442d 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -1,28 +1,28 @@ /* - * Id Quake II CIN Video Decoder + * id Quake II CIN Video Decoder * Copyright (C) 2003 the ffmpeg project * - * 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 idcinvideo.c - * Id Quake II Cin Video Decoder by Dr. Tim Ferguson - * For more information about the Id CIN format, visit: + * @file + * 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. * @@ -47,10 +47,8 @@ #include #include #include -#include #include "avcodec.h" -#include "dsputil.h" #define HUFFMAN_TABLE_SIZE 64 * 1024 #define HUF_TOKENS 256 @@ -61,29 +59,29 @@ typedef struct int count; unsigned char used; int children[2]; -} hnode_t; +} hnode; typedef struct IdcinContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *buf; int size; - hnode_t huff_nodes[256][HUF_TOKENS*2]; + hnode huff_nodes[256][HUF_TOKENS*2]; int num_huff_nodes[256]; + uint32_t pal[256]; } IdcinContext; /* * Find the lowest probability node in a Huffman table, and mark it as * being assigned to a higher probability. - * Returns the node index of the lowest unused node, or -1 if all nodes + * @return the node index of the lowest unused node, or -1 if all nodes * are used. */ -static int huff_smallest_node(hnode_t *hnodes, int num_hnodes) { +static int huff_smallest_node(hnode *hnodes, int num_hnodes) { int i; int best, best_node; @@ -115,8 +113,8 @@ 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) { - hnode_t *node, *hnodes; +static av_cold void huff_build_tree(IdcinContext *s, int prev) { + hnode *node, *hnodes; int num_hnodes, i; num_hnodes = HUF_TOKENS; @@ -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; } @@ -176,7 +173,7 @@ static int idcin_decode_init(AVCodecContext *avctx) static void idcin_decode_vlcs(IdcinContext *s) { - hnode_t *hnodes; + hnode *hnodes; long x, y; int prev; unsigned char v = 0; @@ -212,10 +209,12 @@ static void idcin_decode_vlcs(IdcinContext *s) static int idcin_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; IdcinContext *s = avctx->priv_data; - AVPaletteControl *palette_control = avctx->palctrl; + const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); s->buf = buf; s->size = buf_size; @@ -224,19 +223,18 @@ 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; } idcin_decode_vlcs(s); - /* make the palette available on the way out */ - memcpy(s->frame.data[1], palette_control->palette, PALETTE_COUNT * 4); - /* If palette changed inform application*/ - if (palette_control->palette_changed) { - palette_control->palette_changed = 0; + if (pal) { s->frame.palette_has_changed = 1; + memcpy(s->pal, pal, AVPALETTE_SIZE); } + /* make the palette available on the way out */ + memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE); *data_size = sizeof(AVFrame); *(AVFrame*)data = s->frame; @@ -245,7 +243,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; @@ -255,9 +253,9 @@ static int idcin_decode_end(AVCodecContext *avctx) return 0; } -AVCodec idcin_decoder = { +AVCodec ff_idcin_decoder = { "idcinvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_IDCIN, sizeof(IdcinContext), idcin_decode_init, @@ -265,5 +263,6 @@ AVCodec idcin_decoder = { idcin_decode_end, idcin_decode_frame, CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), };