X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fidcinvideo.c;h=e1b0e2e3e9ff2dfa9bcd37480f7b207bd9cd532e;hb=f769cfedd89db30e3d0fbf654138956779ea8053;hp=d516e39fbf7cfc3335a8e4f3f8db372c4410fc1e;hpb=5a00941b0690968b7309854d188eb63f3a9c6fa2;p=ffmpeg diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index d516e39fbf7..e1b0e2e3e9f 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -1,27 +1,28 @@ /* - * Id Quake II CIN Video Decoder + * id Quake II CIN Video Decoder * Copyright (C) 2003 the ffmpeg project * - * This library is free software; you can redistribute it and/or + * This file is part of Libav. + * + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * 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 @@ -31,11 +32,11 @@ * 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. * - * Note that this decoder could use ffmpeg's optimized VLC facilities + * Note that this decoder could use libavcodec's optimized VLC facilities * rather than naive, tree-based Huffman decoding. However, there are 256 * Huffman tables. Plus, the VLC bit coding order is right -> left instead * or left -> right, so all of the bits would have to be reversed. Further, @@ -46,11 +47,8 @@ #include #include #include -#include -#include "common.h" #include "avcodec.h" -#include "dsputil.h" #define HUFFMAN_TABLE_SIZE 64 * 1024 #define HUF_TOKENS 256 @@ -61,31 +59,29 @@ typedef struct int count; unsigned char used; int children[2]; -} hnode_t; +} hnode; typedef struct IdcinContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; - unsigned char *buf; + const unsigned char *buf; int size; - unsigned char palette[PALETTE_COUNT * 4]; - - 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; @@ -117,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; @@ -147,20 +143,18 @@ 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 = (IdcinContext *)avctx->priv_data; + IdcinContext *s = avctx->priv_data; int i, j, histogram_index = 0; unsigned char *histograms; s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; - dsputil_init(&s->dsp, avctx); /* make sure the Huffman tables make it */ if (s->avctx->extradata_size != HUFFMAN_TABLE_SIZE) { - printf(" 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; } @@ -179,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; @@ -194,8 +188,8 @@ static void idcin_decode_vlcs(IdcinContext *s) while(node_num >= HUF_TOKENS) { if(!bit_pos) { - if(dat_pos > s->size) { - printf("Huffman decode error.\n"); + if(dat_pos >= s->size) { + av_log(s->avctx, AV_LOG_ERROR, "Huffman decode error.\n"); return; } bit_pos = 8; @@ -215,42 +209,32 @@ 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) + AVPacket *avpkt) { - IdcinContext *s = (IdcinContext *)avctx->priv_data; - AVPaletteControl *palette_control = - (AVPaletteControl *)avctx->extradata; - int i; - unsigned int *palette32; - int palette_index = 0; - unsigned char r, g, b; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + IdcinContext *s = avctx->priv_data; + const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); s->buf = buf; s->size = buf_size; - if (palette_control->palette_changed) { - palette32 = (unsigned int *)s->palette; - for (i = 0; i < PALETTE_COUNT; i++) { - r = palette_control->palette[palette_index++] * 1; - g = palette_control->palette[palette_index++] * 1; - b = palette_control->palette[palette_index++] * 1; - palette32[i] = (r << 16) | (g << 8) | (b); - } - palette_control->palette_changed = 0; - } - if (s->frame.data[0]) avctx->release_buffer(avctx, &s->frame); if (avctx->get_buffer(avctx, &s->frame)) { - printf (" 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); + 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->palette, PALETTE_COUNT * 4); + memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE); *data_size = sizeof(AVFrame); *(AVFrame*)data = s->frame; @@ -259,9 +243,9 @@ 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 = (IdcinContext *)avctx->priv_data; + IdcinContext *s = avctx->priv_data; if (s->frame.data[0]) avctx->release_buffer(avctx, &s->frame); @@ -269,15 +253,14 @@ static int idcin_decode_end(AVCodecContext *avctx) return 0; } -AVCodec idcin_decoder = { - "idcinvideo", - CODEC_TYPE_VIDEO, - CODEC_ID_IDCIN, - sizeof(IdcinContext), - idcin_decode_init, - NULL, - idcin_decode_end, - idcin_decode_frame, - CODEC_CAP_DR1, +AVCodec ff_idcin_decoder = { + .name = "idcinvideo", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_IDCIN, + .priv_data_size = sizeof(IdcinContext), + .init = idcin_decode_init, + .close = idcin_decode_end, + .decode = idcin_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), }; -