Mercurial > libavformat.hg

comparison iff.c @ 5971:43548500ffbc libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reindent / reformat some code with broken indenting. Patch by Sebastian Vater <cdgs DOT basty googlemail com>.
author rbultje
date Tue, 20 Apr 2010 18:40:45 +0000
parents 178de7695c6c
children 55c714a8fb00
comparison
equal deleted inserted replaced
5970:8bb6b2e62a62 5971:43548500ffbc
58 #define RIGHT 4 58 #define RIGHT 4
59 #define STEREO 6 59 #define STEREO 6
60 60
61 #define PACKET_SIZE 1024 61 #define PACKET_SIZE 1024
62 62
63 typedef enum {COMP_NONE, COMP_FIB, COMP_EXP} svx8_compression_type; 63 typedef enum {
64 typedef enum {BITMAP_RAW, BITMAP_BYTERUN1} bitmap_compression_type; 64 COMP_NONE,
65 COMP_FIB,
66 COMP_EXP
67 } svx8_compression_type;
68
69 typedef enum {
70 BITMAP_RAW,
71 BITMAP_BYTERUN1
72 } bitmap_compression_type;
65 73
66 typedef struct { 74 typedef struct {
67 uint32_t body_size; 75 uint32_t body_size;
68 uint32_t sent_bytes; 76 uint32_t sent_bytes;
69 uint32_t audio_frame_count; 77 uint32_t audio_frame_count;
174 } 182 }
175 } 183 }
176 184
177 switch(st->codec->codec_type) { 185 switch(st->codec->codec_type) {
178 case AVMEDIA_TYPE_AUDIO: 186 case AVMEDIA_TYPE_AUDIO:
179 av_set_pts_info(st, 32, 1, st->codec->sample_rate); 187 av_set_pts_info(st, 32, 1, st->codec->sample_rate);
180 188
181 switch(compression) { 189 switch(compression) {
182 case COMP_NONE: 190 case COMP_NONE:
183 st->codec->codec_id = CODEC_ID_PCM_S8; 191 st->codec->codec_id = CODEC_ID_PCM_S8;
192 break;
193 case COMP_FIB:
194 st->codec->codec_id = CODEC_ID_8SVX_FIB;
195 break;
196 case COMP_EXP:
197 st->codec->codec_id = CODEC_ID_8SVX_EXP;
198 break;
199 default:
200 av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n");
201 return -1;
202 }
203
204 st->codec->bits_per_coded_sample = 8;
205 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample;
206 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
184 break; 207 break;
185 case COMP_FIB:
186 st->codec->codec_id = CODEC_ID_8SVX_FIB;
187 break;
188 case COMP_EXP:
189 st->codec->codec_id = CODEC_ID_8SVX_EXP;
190 break;
191 default:
192 av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n");
193 return -1;
194 }
195
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;
198 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
199 break;
200 208
201 case AVMEDIA_TYPE_VIDEO: 209 case AVMEDIA_TYPE_VIDEO:
202 switch (compression) { 210 switch (compression) {
203 case BITMAP_RAW: 211 case BITMAP_RAW:
204 if (st->codec->codec_tag == ID_ILBM) { 212 if (st->codec->codec_tag == ID_ILBM) {