mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
pcm: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
parent
835a893bcb
commit
6d21f49879
265
libavcodec/pcm.c
265
libavcodec/pcm.c
@ -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"
|
||||||
@ -35,7 +35,7 @@
|
|||||||
static av_cold int pcm_encode_init(AVCodecContext *avctx)
|
static av_cold int pcm_encode_init(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
avctx->frame_size = 0;
|
avctx->frame_size = 0;
|
||||||
switch(avctx->codec->id) {
|
switch (avctx->codec->id) {
|
||||||
case CODEC_ID_PCM_ALAW:
|
case CODEC_ID_PCM_ALAW:
|
||||||
pcm_alaw_tableinit();
|
pcm_alaw_tableinit();
|
||||||
break;
|
break;
|
||||||
@ -47,8 +47,8 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx)
|
|||||||
}
|
}
|
||||||
|
|
||||||
avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id);
|
avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id);
|
||||||
avctx->block_align = avctx->channels * avctx->bits_per_coded_sample/8;
|
avctx->block_align = avctx->channels * avctx->bits_per_coded_sample / 8;
|
||||||
avctx->coded_frame= avcodec_alloc_frame();
|
avctx->coded_frame = avcodec_alloc_frame();
|
||||||
if (!avctx->coded_frame)
|
if (!avctx->coded_frame)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
@ -64,19 +64,19 @@ static av_cold int pcm_encode_close(AVCodecContext *avctx)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Write PCM samples macro
|
* Write PCM samples macro
|
||||||
* @param type Datatype of native machine format
|
* @param type Datatype of native machine format
|
||||||
* @param endian bytestream_put_xxx() suffix
|
* @param endian bytestream_put_xxx() suffix
|
||||||
* @param src Source pointer (variable name)
|
* @param src Source pointer (variable name)
|
||||||
* @param dst Destination pointer (variable name)
|
* @param dst Destination pointer (variable name)
|
||||||
* @param n Total number of samples (variable name)
|
* @param n Total number of samples (variable name)
|
||||||
* @param shift Bitshift (bits)
|
* @param shift Bitshift (bits)
|
||||||
* @param offset Sample value offset
|
* @param offset Sample value offset
|
||||||
*/
|
*/
|
||||||
#define ENCODE(type, endian, src, dst, n, shift, offset) \
|
#define ENCODE(type, endian, src, dst, n, shift, offset) \
|
||||||
samples_##type = (const type*) src; \
|
samples_ ## type = (const type *) src; \
|
||||||
for(;n>0;n--) { \
|
for (; n > 0; n--) { \
|
||||||
register type v = (*samples_##type++ >> shift) + offset; \
|
register type v = (*samples_ ## type++ >> shift) + offset; \
|
||||||
bytestream_put_##endian(&dst, v); \
|
bytestream_put_ ## endian(&dst, v); \
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
||||||
@ -92,7 +92,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
|||||||
const uint16_t *samples_uint16_t;
|
const uint16_t *samples_uint16_t;
|
||||||
const uint32_t *samples_uint32_t;
|
const uint32_t *samples_uint32_t;
|
||||||
|
|
||||||
sample_size = av_get_bits_per_sample(avctx->codec->id)/8;
|
sample_size = av_get_bits_per_sample(avctx->codec->id) / 8;
|
||||||
n = frame->nb_samples * avctx->channels;
|
n = frame->nb_samples * avctx->channels;
|
||||||
samples = (const short *)frame->data[0];
|
samples = (const short *)frame->data[0];
|
||||||
|
|
||||||
@ -102,7 +102,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
|||||||
}
|
}
|
||||||
dst = avpkt->data;
|
dst = avpkt->data;
|
||||||
|
|
||||||
switch(avctx->codec->id) {
|
switch (avctx->codec->id) {
|
||||||
case CODEC_ID_PCM_U32LE:
|
case CODEC_ID_PCM_U32LE:
|
||||||
ENCODE(uint32_t, le32, samples, dst, n, 0, 0x80000000)
|
ENCODE(uint32_t, le32, samples, dst, n, 0, 0x80000000)
|
||||||
break;
|
break;
|
||||||
@ -122,7 +122,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
|||||||
ENCODE(uint32_t, be24, samples, dst, n, 8, 0x800000)
|
ENCODE(uint32_t, be24, samples, dst, n, 8, 0x800000)
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_S24DAUD:
|
case CODEC_ID_PCM_S24DAUD:
|
||||||
for(;n>0;n--) {
|
for (; n > 0; n--) {
|
||||||
uint32_t tmp = av_reverse[(*samples >> 8) & 0xff] +
|
uint32_t tmp = av_reverse[(*samples >> 8) & 0xff] +
|
||||||
(av_reverse[*samples & 0xff] << 8);
|
(av_reverse[*samples & 0xff] << 8);
|
||||||
tmp <<= 4; // sync flags would go here
|
tmp <<= 4; // sync flags would go here
|
||||||
@ -138,8 +138,8 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
|||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_S8:
|
case CODEC_ID_PCM_S8:
|
||||||
srcu8 = frame->data[0];
|
srcu8 = frame->data[0];
|
||||||
for(;n>0;n--) {
|
for (; n > 0; n--) {
|
||||||
v = *srcu8++;
|
v = *srcu8++;
|
||||||
*dst++ = v - 128;
|
*dst++ = v - 128;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -175,18 +175,18 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
|||||||
case CODEC_ID_PCM_S16LE:
|
case CODEC_ID_PCM_S16LE:
|
||||||
#endif /* HAVE_BIGENDIAN */
|
#endif /* HAVE_BIGENDIAN */
|
||||||
case CODEC_ID_PCM_U8:
|
case CODEC_ID_PCM_U8:
|
||||||
memcpy(dst, samples, n*sample_size);
|
memcpy(dst, samples, n * sample_size);
|
||||||
dst += n*sample_size;
|
dst += n * sample_size;
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_ALAW:
|
case CODEC_ID_PCM_ALAW:
|
||||||
for(;n>0;n--) {
|
for (; n > 0; n--) {
|
||||||
v = *samples++;
|
v = *samples++;
|
||||||
*dst++ = linear_to_alaw[(v + 32768) >> 2];
|
*dst++ = linear_to_alaw[(v + 32768) >> 2];
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_MULAW:
|
case CODEC_ID_PCM_MULAW:
|
||||||
for(;n>0;n--) {
|
for (; n > 0; n--) {
|
||||||
v = *samples++;
|
v = *samples++;
|
||||||
*dst++ = linear_to_ulaw[(v + 32768) >> 2];
|
*dst++ = linear_to_ulaw[(v + 32768) >> 2];
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -200,10 +200,10 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
|||||||
|
|
||||||
typedef struct PCMDecode {
|
typedef struct PCMDecode {
|
||||||
AVFrame frame;
|
AVFrame frame;
|
||||||
short table[256];
|
short table[256];
|
||||||
} PCMDecode;
|
} PCMDecode;
|
||||||
|
|
||||||
static av_cold int pcm_decode_init(AVCodecContext * avctx)
|
static av_cold int pcm_decode_init(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
PCMDecode *s = avctx->priv_data;
|
PCMDecode *s = avctx->priv_data;
|
||||||
int i;
|
int i;
|
||||||
@ -213,13 +213,13 @@ static av_cold int pcm_decode_init(AVCodecContext * avctx)
|
|||||||
return AVERROR(EINVAL);
|
return AVERROR(EINVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch(avctx->codec->id) {
|
switch (avctx->codec->id) {
|
||||||
case CODEC_ID_PCM_ALAW:
|
case CODEC_ID_PCM_ALAW:
|
||||||
for(i=0;i<256;i++)
|
for (i = 0; i < 256; i++)
|
||||||
s->table[i] = alaw2linear(i);
|
s->table[i] = alaw2linear(i);
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_MULAW:
|
case CODEC_ID_PCM_MULAW:
|
||||||
for(i=0;i<256;i++)
|
for (i = 0; i < 256; i++)
|
||||||
s->table[i] = ulaw2linear(i);
|
s->table[i] = ulaw2linear(i);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -239,32 +239,32 @@ static av_cold int pcm_decode_init(AVCodecContext * avctx)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Read PCM samples macro
|
* Read PCM samples macro
|
||||||
* @param size Data size of native machine format
|
* @param size Data size of native machine format
|
||||||
* @param endian bytestream_get_xxx() endian suffix
|
* @param endian bytestream_get_xxx() endian suffix
|
||||||
* @param src Source pointer (variable name)
|
* @param src Source pointer (variable name)
|
||||||
* @param dst Destination pointer (variable name)
|
* @param dst Destination pointer (variable name)
|
||||||
* @param n Total number of samples (variable name)
|
* @param n Total number of samples (variable name)
|
||||||
* @param shift Bitshift (bits)
|
* @param shift Bitshift (bits)
|
||||||
* @param offset Sample value offset
|
* @param offset Sample value offset
|
||||||
*/
|
*/
|
||||||
#define DECODE(size, endian, src, dst, n, shift, offset) \
|
#define DECODE(size, endian, src, dst, n, shift, offset) \
|
||||||
for(;n>0;n--) { \
|
for (; n > 0; n--) { \
|
||||||
uint##size##_t v = bytestream_get_##endian(&src); \
|
uint ## size ## _t v = bytestream_get_ ## endian(&src); \
|
||||||
AV_WN##size##A(dst, (v - offset) << shift); \
|
AV_WN ## size ## A(dst, (v - offset) << shift); \
|
||||||
dst += size / 8; \
|
dst += size / 8; \
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
||||||
int *got_frame_ptr, AVPacket *avpkt)
|
int *got_frame_ptr, AVPacket *avpkt)
|
||||||
{
|
{
|
||||||
const uint8_t *src = avpkt->data;
|
const uint8_t *src = avpkt->data;
|
||||||
int buf_size = avpkt->size;
|
int buf_size = avpkt->size;
|
||||||
PCMDecode *s = avctx->priv_data;
|
PCMDecode *s = avctx->priv_data;
|
||||||
int sample_size, c, n, ret, samples_per_block;
|
int sample_size, c, n, ret, samples_per_block;
|
||||||
uint8_t *samples;
|
uint8_t *samples;
|
||||||
int32_t *dst_int32_t;
|
int32_t *dst_int32_t;
|
||||||
|
|
||||||
sample_size = av_get_bits_per_sample(avctx->codec_id)/8;
|
sample_size = av_get_bits_per_sample(avctx->codec_id) / 8;
|
||||||
|
|
||||||
/* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */
|
/* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */
|
||||||
samples_per_block = 1;
|
samples_per_block = 1;
|
||||||
@ -276,11 +276,11 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
}
|
}
|
||||||
/* 2 samples are interleaved per block in PCM_DVD */
|
/* 2 samples are interleaved per block in PCM_DVD */
|
||||||
samples_per_block = 2;
|
samples_per_block = 2;
|
||||||
sample_size = avctx->bits_per_coded_sample * 2 / 8;
|
sample_size = avctx->bits_per_coded_sample * 2 / 8;
|
||||||
} else if (avctx->codec_id == CODEC_ID_PCM_LXF) {
|
} else if (avctx->codec_id == CODEC_ID_PCM_LXF) {
|
||||||
/* we process 40-bit blocks per channel for LXF */
|
/* we process 40-bit blocks per channel for LXF */
|
||||||
samples_per_block = 2;
|
samples_per_block = 2;
|
||||||
sample_size = 5;
|
sample_size = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sample_size == 0) {
|
if (sample_size == 0) {
|
||||||
@ -290,15 +290,15 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
|
|
||||||
n = avctx->channels * sample_size;
|
n = avctx->channels * sample_size;
|
||||||
|
|
||||||
if(n && buf_size % n){
|
if (n && buf_size % n) {
|
||||||
if (buf_size < n) {
|
if (buf_size < n) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n");
|
av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n");
|
||||||
return -1;
|
return -1;
|
||||||
}else
|
} else
|
||||||
buf_size -= buf_size % n;
|
buf_size -= buf_size % n;
|
||||||
}
|
}
|
||||||
|
|
||||||
n = buf_size/sample_size;
|
n = buf_size / sample_size;
|
||||||
|
|
||||||
/* get output buffer */
|
/* get output buffer */
|
||||||
s->frame.nb_samples = n * samples_per_block / avctx->channels;
|
s->frame.nb_samples = n * samples_per_block / avctx->channels;
|
||||||
@ -308,7 +308,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
}
|
}
|
||||||
samples = s->frame.data[0];
|
samples = s->frame.data[0];
|
||||||
|
|
||||||
switch(avctx->codec->id) {
|
switch (avctx->codec->id) {
|
||||||
case CODEC_ID_PCM_U32LE:
|
case CODEC_ID_PCM_U32LE:
|
||||||
DECODE(32, le32, src, samples, n, 0, 0x80000000)
|
DECODE(32, le32, src, samples, n, 0, 0x80000000)
|
||||||
break;
|
break;
|
||||||
@ -328,22 +328,22 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
DECODE(32, be24, src, samples, n, 8, 0x800000)
|
DECODE(32, be24, src, samples, n, 8, 0x800000)
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_S24DAUD:
|
case CODEC_ID_PCM_S24DAUD:
|
||||||
for(;n>0;n--) {
|
for (; n > 0; n--) {
|
||||||
uint32_t v = bytestream_get_be24(&src);
|
uint32_t v = bytestream_get_be24(&src);
|
||||||
v >>= 4; // sync flags are here
|
v >>= 4; // sync flags are here
|
||||||
AV_WN16A(samples, av_reverse[(v >> 8) & 0xff] +
|
AV_WN16A(samples, av_reverse[(v >> 8) & 0xff] +
|
||||||
(av_reverse[v & 0xff] << 8));
|
(av_reverse[v & 0xff] << 8));
|
||||||
samples += 2;
|
samples += 2;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_S16LE_PLANAR:
|
case CODEC_ID_PCM_S16LE_PLANAR:
|
||||||
{
|
{
|
||||||
const uint8_t *src2[MAX_CHANNELS];
|
const uint8_t *src2[MAX_CHANNELS];
|
||||||
n /= avctx->channels;
|
n /= avctx->channels;
|
||||||
for(c=0;c<avctx->channels;c++)
|
for (c = 0; c < avctx->channels; c++)
|
||||||
src2[c] = &src[c*n*2];
|
src2[c] = &src[c * n * 2];
|
||||||
for(;n>0;n--)
|
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]));
|
AV_WN16A(samples, bytestream_get_le16(&src2[c]));
|
||||||
samples += 2;
|
samples += 2;
|
||||||
}
|
}
|
||||||
@ -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:
|
||||||
@ -392,7 +391,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
case CODEC_ID_PCM_S16LE:
|
case CODEC_ID_PCM_S16LE:
|
||||||
#endif /* HAVE_BIGENDIAN */
|
#endif /* HAVE_BIGENDIAN */
|
||||||
case CODEC_ID_PCM_U8:
|
case CODEC_ID_PCM_U8:
|
||||||
memcpy(samples, src, n*sample_size);
|
memcpy(samples, src, n * sample_size);
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_ZORK:
|
case CODEC_ID_PCM_ZORK:
|
||||||
for (; n > 0; n--) {
|
for (; n > 0; n--) {
|
||||||
@ -404,7 +403,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
break;
|
break;
|
||||||
case CODEC_ID_PCM_ALAW:
|
case CODEC_ID_PCM_ALAW:
|
||||||
case CODEC_ID_PCM_MULAW:
|
case CODEC_ID_PCM_MULAW:
|
||||||
for(;n>0;n--) {
|
for (; n > 0; n--) {
|
||||||
AV_WN16A(samples, s->table[*src++]);
|
AV_WN16A(samples, s->table[*src++]);
|
||||||
samples += 2;
|
samples += 2;
|
||||||
}
|
}
|
||||||
@ -417,19 +416,19 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
switch (avctx->bits_per_coded_sample) {
|
switch (avctx->bits_per_coded_sample) {
|
||||||
case 20:
|
case 20:
|
||||||
while (n--) {
|
while (n--) {
|
||||||
c = avctx->channels;
|
c = avctx->channels;
|
||||||
src8 = src + 4*c;
|
src8 = src + 4 * c;
|
||||||
while (c--) {
|
while (c--) {
|
||||||
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8 &0xf0) << 8);
|
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8 & 0xf0) << 8);
|
||||||
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++ &0x0f) << 12);
|
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++ & 0x0f) << 12);
|
||||||
}
|
}
|
||||||
src = src8;
|
src = src8;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 24:
|
case 24:
|
||||||
while (n--) {
|
while (n--) {
|
||||||
c = avctx->channels;
|
c = avctx->channels;
|
||||||
src8 = src + 4*c;
|
src8 = src + 4 * c;
|
||||||
while (c--) {
|
while (c--) {
|
||||||
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
|
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
|
||||||
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
|
*dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
|
||||||
@ -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) |
|
||||||
*dst_int32_t++ = (src8[4] << 24) | (src8[3] << 16) |
|
(src8[3] << 16) |
|
||||||
((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4);
|
((src8[2] & 0xF0) << 8) |
|
||||||
|
(src8[4] << 4) |
|
||||||
|
(src8[3] >> 4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -473,65 +477,68 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if CONFIG_ENCODERS
|
#if CONFIG_ENCODERS
|
||||||
#define PCM_ENCODER(id_,sample_fmt_,name_,long_name_) \
|
#define PCM_ENCODER(id_, sample_fmt_, name_, long_name_) \
|
||||||
AVCodec ff_ ## name_ ## _encoder = { \
|
AVCodec ff_ ## name_ ## _encoder = { \
|
||||||
.name = #name_, \
|
.name = #name_, \
|
||||||
.type = AVMEDIA_TYPE_AUDIO, \
|
.type = AVMEDIA_TYPE_AUDIO, \
|
||||||
.id = id_, \
|
.id = id_, \
|
||||||
.init = pcm_encode_init, \
|
.init = pcm_encode_init, \
|
||||||
.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_, \
|
||||||
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
|
AV_SAMPLE_FMT_NONE }, \
|
||||||
|
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#define PCM_ENCODER(id,sample_fmt_,name,long_name_)
|
#define PCM_ENCODER(id, sample_fmt_, name, long_name_)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CONFIG_DECODERS
|
#if CONFIG_DECODERS
|
||||||
#define PCM_DECODER(id_,sample_fmt_,name_,long_name_) \
|
#define PCM_DECODER(id_, sample_fmt_, name_, long_name_) \
|
||||||
AVCodec ff_ ## name_ ## _decoder = { \
|
AVCodec ff_ ## name_ ## _decoder = { \
|
||||||
.name = #name_, \
|
.name = #name_, \
|
||||||
.type = AVMEDIA_TYPE_AUDIO, \
|
.type = AVMEDIA_TYPE_AUDIO, \
|
||||||
.id = id_, \
|
.id = id_, \
|
||||||
.priv_data_size = sizeof(PCMDecode), \
|
.priv_data_size = sizeof(PCMDecode), \
|
||||||
.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_, \
|
||||||
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
|
AV_SAMPLE_FMT_NONE }, \
|
||||||
|
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#define PCM_DECODER(id,sample_fmt_,name,long_name_)
|
#define PCM_DECODER(id, sample_fmt_, name, long_name_)
|
||||||
#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");
|
||||||
PCM_DECODER(CODEC_ID_PCM_DVD, AV_SAMPLE_FMT_S32, pcm_dvd, "PCM signed 20|24-bit big-endian");
|
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_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_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_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_CODEC (CODEC_ID_PCM_MULAW, AV_SAMPLE_FMT_S16, pcm_mulaw, "PCM 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_S16, 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");
|
||||||
PCM_CODEC (CODEC_ID_PCM_S32BE, AV_SAMPLE_FMT_S32, pcm_s32be, "PCM signed 32-bit big-endian");
|
PCM_CODEC (CODEC_ID_PCM_S32BE, AV_SAMPLE_FMT_S32, pcm_s32be, "PCM signed 32-bit big-endian");
|
||||||
PCM_CODEC (CODEC_ID_PCM_S32LE, AV_SAMPLE_FMT_S32, pcm_s32le, "PCM signed 32-bit little-endian");
|
PCM_CODEC (CODEC_ID_PCM_S32LE, AV_SAMPLE_FMT_S32, pcm_s32le, "PCM signed 32-bit little-endian");
|
||||||
PCM_CODEC (CODEC_ID_PCM_U8, AV_SAMPLE_FMT_U8, pcm_u8, "PCM unsigned 8-bit");
|
PCM_CODEC (CODEC_ID_PCM_U8, AV_SAMPLE_FMT_U8, pcm_u8, "PCM unsigned 8-bit");
|
||||||
PCM_CODEC (CODEC_ID_PCM_U16BE, AV_SAMPLE_FMT_S16, pcm_u16be, "PCM unsigned 16-bit big-endian");
|
PCM_CODEC (CODEC_ID_PCM_U16BE, AV_SAMPLE_FMT_S16, pcm_u16be, "PCM unsigned 16-bit big-endian");
|
||||||
PCM_CODEC (CODEC_ID_PCM_U16LE, AV_SAMPLE_FMT_S16, pcm_u16le, "PCM unsigned 16-bit little-endian");
|
PCM_CODEC (CODEC_ID_PCM_U16LE, AV_SAMPLE_FMT_S16, pcm_u16le, "PCM unsigned 16-bit little-endian");
|
||||||
PCM_CODEC (CODEC_ID_PCM_U24BE, AV_SAMPLE_FMT_S32, pcm_u24be, "PCM unsigned 24-bit big-endian");
|
PCM_CODEC (CODEC_ID_PCM_U24BE, AV_SAMPLE_FMT_S32, pcm_u24be, "PCM unsigned 24-bit big-endian");
|
||||||
PCM_CODEC (CODEC_ID_PCM_U24LE, AV_SAMPLE_FMT_S32, pcm_u24le, "PCM unsigned 24-bit little-endian");
|
PCM_CODEC (CODEC_ID_PCM_U24LE, AV_SAMPLE_FMT_S32, pcm_u24le, "PCM unsigned 24-bit little-endian");
|
||||||
PCM_CODEC (CODEC_ID_PCM_U32BE, AV_SAMPLE_FMT_S32, pcm_u32be, "PCM unsigned 32-bit big-endian");
|
PCM_CODEC (CODEC_ID_PCM_U32BE, AV_SAMPLE_FMT_S32, pcm_u32be, "PCM unsigned 32-bit big-endian");
|
||||||
PCM_CODEC (CODEC_ID_PCM_U32LE, AV_SAMPLE_FMT_S32, pcm_u32le, "PCM unsigned 32-bit little-endian");
|
PCM_CODEC (CODEC_ID_PCM_U32LE, AV_SAMPLE_FMT_S32, pcm_u32le, "PCM unsigned 32-bit little-endian");
|
||||||
PCM_DECODER(CODEC_ID_PCM_ZORK, AV_SAMPLE_FMT_U8, pcm_zork, "PCM Zork");
|
PCM_DECODER(CODEC_ID_PCM_ZORK, AV_SAMPLE_FMT_U8, pcm_zork, "PCM Zork");
|
||||||
|
Loading…
Reference in New Issue
Block a user