X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fidcinvideo.c;h=1a5a1c3a258b6c51e26cd8571afdfe16788bc755;hb=1da2a20763ae9ca579d5fd20763065871ddf6311;hp=fa3bb16d8c7ae2d0d64f225bcbd0b7f034ec39bd;hpb=02fb2546e85c8a9aaa1a595439d7b1cfbe2fcb0d;p=ffmpeg diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index fa3bb16d8c7..1a5a1c3a258 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -2,25 +2,25 @@ * 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 + * @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/ @@ -36,7 +36,7 @@ * 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, @@ -47,16 +47,16 @@ #include #include #include -#include #include "avcodec.h" +#include "internal.h" +#include "libavutil/internal.h" #define HUFFMAN_TABLE_SIZE 64 * 1024 #define HUF_TOKENS 256 #define PALETTE_COUNT 256 -typedef struct -{ +typedef struct hnode { int count; unsigned char used; int children[2]; @@ -65,7 +65,6 @@ typedef struct typedef struct IdcinContext { AVCodecContext *avctx; - AVFrame frame; const unsigned char *buf; int size; @@ -73,12 +72,13 @@ typedef struct IdcinContext { 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 *hnodes, int num_hnodes) { @@ -150,7 +150,7 @@ static av_cold int idcin_decode_init(AVCodecContext *avctx) unsigned char *histograms; s->avctx = avctx; - avctx->pix_fmt = PIX_FMT_PAL8; + avctx->pix_fmt = AV_PIX_FMT_PAL8; /* make sure the Huffman tables make it */ if (s->avctx->extradata_size != HUFFMAN_TABLE_SIZE) { @@ -166,12 +166,10 @@ static av_cold int idcin_decode_init(AVCodecContext *avctx) huff_build_tree(s, i); } - s->frame.data[0] = NULL; - return 0; } -static void idcin_decode_vlcs(IdcinContext *s) +static void idcin_decode_vlcs(IdcinContext *s, AVFrame *frame) { hnode *hnodes; long x, y; @@ -180,8 +178,8 @@ static void idcin_decode_vlcs(IdcinContext *s) int bit_pos, node_num, dat_pos; prev = bit_pos = dat_pos = 0; - for (y = 0; y < (s->frame.linesize[0] * s->avctx->height); - y += s->frame.linesize[0]) { + for (y = 0; y < (frame->linesize[0] * s->avctx->height); + y += frame->linesize[0]) { for (x = y; x < y + s->avctx->width; x++) { node_num = s->num_huff_nodes[prev]; hnodes = s->huff_nodes[prev]; @@ -201,67 +199,53 @@ static void idcin_decode_vlcs(IdcinContext *s) bit_pos--; } - s->frame.data[0][x] = node_num; + frame->data[0][x] = node_num; prev = node_num; } } } static int idcin_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - const uint8_t *buf, int buf_size) + void *data, int *got_frame, + 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); + AVFrame *frame = data; + int ret; s->buf = buf; s->size = buf_size; - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - - if (avctx->get_buffer(avctx, &s->frame)) { + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, " id CIN Video: get_buffer() failed\n"); - return -1; + return ret; } - idcin_decode_vlcs(s); + idcin_decode_vlcs(s, frame); - /* 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; - s->frame.palette_has_changed = 1; + if (pal) { + frame->palette_has_changed = 1; + memcpy(s->pal, pal, AVPALETTE_SIZE); } + /* make the palette available on the way out */ + memcpy(frame->data[1], s->pal, AVPALETTE_SIZE); - *data_size = sizeof(AVFrame); - *(AVFrame*)data = s->frame; + *got_frame = 1; /* report that the buffer was completely consumed */ return buf_size; } -static av_cold int idcin_decode_end(AVCodecContext *avctx) -{ - IdcinContext *s = avctx->priv_data; - - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - - 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, - .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), +AVCodec ff_idcin_decoder = { + .name = "idcinvideo", + .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_IDCIN, + .priv_data_size = sizeof(IdcinContext), + .init = idcin_decode_init, + .decode = idcin_decode_frame, + .capabilities = AV_CODEC_CAP_DR1, }; -