Mercurial > libavformat.hg
annotate flic.c @ 6075:be118b3b67a8 libavformat
Make write_streamheader() log a message if there is no codec tag
defined.
author | stefano |
---|---|
date | Wed, 02 Jun 2010 21:57:40 +0000 |
parents | 6ac06c16fb75 |
children | 29e95ae56fa9 |
rev | line source |
---|---|
315 | 1 /* |
2 * FLI/FLC Animation File Demuxer | |
3 * Copyright (c) 2003 The ffmpeg Project | |
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 | 8 * modify it under the terms of the GNU Lesser General Public |
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 | 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 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
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 | 20 */ |
21 | |
22 /** | |
5969
178de7695c6c
Remove explicit filename from Doxygen @file commands.
diego
parents:
5910
diff
changeset
|
23 * @file |
315 | 24 * FLI/FLC file demuxer |
25 * by Mike Melanson (melanson@pcisys.net) | |
26 * for more information on the .fli/.flc file format and all of its many | |
27 * variations, visit: | |
28 * http://www.compuphase.com/flic.htm | |
29 * | |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
30 * This demuxer handles standard 0xAF11- and 0xAF12-type FLIs. It also handles |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
31 * special FLIs from the PC games "Magic Carpet" and "X-COM: Terror from the Deep". |
315 | 32 */ |
33 | |
4201
7d2f3f1b68d8
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
3583
diff
changeset
|
34 #include "libavutil/intreadwrite.h" |
315 | 35 #include "avformat.h" |
36 | |
37 #define FLIC_FILE_MAGIC_1 0xAF11 | |
38 #define FLIC_FILE_MAGIC_2 0xAF12 | |
885 | 39 #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
|
40 originated in Dave's Targa Animator (DTA) */ |
315 | 41 #define FLIC_CHUNK_MAGIC_1 0xF1FA |
42 #define FLIC_CHUNK_MAGIC_2 0xF5FA | |
2423 | 43 #define FLIC_MC_SPEED 5 /* speed for Magic Carpet game FLIs */ |
44 #define FLIC_DEFAULT_SPEED 5 /* for FLIs that have 0 speed */ | |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
45 #define FLIC_TFTD_CHUNK_AUDIO 0xAAAA /* Audio chunk. Used in Terror from the Deep. |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
46 Has 10 B extra header not accounted for in the chunk header */ |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
47 #define FLIC_TFTD_SAMPLE_RATE 22050 |
315 | 48 |
49 #define FLIC_HEADER_SIZE 128 | |
50 #define FLIC_PREAMBLE_SIZE 6 | |
51 | |
52 typedef struct FlicDemuxContext { | |
53 int video_stream_index; | |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
54 int audio_stream_index; |
2423 | 55 int frame_number; |
315 | 56 } FlicDemuxContext; |
57 | |
58 static int flic_probe(AVProbeData *p) | |
59 { | |
60 int magic_number; | |
61 | |
3583 | 62 if(p->buf_size < FLIC_HEADER_SIZE) |
63 return 0; | |
64 | |
1673 | 65 magic_number = AV_RL16(&p->buf[4]); |
315 | 66 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
|
67 (magic_number != FLIC_FILE_MAGIC_2) && |
00a3ba030166
support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents:
820
diff
changeset
|
68 (magic_number != FLIC_FILE_MAGIC_3)) |
315 | 69 return 0; |
70 | |
3583 | 71 if(AV_RL16(&p->buf[0x10]) != FLIC_CHUNK_MAGIC_1){ |
72 if(AV_RL32(&p->buf[0x10]) > 2000) | |
73 return 0; | |
74 } | |
75 | |
76 if( AV_RL16(&p->buf[0x08]) > 4096 | |
77 || AV_RL16(&p->buf[0x0A]) > 4096) | |
78 return 0; | |
79 | |
80 | |
315 | 81 return AVPROBE_SCORE_MAX; |
82 } | |
83 | |
84 static int flic_read_header(AVFormatContext *s, | |
85 AVFormatParameters *ap) | |
86 { | |
2006 | 87 FlicDemuxContext *flic = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2423
diff
changeset
|
88 ByteIOContext *pb = s->pb; |
315 | 89 unsigned char header[FLIC_HEADER_SIZE]; |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
90 AVStream *st, *ast; |
315 | 91 int speed; |
92 int magic_number; | |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
93 unsigned char preamble[FLIC_PREAMBLE_SIZE]; |
315 | 94 |
2423 | 95 flic->frame_number = 0; |
315 | 96 |
97 /* load the whole header and pull out the width and height */ | |
98 if (get_buffer(pb, header, FLIC_HEADER_SIZE) != FLIC_HEADER_SIZE) | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
99 return AVERROR(EIO); |
315 | 100 |
1673 | 101 magic_number = AV_RL16(&header[4]); |
102 speed = AV_RL32(&header[0x10]); | |
2423 | 103 if (speed == 0) |
104 speed = FLIC_DEFAULT_SPEED; | |
315 | 105 |
106 /* initialize the decoder streams */ | |
107 st = av_new_stream(s, 0); | |
108 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2006
diff
changeset
|
109 return AVERROR(ENOMEM); |
315 | 110 flic->video_stream_index = st->index; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
4331
diff
changeset
|
111 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
112 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
|
113 st->codec->codec_tag = 0; /* no fourcc */ |
1673 | 114 st->codec->width = AV_RL16(&header[0x08]); |
115 st->codec->height = AV_RL16(&header[0x0A]); | |
315 | 116 |
2385
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
117 if (!st->codec->width || !st->codec->height) { |
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
118 /* Ugly hack needed for the following sample: */ |
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
119 /* http://samples.mplayerhq.hu/fli-flc/fli-bugs/specular.flc */ |
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
120 av_log(s, AV_LOG_WARNING, |
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
121 "File with no specified width/height. Trying 640x480.\n"); |
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
122 st->codec->width = 640; |
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
123 st->codec->height = 480; |
8a7b2fac0a98
Try size 640x480 for FLC files which don't specify their size.
aurel
parents:
2274
diff
changeset
|
124 } |
315 | 125 |
126 /* 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
|
127 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
|
128 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
|
129 memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE); |
315 | 130 |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
131 /* peek at the preamble to detect TFTD videos - they seem to always start with an audio chunk */ |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
132 if (get_buffer(pb, preamble, FLIC_PREAMBLE_SIZE) != FLIC_PREAMBLE_SIZE) { |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
133 av_log(s, AV_LOG_ERROR, "Failed to peek at preamble\n"); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
134 return AVERROR(EIO); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
135 } |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
136 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
137 url_fseek(pb, -FLIC_PREAMBLE_SIZE, SEEK_CUR); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
138 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
139 /* Time to figure out the framerate: |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
140 * If the first preamble's magic number is 0xAAAA then this file is from |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
141 * X-COM: Terror from the Deep. If on the other hand there is a FLIC chunk |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
142 * magic number at offset 0x10 assume this file is from Magic Carpet instead. |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
143 * If neither of the above is true then this is a normal FLIC file. |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
144 */ |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
145 if (AV_RL16(&preamble[4]) == FLIC_TFTD_CHUNK_AUDIO) { |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
146 /* TFTD videos have an extra 22050 Hz 8-bit mono audio stream */ |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
147 ast = av_new_stream(s, 1); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
148 if (!ast) |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
149 return AVERROR(ENOMEM); |
315 | 150 |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
151 flic->audio_stream_index = ast->index; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
152 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
153 /* all audio frames are the same size, so use the size of the first chunk for block_align */ |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
154 ast->codec->block_align = AV_RL32(&preamble[0]); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
155 ast->codec->codec_type = CODEC_TYPE_AUDIO; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
156 ast->codec->codec_id = CODEC_ID_PCM_U8; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
157 ast->codec->codec_tag = 0; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
158 ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
159 ast->codec->channels = 1; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
160 ast->codec->sample_fmt = SAMPLE_FMT_U8; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
161 ast->codec->bit_rate = st->codec->sample_rate * 8; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
162 ast->codec->bits_per_coded_sample = 8; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
163 ast->codec->channel_layout = CH_LAYOUT_MONO; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
164 ast->codec->extradata_size = 0; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
165 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
166 /* Since the header information is incorrect we have to figure out the |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
167 * framerate using block_align and the fact that the audio is 22050 Hz. |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
168 * We usually have two cases: 2205 -> 10 fps and 1470 -> 15 fps */ |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
169 av_set_pts_info(st, 64, ast->codec->block_align, FLIC_TFTD_SAMPLE_RATE); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
170 av_set_pts_info(ast, 64, 1, FLIC_TFTD_SAMPLE_RATE); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
171 } else if (AV_RL16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) { |
2423 | 172 av_set_pts_info(st, 64, FLIC_MC_SPEED, 70); |
315 | 173 |
174 /* rewind the stream since the first chunk is at offset 12 */ | |
175 url_fseek(pb, 12, SEEK_SET); | |
176 | |
177 /* 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
|
178 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
|
179 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
|
180 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
|
181 memcpy(st->codec->extradata, header, 12); |
315 | 182 |
183 } else if (magic_number == FLIC_FILE_MAGIC_1) { | |
2423 | 184 av_set_pts_info(st, 64, speed, 70); |
864
00a3ba030166
support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents:
820
diff
changeset
|
185 } 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
|
186 (magic_number == FLIC_FILE_MAGIC_3)) { |
2423 | 187 av_set_pts_info(st, 64, speed, 1000); |
1801 | 188 } else { |
189 av_log(s, AV_LOG_INFO, "Invalid or unsupported magic chunk in file\n"); | |
315 | 190 return AVERROR_INVALIDDATA; |
1801 | 191 } |
315 | 192 |
193 return 0; | |
194 } | |
195 | |
196 static int flic_read_packet(AVFormatContext *s, | |
197 AVPacket *pkt) | |
198 { | |
2006 | 199 FlicDemuxContext *flic = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2423
diff
changeset
|
200 ByteIOContext *pb = s->pb; |
315 | 201 int packet_read = 0; |
202 unsigned int size; | |
203 int magic; | |
204 int ret = 0; | |
205 unsigned char preamble[FLIC_PREAMBLE_SIZE]; | |
206 | |
207 while (!packet_read) { | |
208 | |
209 if ((ret = get_buffer(pb, preamble, FLIC_PREAMBLE_SIZE)) != | |
210 FLIC_PREAMBLE_SIZE) { | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
211 ret = AVERROR(EIO); |
315 | 212 break; |
213 } | |
214 | |
1673 | 215 size = AV_RL32(&preamble[0]); |
216 magic = AV_RL16(&preamble[4]); | |
315 | 217 |
643 | 218 if (((magic == FLIC_CHUNK_MAGIC_1) || (magic == FLIC_CHUNK_MAGIC_2)) && size > FLIC_PREAMBLE_SIZE) { |
315 | 219 if (av_new_packet(pkt, size)) { |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
220 ret = AVERROR(EIO); |
315 | 221 break; |
222 } | |
223 pkt->stream_index = flic->video_stream_index; | |
2423 | 224 pkt->pts = flic->frame_number++; |
885 | 225 pkt->pos = url_ftell(pb); |
315 | 226 memcpy(pkt->data, preamble, FLIC_PREAMBLE_SIZE); |
885 | 227 ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE, |
315 | 228 size - FLIC_PREAMBLE_SIZE); |
229 if (ret != size - FLIC_PREAMBLE_SIZE) { | |
230 av_free_packet(pkt); | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
231 ret = AVERROR(EIO); |
315 | 232 } |
233 packet_read = 1; | |
5979
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
234 } else if (magic == FLIC_TFTD_CHUNK_AUDIO) { |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
235 if (av_new_packet(pkt, size)) { |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
236 ret = AVERROR(EIO); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
237 break; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
238 } |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
239 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
240 /* skip useless 10B sub-header (yes, it's not accounted for in the chunk header) */ |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
241 url_fseek(pb, 10, SEEK_CUR); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
242 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
243 pkt->stream_index = flic->audio_stream_index; |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
244 pkt->pos = url_ftell(pb); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
245 ret = get_buffer(pb, pkt->data, size); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
246 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
247 if (ret != size) { |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
248 av_free_packet(pkt); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
249 ret = AVERROR(EIO); |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
250 } |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
251 |
6ac06c16fb75
Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
thardin
parents:
5969
diff
changeset
|
252 packet_read = 1; |
315 | 253 } else { |
254 /* not interested in this chunk */ | |
255 url_fseek(pb, size - 6, SEEK_CUR); | |
256 } | |
257 } | |
258 | |
259 return ret; | |
260 } | |
261 | |
1169 | 262 AVInputFormat flic_demuxer = { |
315 | 263 "flic", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
2771
diff
changeset
|
264 NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"), |
315 | 265 sizeof(FlicDemuxContext), |
266 flic_probe, | |
267 flic_read_header, | |
268 flic_read_packet, | |
269 }; |