generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.

Browse Source 
The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.
This commit is contained in:
Carl Eugen Hoyos 2013-06-30 13:45:10 +02:00
parent 674d8a9629
commit 742b961769
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ra144.h
View File

@ -30,7 +30,7 @@
#define BLOCKSIZE 40 ///< subblock size in 16-bit words #define BLOCKSIZE 40 ///< subblock size in 16-bit words
#define BUFFERSIZE 146 ///< the size of the adaptive codebook #define BUFFERSIZE 146 ///< the size of the adaptive codebook
#define FIXED_CB_SIZE 128 ///< size of fixed codebooks #define FIXED_CB_SIZE 128 ///< size of fixed codebooks
#define FRAMESIZE 20 ///< size of encoded frame #define FRAME_SIZE 20 ///< size of encoded frame
#define LPC_ORDER 10 ///< order of LPC filter #define LPC_ORDER 10 ///< order of LPC filter
typedef struct RA144Context { typedef struct RA144Context {

6
libavcodec/ra144dec.c
View File

@ -76,7 +76,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
RA144Context *ractx = avctx->priv_data; RA144Context *ractx = avctx->priv_data;
GetBitContext gb; GetBitContext gb;
if (buf_size < FRAMESIZE) { if (buf_size < FRAME_SIZE) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Frame too small (%d bytes). Truncated file?\n", buf_size); "Frame too small (%d bytes). Truncated file?\n", buf_size);
*got_frame_ptr = 0; *got_frame_ptr = 0;
@ -89,7 +89,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
return ret; return ret;
samples = (int16_t *)frame->data[0]; samples = (int16_t *)frame->data[0];
init_get_bits(&gb, buf, FRAMESIZE * 8); init_get_bits(&gb, buf, FRAME_SIZE * 8);
for (i = 0; i < LPC_ORDER; i++) for (i = 0; i < LPC_ORDER; i++)
lpc_refl[i] = ff_lpc_refl_cb[i][get_bits(&gb, sizes[i])]; lpc_refl[i] = ff_lpc_refl_cb[i][get_bits(&gb, sizes[i])];
@ -122,7 +122,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
*got_frame_ptr = 1; *got_frame_ptr = 1;
return FRAMESIZE; return FRAME_SIZE;
} }
AVCodec ff_ra_144_decoder = { AVCodec ff_ra_144_decoder = {

4
libavcodec/ra144enc.c
View File

@ -447,7 +447,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
if (ractx->last_frame) if (ractx->last_frame)
return 0; return 0;
if ((ret = ff_alloc_packet2(avctx, avpkt, FRAMESIZE)) < 0) if ((ret = ff_alloc_packet2(avctx, avpkt, FRAME_SIZE)) < 0)
return ret; return ret;
/** /**
@ -536,7 +536,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
ff_af_queue_remove(&ractx->afq, avctx->frame_size, &avpkt->pts, ff_af_queue_remove(&ractx->afq, avctx->frame_size, &avpkt->pts,
&avpkt->duration); &avpkt->duration);
avpkt->size = FRAMESIZE; avpkt->size = FRAME_SIZE;
*got_packet_ptr = 1; *got_packet_ptr = 1;
return 0; return 0;
} }