/*
* FLI/FLC Animation File Demuxer
- * Copyright (c) 2003 The ffmpeg Project
+ * Copyright (c) 2003 The FFmpeg project
*
* This file is part of Libav.
*
* special FLIs from the PC games "Magic Carpet" and "X-COM: Terror from the Deep".
*/
+#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
-#include "libavutil/audioconvert.h"
#include "avformat.h"
+#include "internal.h"
#define FLIC_FILE_MAGIC_1 0xAF11
#define FLIC_FILE_MAGIC_2 0xAF12
return AVPROBE_SCORE_MAX;
}
-static int flic_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int flic_read_header(AVFormatContext *s)
{
FlicDemuxContext *flic = s->priv_data;
AVIOContext *pb = s->pb;
speed = FLIC_DEFAULT_SPEED;
/* initialize the decoder streams */
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
flic->video_stream_index = st->index;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = CODEC_ID_FLIC;
- st->codec->codec_tag = 0; /* no fourcc */
- st->codec->width = AV_RL16(&header[0x08]);
- st->codec->height = AV_RL16(&header[0x0A]);
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = AV_CODEC_ID_FLIC;
+ st->codecpar->codec_tag = 0; /* no fourcc */
+ st->codecpar->width = AV_RL16(&header[0x08]);
+ st->codecpar->height = AV_RL16(&header[0x0A]);
- if (!st->codec->width || !st->codec->height) {
+ if (!st->codecpar->width || !st->codecpar->height) {
/* Ugly hack needed for the following sample: */
/* http://samples.libav.org/fli-flc/fli-bugs/specular.flc */
av_log(s, AV_LOG_WARNING,
"File with no specified width/height. Trying 640x480.\n");
- st->codec->width = 640;
- st->codec->height = 480;
+ st->codecpar->width = 640;
+ st->codecpar->height = 480;
}
/* send over the whole 128-byte FLIC header */
- st->codec->extradata_size = FLIC_HEADER_SIZE;
- st->codec->extradata = av_malloc(FLIC_HEADER_SIZE);
- memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);
+ st->codecpar->extradata_size = FLIC_HEADER_SIZE;
+ st->codecpar->extradata = av_malloc(FLIC_HEADER_SIZE);
+ memcpy(st->codecpar->extradata, header, FLIC_HEADER_SIZE);
/* peek at the preamble to detect TFTD videos - they seem to always start with an audio chunk */
if (avio_read(pb, preamble, FLIC_PREAMBLE_SIZE) != FLIC_PREAMBLE_SIZE) {
*/
if (AV_RL16(&preamble[4]) == FLIC_TFTD_CHUNK_AUDIO) {
/* TFTD videos have an extra 22050 Hz 8-bit mono audio stream */
- ast = av_new_stream(s, 1);
+ ast = avformat_new_stream(s, NULL);
if (!ast)
return AVERROR(ENOMEM);
flic->audio_stream_index = ast->index;
/* all audio frames are the same size, so use the size of the first chunk for block_align */
- ast->codec->block_align = AV_RL32(&preamble[0]);
- ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- ast->codec->codec_id = CODEC_ID_PCM_U8;
- ast->codec->codec_tag = 0;
- ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE;
- ast->codec->channels = 1;
- ast->codec->sample_fmt = AV_SAMPLE_FMT_U8;
- ast->codec->bit_rate = st->codec->sample_rate * 8;
- ast->codec->bits_per_coded_sample = 8;
- ast->codec->channel_layout = AV_CH_LAYOUT_MONO;
- ast->codec->extradata_size = 0;
+ ast->codecpar->block_align = AV_RL32(&preamble[0]);
+ ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8;
+ ast->codecpar->codec_tag = 0;
+ ast->codecpar->sample_rate = FLIC_TFTD_SAMPLE_RATE;
+ ast->codecpar->channels = 1;
+ ast->codecpar->format = AV_SAMPLE_FMT_U8;
+ ast->codecpar->bit_rate = st->codecpar->sample_rate * 8;
+ ast->codecpar->bits_per_coded_sample = 8;
+ ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
+ ast->codecpar->extradata_size = 0;
/* Since the header information is incorrect we have to figure out the
* framerate using block_align and the fact that the audio is 22050 Hz.
* We usually have two cases: 2205 -> 10 fps and 1470 -> 15 fps */
- av_set_pts_info(st, 64, ast->codec->block_align, FLIC_TFTD_SAMPLE_RATE);
- av_set_pts_info(ast, 64, 1, FLIC_TFTD_SAMPLE_RATE);
+ avpriv_set_pts_info(st, 64, ast->codecpar->block_align, FLIC_TFTD_SAMPLE_RATE);
+ avpriv_set_pts_info(ast, 64, 1, FLIC_TFTD_SAMPLE_RATE);
} else if (AV_RL16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) {
- av_set_pts_info(st, 64, FLIC_MC_SPEED, 70);
+ avpriv_set_pts_info(st, 64, FLIC_MC_SPEED, 70);
/* rewind the stream since the first chunk is at offset 12 */
avio_seek(pb, 12, SEEK_SET);
/* send over abbreviated FLIC header chunk */
- av_free(st->codec->extradata);
- st->codec->extradata_size = 12;
- st->codec->extradata = av_malloc(12);
- memcpy(st->codec->extradata, header, 12);
+ av_free(st->codecpar->extradata);
+ st->codecpar->extradata_size = 12;
+ st->codecpar->extradata = av_malloc(12);
+ memcpy(st->codecpar->extradata, header, 12);
} else if (magic_number == FLIC_FILE_MAGIC_1) {
- av_set_pts_info(st, 64, speed, 70);
+ avpriv_set_pts_info(st, 64, speed, 70);
} else if ((magic_number == FLIC_FILE_MAGIC_2) ||
(magic_number == FLIC_FILE_MAGIC_3)) {
- av_set_pts_info(st, 64, speed, 1000);
+ avpriv_set_pts_info(st, 64, speed, 1000);
} else {
av_log(s, AV_LOG_INFO, "Invalid or unsupported magic chunk in file\n");
return AVERROR_INVALIDDATA;
ret = avio_read(pb, pkt->data + FLIC_PREAMBLE_SIZE,
size - FLIC_PREAMBLE_SIZE);
if (ret != size - FLIC_PREAMBLE_SIZE) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
ret = AVERROR(EIO);
}
packet_read = 1;
ret = avio_read(pb, pkt->data, size);
if (ret != size) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
ret = AVERROR(EIO);
}
}
AVInputFormat ff_flic_demuxer = {
- "flic",
- NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
- sizeof(FlicDemuxContext),
- flic_probe,
- flic_read_header,
- flic_read_packet,
+ .name = "flic",
+ .long_name = NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation"),
+ .priv_data_size = sizeof(FlicDemuxContext),
+ .read_probe = flic_probe,
+ .read_header = flic_read_header,
+ .read_packet = flic_read_packet,
};
projects / ffmpeg / blobdiff