virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

pcm: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Aneesh Dogra 2012-03-30 21:03:02 +05:30 committed by Diego Biurrun
parent 835a893bcb
commit 6d21f49879
1 changed files with 136 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/pcm.c
View File

@ -24,8 +24,8 @@
* PCM codecs * PCM codecs
*/ */
#include "avcodec.h"
#include "libavutil/common.h" /* for av_reverse */ #include "libavutil/common.h" /* for av_reverse */
#include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "internal.h" #include "internal.h"
#include "pcm_tablegen.h" #include "pcm_tablegen.h"
@ -356,9 +356,8 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
DECODE(16, be16, src, samples, n, 0, 0x8000) DECODE(16, be16, src, samples, n, 0, 0x8000)
break; break;
case CODEC_ID_PCM_S8: case CODEC_ID_PCM_S8:
for(;n>0;n--) { for (; n > 0; n--)
*samples++ = *src++ + 128; *samples++ = *src++ + 128;
}
break; break;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
case CODEC_ID_PCM_F64LE: case CODEC_ID_PCM_F64LE:
@ -446,18 +445,23 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
const uint8_t *src8; const uint8_t *src8;
dst_int32_t = (int32_t *)s->frame.data[0]; dst_int32_t = (int32_t *)s->frame.data[0];
n /= avctx->channels; n /= avctx->channels;
//unpack and de-planerize // unpack and de-planarize
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) { 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++ = (src8[2] << 28) |
((src8[2] & 0xF) << 8) | src8[1]; (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) { 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++ = (src8[4] << 24) |
((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4); (src8[3] << 16) |
((src8[2] & 0xF0) << 8) |
(src8[4] << 4) |
(src8[3] >> 4);
} }
} }
break; break;
@ -482,7 +486,8 @@ AVCodec ff_ ## name_ ## _encoder = { \
.encode2 = pcm_encode_frame, \ .encode2 = pcm_encode_frame, \
.close = pcm_encode_close, \ .close = pcm_encode_close, \
.capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \ .capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \
.sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \
AV_SAMPLE_FMT_NONE }, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
} }
#else #else
@ -499,7 +504,8 @@ AVCodec ff_ ## name_ ## _decoder = { \
.init = pcm_decode_init, \ .init = pcm_decode_init, \
.decode = pcm_decode_frame, \ .decode = pcm_decode_frame, \
.capabilities = CODEC_CAP_DR1, \ .capabilities = CODEC_CAP_DR1, \
.sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \
AV_SAMPLE_FMT_NONE }, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
} }
#else #else
@ -507,7 +513,8 @@ AVCodec ff_ ## name_ ## _decoder = { \
#endif #endif
#define PCM_CODEC(id, sample_fmt_, name, long_name_) \ #define PCM_CODEC(id, sample_fmt_, name, long_name_) \
PCM_ENCODER(id,sample_fmt_,name,long_name_); PCM_DECODER(id,sample_fmt_,name,long_name_) 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. */ /* 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");