virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

pcm: leave sample format conversion to libswresample

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Paul B Mahol 2012-03-17 03:05:12 +00:00 committed by Michael Niedermayer
parent 8a91da9575
commit 32a5775a91
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavcodec/pcm.c
View File

@ -340,15 +340,15 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
break; break;
case CODEC_ID_PCM_S16LE_PLANAR: case CODEC_ID_PCM_S16LE_PLANAR:
{ {
const uint8_t *src2[MAX_CHANNELS]; int i;
n /= avctx->channels; n /= avctx->channels;
for(c=0;c<avctx->channels;c++)
src2[c] = &src[c*n*2];
for(;n>0;n--)
for(c=0;c<avctx->channels;c++) { for(c=0;c<avctx->channels;c++) {
AV_WN16A(samples, bytestream_get_le16(&src2[c])); samples = s->frame.data[c];
for(i=n;i>0;i--) {
AV_WN16A(samples, bytestream_get_le16(&src));
samples += 2; samples += 2;
} }
}
break; break;
} }
case CODEC_ID_PCM_U16LE: case CODEC_ID_PCM_U16LE:
@ -445,21 +445,18 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
case CODEC_ID_PCM_LXF: case CODEC_ID_PCM_LXF:
{ {
int i; int i;
const uint8_t *src8;
dst_int32_t = (int32_t *)s->frame.data[0];
n /= avctx->channels; n /= avctx->channels;
//unpack and de-planerize //unpack
for (c = 0; c < avctx->channels; c++) {
dst_int32_t = (int32_t *)s->frame.data[c];
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) {
//extract low 20 bits and expand to 32 bits //extract low 20 bits and expand to 32 bits
*dst_int32_t++ = (src8[2] << 28) | (src8[1] << 20) | (src8[0] << 12) | *dst_int32_t++ = (src[2] << 28) | (src[1] << 20) | (src[0] << 12) |
((src8[2] & 0xF) << 8) | src8[1]; ((src[2] & 0xF) << 8) | src[1];
}
for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) {
//extract high 20 bits and expand to 32 bits //extract high 20 bits and expand to 32 bits
*dst_int32_t++ = (src8[4] << 24) | (src8[3] << 16) | *dst_int32_t++ = (src[4] << 24) | (src[3] << 16) |
((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4); ((src[2] & 0xF0) << 8) | (src[4] << 4) | (src[3] >> 4);
src += 5;
} }
} }
break; break;
@ -518,12 +515,12 @@ PCM_CODEC (CODEC_ID_PCM_F32BE, AV_SAMPLE_FMT_FLT, pcm_f32be, "PCM 32-bit floati
PCM_CODEC (CODEC_ID_PCM_F32LE, AV_SAMPLE_FMT_FLT, pcm_f32le, "PCM 32-bit floating point little-endian"); PCM_CODEC (CODEC_ID_PCM_F32LE, AV_SAMPLE_FMT_FLT, pcm_f32le, "PCM 32-bit floating point little-endian");
PCM_CODEC (CODEC_ID_PCM_F64BE, AV_SAMPLE_FMT_DBL, pcm_f64be, "PCM 64-bit floating point big-endian"); PCM_CODEC (CODEC_ID_PCM_F64BE, AV_SAMPLE_FMT_DBL, pcm_f64be, "PCM 64-bit floating point big-endian");
PCM_CODEC (CODEC_ID_PCM_F64LE, AV_SAMPLE_FMT_DBL, pcm_f64le, "PCM 64-bit floating point little-endian"); PCM_CODEC (CODEC_ID_PCM_F64LE, AV_SAMPLE_FMT_DBL, pcm_f64le, "PCM 64-bit floating point little-endian");
PCM_DECODER(CODEC_ID_PCM_LXF, AV_SAMPLE_FMT_S32, pcm_lxf, "PCM signed 20-bit little-endian planar"); PCM_DECODER(CODEC_ID_PCM_LXF, AV_SAMPLE_FMT_S32P, pcm_lxf, "PCM signed 20-bit little-endian planar");
PCM_CODEC (CODEC_ID_PCM_MULAW, AV_SAMPLE_FMT_S16, pcm_mulaw, "PCM mu-law / G.711 mu-law"); PCM_CODEC (CODEC_ID_PCM_MULAW, AV_SAMPLE_FMT_S16, pcm_mulaw, "PCM mu-law / G.711 mu-law");
PCM_CODEC (CODEC_ID_PCM_S8, AV_SAMPLE_FMT_U8, pcm_s8, "PCM signed 8-bit"); PCM_CODEC (CODEC_ID_PCM_S8, AV_SAMPLE_FMT_U8, pcm_s8, "PCM signed 8-bit");
PCM_CODEC (CODEC_ID_PCM_S16BE, AV_SAMPLE_FMT_S16, pcm_s16be, "PCM signed 16-bit big-endian"); PCM_CODEC (CODEC_ID_PCM_S16BE, AV_SAMPLE_FMT_S16, pcm_s16be, "PCM signed 16-bit big-endian");
PCM_CODEC (CODEC_ID_PCM_S16LE, AV_SAMPLE_FMT_S16, pcm_s16le, "PCM signed 16-bit little-endian"); PCM_CODEC (CODEC_ID_PCM_S16LE, AV_SAMPLE_FMT_S16, pcm_s16le, "PCM signed 16-bit little-endian");
PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16, pcm_s16le_planar, "PCM 16-bit little-endian planar"); PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16P, pcm_s16le_planar, "PCM 16-bit little-endian planar");
PCM_CODEC (CODEC_ID_PCM_S24BE, AV_SAMPLE_FMT_S32, pcm_s24be, "PCM signed 24-bit big-endian"); PCM_CODEC (CODEC_ID_PCM_S24BE, AV_SAMPLE_FMT_S32, pcm_s24be, "PCM signed 24-bit big-endian");
PCM_CODEC (CODEC_ID_PCM_S24DAUD, AV_SAMPLE_FMT_S16, pcm_s24daud, "PCM D-Cinema audio signed 24-bit"); PCM_CODEC (CODEC_ID_PCM_S24DAUD, AV_SAMPLE_FMT_S16, pcm_s24daud, "PCM D-Cinema audio signed 24-bit");
PCM_CODEC (CODEC_ID_PCM_S24LE, AV_SAMPLE_FMT_S32, pcm_s24le, "PCM signed 24-bit little-endian"); PCM_CODEC (CODEC_ID_PCM_S24LE, AV_SAMPLE_FMT_S32, pcm_s24le, "PCM signed 24-bit little-endian");