* 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 libavcodec/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/
* 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,
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "avcodec.h"
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) {
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;
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;
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"),
};
-