Mercurial > libavcodec.hg
comparison dpcm.c @ 4364:05e932ddaaa9 libavcodec
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
| author | alex |
|---|---|
| date | Fri, 19 Jan 2007 22:12:59 +0000 |
| parents | c8c591fe26f8 |
| children | c2ab2ac31edb |
comparison
equal
deleted
inserted
replaced
| 4363:9b7662fa4905 | 4364:05e932ddaaa9 |
|---|---|
| 177 | 177 |
| 178 switch(avctx->codec->id) { | 178 switch(avctx->codec->id) { |
| 179 | 179 |
| 180 case CODEC_ID_ROQ_DPCM: | 180 case CODEC_ID_ROQ_DPCM: |
| 181 if (s->channels == 1) | 181 if (s->channels == 1) |
| 182 predictor[0] = LE_16(&buf[6]); | 182 predictor[0] = AV_RL16(&buf[6]); |
| 183 else { | 183 else { |
| 184 predictor[0] = buf[7] << 8; | 184 predictor[0] = buf[7] << 8; |
| 185 predictor[1] = buf[6] << 8; | 185 predictor[1] = buf[6] << 8; |
| 186 } | 186 } |
| 187 SE_16BIT(predictor[0]); | 187 SE_16BIT(predictor[0]); |
| 198 } | 198 } |
| 199 break; | 199 break; |
| 200 | 200 |
| 201 case CODEC_ID_INTERPLAY_DPCM: | 201 case CODEC_ID_INTERPLAY_DPCM: |
| 202 in = 6; /* skip over the stream mask and stream length */ | 202 in = 6; /* skip over the stream mask and stream length */ |
| 203 predictor[0] = LE_16(&buf[in]); | 203 predictor[0] = AV_RL16(&buf[in]); |
| 204 in += 2; | 204 in += 2; |
| 205 SE_16BIT(predictor[0]) | 205 SE_16BIT(predictor[0]) |
| 206 output_samples[out++] = predictor[0]; | 206 output_samples[out++] = predictor[0]; |
| 207 if (s->channels == 2) { | 207 if (s->channels == 2) { |
| 208 predictor[1] = LE_16(&buf[in]); | 208 predictor[1] = AV_RL16(&buf[in]); |
| 209 in += 2; | 209 in += 2; |
| 210 SE_16BIT(predictor[1]) | 210 SE_16BIT(predictor[1]) |
| 211 output_samples[out++] = predictor[1]; | 211 output_samples[out++] = predictor[1]; |
| 212 } | 212 } |
| 213 | 213 |
| 223 break; | 223 break; |
| 224 | 224 |
| 225 case CODEC_ID_XAN_DPCM: | 225 case CODEC_ID_XAN_DPCM: |
| 226 in = 0; | 226 in = 0; |
| 227 shift[0] = shift[1] = 4; | 227 shift[0] = shift[1] = 4; |
| 228 predictor[0] = LE_16(&buf[in]); | 228 predictor[0] = AV_RL16(&buf[in]); |
| 229 in += 2; | 229 in += 2; |
| 230 SE_16BIT(predictor[0]); | 230 SE_16BIT(predictor[0]); |
| 231 if (s->channels == 2) { | 231 if (s->channels == 2) { |
| 232 predictor[1] = LE_16(&buf[in]); | 232 predictor[1] = AV_RL16(&buf[in]); |
| 233 in += 2; | 233 in += 2; |
| 234 SE_16BIT(predictor[1]); | 234 SE_16BIT(predictor[1]); |
| 235 } | 235 } |
| 236 | 236 |
| 237 while (in < buf_size) { | 237 while (in < buf_size) { |