Mercurial > libavformat.hg

comparison iff.c @ 5910:536e5527c1e0 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.
author stefano
date Tue, 30 Mar 2010 23:30:55 +0000
parents fd3b7b9b63a8
children 11bb10c37225
comparison
equal deleted inserted replaced
5909:b8041f85c327 5910:536e5527c1e0
117 data_size = get_be32(pb); 117 data_size = get_be32(pb);
118 padding = data_size & 1; 118 padding = data_size & 1;
119 119
120 switch(chunk_id) { 120 switch(chunk_id) {
121 case ID_VHDR: 121 case ID_VHDR:
122 st->codec->codec_type = CODEC_TYPE_AUDIO; 122 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
123 url_fskip(pb, 12); 123 url_fskip(pb, 12);
124 st->codec->sample_rate = get_be16(pb); 124 st->codec->sample_rate = get_be16(pb);
125 url_fskip(pb, 1); 125 url_fskip(pb, 1);
126 compression = get_byte(pb); 126 compression = get_byte(pb);
127 url_fskip(pb, 4); 127 url_fskip(pb, 4);
144 if (get_buffer(pb, st->codec->extradata, data_size) < 0) 144 if (get_buffer(pb, st->codec->extradata, data_size) < 0)
145 return AVERROR(EIO); 145 return AVERROR(EIO);
146 break; 146 break;
147 147
148 case ID_BMHD: 148 case ID_BMHD:
149 st->codec->codec_type = CODEC_TYPE_VIDEO; 149 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
150 st->codec->width = get_be16(pb); 150 st->codec->width = get_be16(pb);
151 st->codec->height = get_be16(pb); 151 st->codec->height = get_be16(pb);
152 url_fskip(pb, 4); // x, y offset 152 url_fskip(pb, 4); // x, y offset
153 st->codec->bits_per_coded_sample = get_byte(pb); 153 st->codec->bits_per_coded_sample = get_byte(pb);
154 url_fskip(pb, 1); // masking 154 url_fskip(pb, 1); // masking
173 break; 173 break;
174 } 174 }
175 } 175 }
176 176
177 switch(st->codec->codec_type) { 177 switch(st->codec->codec_type) {
178 case CODEC_TYPE_AUDIO: 178 case AVMEDIA_TYPE_AUDIO:
179 av_set_pts_info(st, 32, 1, st->codec->sample_rate); 179 av_set_pts_info(st, 32, 1, st->codec->sample_rate);
180 180
181 switch(compression) { 181 switch(compression) {
182 case COMP_NONE: 182 case COMP_NONE:
183 st->codec->codec_id = CODEC_ID_PCM_S8; 183 st->codec->codec_id = CODEC_ID_PCM_S8;
196 st->codec->bits_per_coded_sample = 8; 196 st->codec->bits_per_coded_sample = 8;
197 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; 197 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample;
198 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; 198 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
199 break; 199 break;
200 200
201 case CODEC_TYPE_VIDEO: 201 case AVMEDIA_TYPE_VIDEO:
202 switch (compression) { 202 switch (compression) {
203 case BITMAP_RAW: 203 case BITMAP_RAW:
204 if (st->codec->codec_tag == ID_ILBM) { 204 if (st->codec->codec_tag == ID_ILBM) {
205 st->codec->codec_id = CODEC_ID_IFF_ILBM; 205 st->codec->codec_id = CODEC_ID_IFF_ILBM;
206 } else { 206 } else {
254 return ret; 254 return ret;
255 av_freep(&st->codec->extradata); 255 av_freep(&st->codec->extradata);
256 st->codec->extradata_size = 0; 256 st->codec->extradata_size = 0;
257 257
258 ret = get_buffer(pb, pkt->data, iff->body_size); 258 ret = get_buffer(pb, pkt->data, iff->body_size);
259 } else if (s->streams[0]->codec->codec_type == CODEC_TYPE_VIDEO) { 259 } else if (s->streams[0]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
260 ret = av_get_packet(pb, pkt, iff->body_size); 260 ret = av_get_packet(pb, pkt, iff->body_size);
261 } else { 261 } else {
262 ret = av_get_packet(pb, pkt, PACKET_SIZE); 262 ret = av_get_packet(pb, pkt, PACKET_SIZE);
263 } 263 }
264 264
265 if(iff->sent_bytes == 0) 265 if(iff->sent_bytes == 0)
266 pkt->flags |= PKT_FLAG_KEY; 266 pkt->flags |= PKT_FLAG_KEY;
267 267
268 if(s->streams[0]->codec->codec_type == CODEC_TYPE_AUDIO) { 268 if(s->streams[0]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
269 iff->sent_bytes += PACKET_SIZE; 269 iff->sent_bytes += PACKET_SIZE;
270 } else { 270 } else {
271 iff->sent_bytes = iff->body_size; 271 iff->sent_bytes = iff->body_size;
272 } 272 }
273 pkt->stream_index = 0; 273 pkt->stream_index = 0;
274 if(s->streams[0]->codec->codec_type == CODEC_TYPE_AUDIO) { 274 if(s->streams[0]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
275 pkt->pts = iff->audio_frame_count; 275 pkt->pts = iff->audio_frame_count;
276 iff->audio_frame_count += ret / s->streams[0]->codec->channels; 276 iff->audio_frame_count += ret / s->streams[0]->codec->channels;
277 } 277 }
278 return ret; 278 return ret;
279 } 279 }