annotate flic.c @ 1960:c0289552590f libavformat

Change the vhook code to send real timestamps to the filters instead of the current time of day, which is useless, and which the filters could just as easily query for themselves. patch by Bobby Bingham, uhmmmm gmail com
author diego
date Thu, 29 Mar 2007 05:24:35 +0000
parents 9cd35d039830
children 1a3c9056982a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
1 /*
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
2 * FLI/FLC Animation File Demuxer
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
3 * Copyright (c) 2003 The ffmpeg Project
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
15 * Lesser General Public License for more details.
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
16 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
20 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
21
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
22 /**
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
23 * @file flic.c
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
24 * FLI/FLC file demuxer
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
25 * by Mike Melanson (melanson@pcisys.net)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
26 * for more information on the .fli/.flc file format and all of its many
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
27 * variations, visit:
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
28 * http://www.compuphase.com/flic.htm
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
29 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
30 * This demuxer handles standard 0xAF11- and 0xAF12-type FLIs. It also
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
31 * handles special FLIs from the PC game "Magic Carpet".
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
32 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
33
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
34 #include "avformat.h"
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
35
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
36 #define FLIC_FILE_MAGIC_1 0xAF11
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
37 #define FLIC_FILE_MAGIC_2 0xAF12
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
38 #define FLIC_FILE_MAGIC_3 0xAF44 /* Flic Type for Extended FLX Format which
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
39 originated in Dave's Targa Animator (DTA) */
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
40 #define FLIC_CHUNK_MAGIC_1 0xF1FA
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
41 #define FLIC_CHUNK_MAGIC_2 0xF5FA
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
42 #define FLIC_MC_PTS_INC 6000 /* pts increment for Magic Carpet game FLIs */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
43 #define FLIC_DEFAULT_PTS_INC 6000 /* for FLIs that have 0 speed */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
44
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
45 #define FLIC_HEADER_SIZE 128
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
46 #define FLIC_PREAMBLE_SIZE 6
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
47
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
48 typedef struct FlicDemuxContext {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
49 int frame_pts_inc;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
50 int64_t pts;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
51 int video_stream_index;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
52 } FlicDemuxContext;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
53
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
54 static int flic_probe(AVProbeData *p)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
55 {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
56 int magic_number;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
57
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
58 if (p->buf_size < 6)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
59 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
60
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
61 magic_number = AV_RL16(&p->buf[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
62 if ((magic_number != FLIC_FILE_MAGIC_1) &&
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
63 (magic_number != FLIC_FILE_MAGIC_2) &&
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
64 (magic_number != FLIC_FILE_MAGIC_3))
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
65 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
66
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
67 return AVPROBE_SCORE_MAX;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
68 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
69
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
70 static int flic_read_header(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
71 AVFormatParameters *ap)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
72 {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
73 FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
74 ByteIOContext *pb = &s->pb;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
75 unsigned char header[FLIC_HEADER_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
76 AVStream *st;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
77 int speed;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
78 int magic_number;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
79
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
80 flic->pts = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
81
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
82 /* load the whole header and pull out the width and height */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
83 if (get_buffer(pb, header, FLIC_HEADER_SIZE) != FLIC_HEADER_SIZE)
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
84 return AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
85
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
86 magic_number = AV_RL16(&header[4]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
87 speed = AV_RL32(&header[0x10]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
88
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
89 /* initialize the decoder streams */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
90 st = av_new_stream(s, 0);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
91 if (!st)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
92 return AVERROR_NOMEM;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
93 flic->video_stream_index = st->index;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
94 st->codec->codec_type = CODEC_TYPE_VIDEO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
95 st->codec->codec_id = CODEC_ID_FLIC;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
96 st->codec->codec_tag = 0; /* no fourcc */
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
97 st->codec->width = AV_RL16(&header[0x08]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
98 st->codec->height = AV_RL16(&header[0x0A]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
99
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
100 if (!st->codec->width || !st->codec->height)
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
101 return AVERROR_INVALIDDATA;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
102
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
103 /* send over the whole 128-byte FLIC header */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
104 st->codec->extradata_size = FLIC_HEADER_SIZE;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
105 st->codec->extradata = av_malloc(FLIC_HEADER_SIZE);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
106 memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
107
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 386
diff changeset
108 av_set_pts_info(st, 33, 1, 90000);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
109
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
110 /* Time to figure out the framerate: If there is a FLIC chunk magic
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
111 * number at offset 0x10, assume this is from the Bullfrog game,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
112 * Magic Carpet. */
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
113 if (AV_RL16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
114
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
115 flic->frame_pts_inc = FLIC_MC_PTS_INC;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
116
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
117 /* rewind the stream since the first chunk is at offset 12 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
118 url_fseek(pb, 12, SEEK_SET);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
119
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
120 /* send over abbreviated FLIC header chunk */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
121 av_free(st->codec->extradata);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
122 st->codec->extradata_size = 12;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
123 st->codec->extradata = av_malloc(12);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
124 memcpy(st->codec->extradata, header, 12);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
125
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
126 } else if (magic_number == FLIC_FILE_MAGIC_1) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
127 /*
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
128 * in this case, the speed (n) is number of 1/70s ticks between frames:
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
129 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
130 * pts n * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
131 * -------- = ----------- => pts = n * (90000/70) * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
132 * 90000 70
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
133 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
134 * therefore, the frame pts increment = n * 1285.7
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
135 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
136 flic->frame_pts_inc = speed * 1285.7;
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
137 } else if ((magic_number == FLIC_FILE_MAGIC_2) ||
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
138 (magic_number == FLIC_FILE_MAGIC_3)) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
139 /*
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
140 * in this case, the speed (n) is number of milliseconds between frames:
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
141 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
142 * pts n * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
143 * -------- = ----------- => pts = n * 90 * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
144 * 90000 1000
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
145 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
146 * therefore, the frame pts increment = n * 90
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
147 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
148 flic->frame_pts_inc = speed * 90;
1801
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
149 } else {
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
150 av_log(s, AV_LOG_INFO, "Invalid or unsupported magic chunk in file\n");
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
151 return AVERROR_INVALIDDATA;
1801
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
152 }
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
153
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
154 if (flic->frame_pts_inc == 0)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
155 flic->frame_pts_inc = FLIC_DEFAULT_PTS_INC;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
156
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
157 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
158 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
159
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
160 static int flic_read_packet(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
161 AVPacket *pkt)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
162 {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
163 FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
164 ByteIOContext *pb = &s->pb;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
165 int packet_read = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
166 unsigned int size;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
167 int magic;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
168 int ret = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
169 unsigned char preamble[FLIC_PREAMBLE_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
170
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
171 while (!packet_read) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
172
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
173 if ((ret = get_buffer(pb, preamble, FLIC_PREAMBLE_SIZE)) !=
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
174 FLIC_PREAMBLE_SIZE) {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
175 ret = AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
176 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
177 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
178
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
179 size = AV_RL32(&preamble[0]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
180 magic = AV_RL16(&preamble[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
181
643
253b5292946a various security fixes and precautionary checks
michael
parents: 482
diff changeset
182 if (((magic == FLIC_CHUNK_MAGIC_1) || (magic == FLIC_CHUNK_MAGIC_2)) && size > FLIC_PREAMBLE_SIZE) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
183 if (av_new_packet(pkt, size)) {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
184 ret = AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
185 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
186 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
187 pkt->stream_index = flic->video_stream_index;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
188 pkt->pts = flic->pts;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
189 pkt->pos = url_ftell(pb);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
190 memcpy(pkt->data, preamble, FLIC_PREAMBLE_SIZE);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
191 ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE,
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
192 size - FLIC_PREAMBLE_SIZE);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
193 if (ret != size - FLIC_PREAMBLE_SIZE) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
194 av_free_packet(pkt);
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
195 ret = AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
196 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
197 flic->pts += flic->frame_pts_inc;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
198 packet_read = 1;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
199 } else {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
200 /* not interested in this chunk */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
201 url_fseek(pb, size - 6, SEEK_CUR);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
202 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
203 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
204
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
205 return ret;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
206 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
207
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
208 static int flic_read_close(AVFormatContext *s)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
209 {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
210 // FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
211
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
212 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
213 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
214
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
215 AVInputFormat flic_demuxer = {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
216 "flic",
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
217 "FLI/FLC/FLX animation format",
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
218 sizeof(FlicDemuxContext),
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
219 flic_probe,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
220 flic_read_header,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
221 flic_read_packet,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
222 flic_read_close,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
223 };