diff options
Diffstat (limited to 'libavcodec/pcm.c')
| -rw-r--r-- | libavcodec/pcm.c | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index d040745..5191048 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -2,20 +2,20 @@ * PCM codecs * Copyright (c) 2001 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -96,10 +96,8 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, n = frame->nb_samples * avctx->channels; samples = (const short *)frame->data[0]; - if ((ret = ff_alloc_packet(avpkt, n * sample_size))) { - av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); + if ((ret = ff_alloc_packet2(avctx, avpkt, n * sample_size))) return ret; - } dst = avpkt->data; switch(avctx->codec->id) { @@ -271,7 +269,9 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, if (CODEC_ID_PCM_DVD == avctx->codec_id) { if (avctx->bits_per_coded_sample != 20 && avctx->bits_per_coded_sample != 24) { - av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n"); + av_log(avctx, AV_LOG_ERROR, + "PCM DVD unsupported sample depth %i\n", + avctx->bits_per_coded_sample); return AVERROR(EINVAL); } /* 2 samples are interleaved per block in PCM_DVD */ @@ -338,15 +338,15 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, break; case CODEC_ID_PCM_S16LE_PLANAR: { - const uint8_t *src2[MAX_CHANNELS]; + int i; 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++) { - AV_WN16A(samples, bytestream_get_le16(&src2[c])); + for(c=0;c<avctx->channels;c++) { + samples = s->frame.data[c]; + for(i=n;i>0;i--) { + AV_WN16A(samples, bytestream_get_le16(&src)); samples += 2; } + } break; } case CODEC_ID_PCM_U16LE: @@ -443,21 +443,18 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, case CODEC_ID_PCM_LXF: { int i; - const uint8_t *src8; - dst_int32_t = (int32_t *)s->frame.data[0]; n /= avctx->channels; - //unpack and de-planerize - for (i = 0; i < n; i++) { - for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) { + //unpack + for (c = 0; c < avctx->channels; c++) { + dst_int32_t = (int32_t *)s->frame.data[c]; + for (i = 0; i < n; i++) { //extract low 20 bits and expand to 32 bits - *dst_int32_t++ = (src8[2] << 28) | (src8[1] << 20) | (src8[0] << 12) | - ((src8[2] & 0xF) << 8) | src8[1]; - } - - for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) { + *dst_int32_t++ = (src[2] << 28) | (src[1] << 20) | (src[0] << 12) | + ((src[2] & 0xF) << 8) | src[1]; //extract high 20 bits and expand to 32 bits - *dst_int32_t++ = (src8[4] << 24) | (src8[3] << 16) | - ((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4); + *dst_int32_t++ = (src[4] << 24) | (src[3] << 16) | + ((src[2] & 0xF0) << 8) | (src[4] << 4) | (src[3] >> 4); + src += 5; } } break; @@ -510,18 +507,18 @@ AVCodec ff_ ## name_ ## _decoder = { \ PCM_ENCODER(id,sample_fmt_,name,long_name_); PCM_DECODER(id,sample_fmt_,name,long_name_) /* Note: Do not forget to add new entries to the Makefile as well. */ -PCM_CODEC (CODEC_ID_PCM_ALAW, AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law"); +PCM_CODEC (CODEC_ID_PCM_ALAW, AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law / G.711 A-law"); PCM_DECODER(CODEC_ID_PCM_DVD, AV_SAMPLE_FMT_S32, pcm_dvd, "PCM signed 20|24-bit big-endian"); PCM_CODEC (CODEC_ID_PCM_F32BE, AV_SAMPLE_FMT_FLT, pcm_f32be, "PCM 32-bit floating point big-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_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_CODEC (CODEC_ID_PCM_MULAW, AV_SAMPLE_FMT_S16, pcm_mulaw, "PCM mu-law"); +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_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_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_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"); |
