/*
- * Id Quake II CIN File Demuxer
+ * id Quake II CIN File Demuxer
* Copyright (c) 2003 The ffmpeg Project
*
* This file is part of FFmpeg.
*/
/**
- * @file idcin.c
- * Id Quake II CIN file demuxer by Mike Melanson (melanson@pcisys.net)
- * For more information about the Id CIN format, visit:
+ * @file libavformat/idcin.c
+ * id Quake II CIN file demuxer by Mike Melanson (melanson@pcisys.net)
+ * For more information about the id CIN format, visit:
* http://www.csse.monash.edu.au/~timf/
*
* CIN is a somewhat quirky and ill-defined format. Here are some notes
* audio frame #2: 787 * (bytes/sample) * (# channels) bytes in frame
* audio frame #3: 788 * (bytes/sample) * (# channels) bytes in frame
*
- * Finally, not all Id CIN creation tools agree on the resolution of the
+ * Finally, not all id CIN creation tools agree on the resolution of the
* color palette, apparently. Some creation tools specify red, green, and
* blue palette components in terms of 6-bit VGA color DAC values which
* range from 0..63. Other tools specify the RGB components as full 8-bit
* transmitting them to the video decoder
*/
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
#define HUFFMAN_TABLE_SIZE (64 * 1024)
unsigned int number;
/*
- * This is what you could call a "probabilistic" file check: Id CIN
+ * This is what you could call a "probabilistic" file check: id CIN
* files don't have a definite file signature. In lieu of such a marker,
* perform sanity checks on the 5 32-bit header fields:
* width, height: greater than 0, less than or equal to 1024
st->codec->codec_tag = 1;
st->codec->channels = channels;
st->codec->sample_rate = sample_rate;
- st->codec->bits_per_sample = bytes_per_sample * 8;
+ st->codec->bits_per_coded_sample = bytes_per_sample * 8;
st->codec->bit_rate = sample_rate * bytes_per_sample * 8 * channels;
st->codec->block_align = bytes_per_sample * channels;
if (bytes_per_sample == 1)
return ret;
}
-static int idcin_read_close(AVFormatContext *s)
-{
-
- return 0;
-}
-
AVInputFormat idcin_demuxer = {
"idcin",
- NULL_IF_CONFIG_SMALL("Id CIN format"),
+ NULL_IF_CONFIG_SMALL("id Cinematic format"),
sizeof(IdcinDemuxContext),
idcin_probe,
idcin_read_header,
idcin_read_packet,
- idcin_read_close,
};