annotate iff.c @ 5984:55c714a8fb00 libavformat

Make the IFF demuxer a little more standards-compliant, e.g. respect the size fields of common media header chunks (these can have different sizes depending on the type of IFF file you read), better handle odd sizes (like RIFF, every field is padded to word) and handle headerchunks after the BODY chunk. Patch by Sebastian Vater <cdgs.basty googlemail com>.
author rbultje
date Tue, 27 Apr 2010 14:03:47 +0000
parents 43548500ffbc
children 35c3858d457f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
1 /*
3198
814a32de9ec7 minor typo fixes
diego
parents: 3189
diff changeset
2 * IFF (.iff) file demuxer
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
3 * Copyright (c) 2008 Jaikrishnan Menon <realityman@gmx.net>
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
4 * Copyright (c) 2010 Peter Ross <pross@xvid.org>
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
5 * Copyright (c) 2010 Sebastian Vater <cdgs.basty@googlemail.com>
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
6 *
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
7 * This file is part of FFmpeg.
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
8 *
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
9 * FFmpeg is free software; you can redistribute it and/or
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
10 * modify it under the terms of the GNU Lesser General Public
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
11 * License as published by the Free Software Foundation; either
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
12 * version 2.1 of the License, or (at your option) any later version.
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
13 *
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
14 * FFmpeg is distributed in the hope that it will be useful,
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
17 * Lesser General Public License for more details.
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
18 *
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
19 * You should have received a copy of the GNU Lesser General Public
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
20 * License along with FFmpeg; if not, write to the Free Software
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
22 */
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
23
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
24 /**
5969
178de7695c6c Remove explicit filename from Doxygen @file commands.
diego
parents: 5913
diff changeset
25 * @file
3198
814a32de9ec7 minor typo fixes
diego
parents: 3189
diff changeset
26 * IFF file demuxer
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
27 * by Jaikrishnan Menon
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
28 * for more information on the .iff file format, visit:
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
29 * http://wiki.multimedia.cx/index.php?title=IFF
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
30 */
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
31
4201
7d2f3f1b68d8 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents: 4090
diff changeset
32 #include "libavutil/intreadwrite.h"
5773
fd3b7b9b63a8 IFF: move ff_cmap_read_palette() prototype to a header file
mru
parents: 5660
diff changeset
33 #include "libavcodec/iff.h"
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
34 #include "avformat.h"
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
35
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
36 #define ID_8SVX MKTAG('8','S','V','X')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
37 #define ID_VHDR MKTAG('V','H','D','R')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
38 #define ID_ATAK MKTAG('A','T','A','K')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
39 #define ID_RLSE MKTAG('R','L','S','E')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
40 #define ID_CHAN MKTAG('C','H','A','N')
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
41 #define ID_PBM MKTAG('P','B','M',' ')
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
42 #define ID_ILBM MKTAG('I','L','B','M')
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
43 #define ID_BMHD MKTAG('B','M','H','D')
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
44 #define ID_CMAP MKTAG('C','M','A','P')
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
45
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
46 #define ID_FORM MKTAG('F','O','R','M')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
47 #define ID_ANNO MKTAG('A','N','N','O')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
48 #define ID_AUTH MKTAG('A','U','T','H')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
49 #define ID_CHRS MKTAG('C','H','R','S')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
50 #define ID_COPYRIGHT MKTAG('(','c',')',' ')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
51 #define ID_CSET MKTAG('C','S','E','T')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
52 #define ID_FVER MKTAG('F','V','E','R')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
53 #define ID_NAME MKTAG('N','A','M','E')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
54 #define ID_TEXT MKTAG('T','E','X','T')
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
55 #define ID_BODY MKTAG('B','O','D','Y')
5660
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
56 #define ID_ANNO MKTAG('A','N','N','O')
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
57
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
58 #define LEFT 2
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
59 #define RIGHT 4
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
60 #define STEREO 6
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
61
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
62 #define PACKET_SIZE 1024
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
63
5971
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
64 typedef enum {
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
65 COMP_NONE,
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
66 COMP_FIB,
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
67 COMP_EXP
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
68 } svx8_compression_type;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
69
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
70 typedef enum {
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
71 BITMAP_RAW,
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
72 BITMAP_BYTERUN1
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
73 } bitmap_compression_type;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
74
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
75 typedef struct {
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
76 uint64_t body_pos;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
77 uint32_t body_size;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
78 uint32_t sent_bytes;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
79 uint32_t audio_frame_count;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
80 } IffDemuxContext;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
81
3285
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
82
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
83 static void interleave_stereo(const uint8_t *src, uint8_t *dest, int size)
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
84 {
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
85 uint8_t *end = dest + size;
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
86 size = size>>1;
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
87
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
88 while(dest < end) {
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
89 *dest++ = *src;
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
90 *dest++ = *(src+size);
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
91 src++;
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
92 }
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
93 }
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
94
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
95 static int iff_probe(AVProbeData *p)
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
96 {
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
97 const uint8_t *d = p->buf;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
98
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
99 if ( AV_RL32(d) == ID_FORM &&
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
100 (AV_RL32(d+8) == ID_8SVX || AV_RL32(d+8) == ID_PBM || AV_RL32(d+8) == ID_ILBM) )
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
101 return AVPROBE_SCORE_MAX;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
102 return 0;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
103 }
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
104
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
105 static int iff_read_header(AVFormatContext *s,
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
106 AVFormatParameters *ap)
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
107 {
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
108 IffDemuxContext *iff = s->priv_data;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
109 ByteIOContext *pb = s->pb;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
110 AVStream *st;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
111 uint32_t chunk_id, data_size;
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
112 int compression = -1;
5660
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
113 char *buf;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
114
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
115 st = av_new_stream(s, 0);
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
116 if (!st)
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
117 return AVERROR(ENOMEM);
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
118
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
119 st->codec->channels = 1;
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
120 url_fskip(pb, 8);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
121 // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
122 st->codec->codec_tag = get_le32(pb);
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
123
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
124 while(!url_feof(pb)) {
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
125 uint64_t orig_pos;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
126 chunk_id = get_le32(pb);
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
127 data_size = get_be32(pb);
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
128 orig_pos = url_ftell(pb);
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
129
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
130 switch(chunk_id) {
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
131 case ID_VHDR:
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5773
diff changeset
132 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
133
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
134 if (data_size < 14)
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
135 return AVERROR_INVALIDDATA;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
136 url_fskip(pb, 12);
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
137 st->codec->sample_rate = get_be16(pb);
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
138 if (data_size >= 16) {
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
139 url_fskip(pb, 1);
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
140 compression = get_byte(pb);
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
141 }
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
142 break;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
143
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
144 case ID_BODY:
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
145 iff->body_pos = url_ftell(pb);
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
146 iff->body_size = data_size;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
147 break;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
148
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
149 case ID_CHAN:
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
150 if (data_size < 4)
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
151 return AVERROR_INVALIDDATA;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
152 st->codec->channels = (get_be32(pb) < 6) ? 1 : 2;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
153 break;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
154
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
155 case ID_CMAP:
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
156 st->codec->extradata_size = data_size;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
157 st->codec->extradata = av_malloc(data_size);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
158 if (!st->codec->extradata)
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
159 return AVERROR(ENOMEM);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
160 if (get_buffer(pb, st->codec->extradata, data_size) < 0)
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
161 return AVERROR(EIO);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
162 break;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
163
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
164 case ID_BMHD:
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5773
diff changeset
165 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
166 if (data_size <= 8)
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
167 return AVERROR_INVALIDDATA;
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
168 st->codec->width = get_be16(pb);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
169 st->codec->height = get_be16(pb);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
170 url_fskip(pb, 4); // x, y offset
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
171 st->codec->bits_per_coded_sample = get_byte(pb);
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
172 if (data_size >= 11) {
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
173 url_fskip(pb, 1); // masking
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
174 compression = get_byte(pb);
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
175 }
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
176 if (data_size >= 16) {
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
177 url_fskip(pb, 3); // paddding, transparent
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
178 st->sample_aspect_ratio.num = get_byte(pb);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
179 st->sample_aspect_ratio.den = get_byte(pb);
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
180 }
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
181 break;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
182
5660
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
183 case ID_ANNO:
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
184 buf = av_malloc(data_size + 1);
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
185 if (!buf)
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
186 break;
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
187 get_buffer(pb, buf, data_size);
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
188 buf[data_size] = 0;
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
189 av_metadata_set2(&s->metadata, "comment", buf, AV_METADATA_DONT_STRDUP_VAL);
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
190 break;
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
191 }
5660
1701ad9b6064 Support IFF ANNO (annotation) chunk type
pross
parents: 5626
diff changeset
192
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
193 url_fskip(pb, data_size - (url_ftell(pb) - orig_pos) + (data_size & 1));
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
194 }
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
195
5984
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
196 url_fseek(pb, iff->body_pos, SEEK_SET);
55c714a8fb00 Make the IFF demuxer a little more standards-compliant, e.g. respect the size
rbultje
parents: 5971
diff changeset
197
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
198 switch(st->codec->codec_type) {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5773
diff changeset
199 case AVMEDIA_TYPE_AUDIO:
5971
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
200 av_set_pts_info(st, 32, 1, st->codec->sample_rate);
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
201
5971
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
202 switch(compression) {
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
203 case COMP_NONE:
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
204 st->codec->codec_id = CODEC_ID_PCM_S8;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
205 break;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
206 case COMP_FIB:
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
207 st->codec->codec_id = CODEC_ID_8SVX_FIB;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
208 break;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
209 case COMP_EXP:
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
210 st->codec->codec_id = CODEC_ID_8SVX_EXP;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
211 break;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
212 default:
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
213 av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n");
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
214 return -1;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
215 }
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
216
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
217 st->codec->bits_per_coded_sample = 8;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
218 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample;
43548500ffbc Reindent / reformat some code with broken indenting.
rbultje
parents: 5969
diff changeset
219 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
220 break;
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
221
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5773
diff changeset
222 case AVMEDIA_TYPE_VIDEO:
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
223 switch (compression) {
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
224 case BITMAP_RAW:
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
225 if (st->codec->codec_tag == ID_ILBM) {
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
226 st->codec->codec_id = CODEC_ID_IFF_ILBM;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
227 } else {
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
228 st->codec->codec_id = CODEC_ID_RAWVIDEO;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
229 st->codec->pix_fmt = PIX_FMT_PAL8;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
230 st->codec->codec_tag = 0;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
231 }
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
232 break;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
233 case BITMAP_BYTERUN1:
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
234 st->codec->codec_id = CODEC_ID_IFF_BYTERUN1;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
235 break;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
236 default:
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
237 av_log(s, AV_LOG_ERROR, "unknown compression method\n");
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
238 return AVERROR_INVALIDDATA;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
239 }
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
240 break;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
241 default:
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
242 return -1;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
243 }
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
244
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
245 return 0;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
246 }
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
247
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
248 static int iff_read_packet(AVFormatContext *s,
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
249 AVPacket *pkt)
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
250 {
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
251 IffDemuxContext *iff = s->priv_data;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
252 ByteIOContext *pb = s->pb;
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
253 AVStream *st = s->streams[0];
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
254 int ret;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
255
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
256 if(iff->sent_bytes >= iff->body_size)
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
257 return AVERROR(EIO);
3285
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
258
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
259 if(s->streams[0]->codec->channels == 2) {
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
260 uint8_t sample_buffer[PACKET_SIZE];
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
261
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
262 ret = get_buffer(pb, sample_buffer, PACKET_SIZE);
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
263 if(av_new_packet(pkt, PACKET_SIZE) < 0) {
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
264 av_log(s, AV_LOG_ERROR, "iff: cannot allocate packet \n");
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
265 return AVERROR(ENOMEM);
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
266 }
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
267 interleave_stereo(sample_buffer, pkt->data, PACKET_SIZE);
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
268 } else if (s->streams[0]->codec->codec_id == CODEC_ID_RAWVIDEO) {
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
269 if(av_new_packet(pkt, iff->body_size + AVPALETTE_SIZE) < 0) {
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
270 return AVERROR(ENOMEM);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
271 }
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
272
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
273 ret = ff_cmap_read_palette(st->codec, (uint32_t*)(pkt->data + iff->body_size));
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
274 if (ret < 0)
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
275 return ret;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
276 av_freep(&st->codec->extradata);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
277 st->codec->extradata_size = 0;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
278
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
279 ret = get_buffer(pb, pkt->data, iff->body_size);
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5773
diff changeset
280 } else if (s->streams[0]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
281 ret = av_get_packet(pb, pkt, iff->body_size);
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
282 } else {
3285
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
283 ret = av_get_packet(pb, pkt, PACKET_SIZE);
ccfd981fe0fa IFF stereo support
superdump
parents: 3200
diff changeset
284 }
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
285
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
286 if(iff->sent_bytes == 0)
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
287 pkt->flags |= AV_PKT_FLAG_KEY;
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
288
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5773
diff changeset
289 if(s->streams[0]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
5626
b3d4ef7e53ad Indentation cleanup
pross
parents: 5625
diff changeset
290 iff->sent_bytes += PACKET_SIZE;
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
291 } else {
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
292 iff->sent_bytes = iff->body_size;
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
293 }
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
294 pkt->stream_index = 0;
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5773
diff changeset
295 if(s->streams[0]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
5626
b3d4ef7e53ad Indentation cleanup
pross
parents: 5625
diff changeset
296 pkt->pts = iff->audio_frame_count;
b3d4ef7e53ad Indentation cleanup
pross
parents: 5625
diff changeset
297 iff->audio_frame_count += ret / s->streams[0]->codec->channels;
5625
c76c1e0c50a5 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
pross
parents: 4331
diff changeset
298 }
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
299 return ret;
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
300 }
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
301
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
302 AVInputFormat iff_demuxer = {
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
303 "IFF",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3285
diff changeset
304 NULL_IF_CONFIG_SMALL("IFF format"),
3189
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
305 sizeof(IffDemuxContext),
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
306 iff_probe,
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
307 iff_read_header,
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
308 iff_read_packet,
f016d69a28b6 IFF demuxer
vitor
parents:
diff changeset
309 };