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

normalize calls to ff_alloc_packet2

Browse Source 
- check ret < 0
- remove excessive error log

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Zern 2013-03-06 11:11:00 -08:00 committed by Michael Niedermayer
parent c257fe1fde
commit bcaf64b605
28 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aacenc.c
View File

@ -570,10 +570,8 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
start_ch += chans; start_ch += chans;
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, 8192 * s->channels))) { if ((ret = ff_alloc_packet2(avctx, avpkt, 8192 * s->channels)) < 0)
av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
return ret; return ret;
}
do { do {
int frame_bits; int frame_bits;

2
libavcodec/ac3enc_template.c
View File

@ -435,7 +435,7 @@ int AC3_NAME(encode_frame)(AVCodecContext *avctx, AVPacket *avpkt,
ff_ac3_quantize_mantissas(s); ff_ac3_quantize_mantissas(s);
if ((ret = ff_alloc_packet2(avctx, avpkt, s->frame_size))) if ((ret = ff_alloc_packet2(avctx, avpkt, s->frame_size)) < 0)
return ret; return ret;
ff_ac3_output_frame(s, avpkt->data); ff_ac3_output_frame(s, avpkt->data);

2
libavcodec/adpcmenc.c
View File

@ -494,7 +494,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
pkt_size = (2 + avctx->channels * (22 + 4 * (frame->nb_samples - 1)) + 7) / 8; pkt_size = (2 + avctx->channels * (22 + 4 * (frame->nb_samples - 1)) + 7) / 8;
else else
pkt_size = avctx->block_align; pkt_size = avctx->block_align;
if ((ret = ff_alloc_packet2(avctx, avpkt, pkt_size))) if ((ret = ff_alloc_packet2(avctx, avpkt, pkt_size)) < 0)
return ret; return ret;
dst = avpkt->data; dst = avpkt->data;

2
libavcodec/alacenc.c
View File

@ -613,7 +613,7 @@ static int alac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
else else
max_frame_size = s->max_coded_frame_size; max_frame_size = s->max_coded_frame_size;
if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * max_frame_size))) if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * max_frame_size)) < 0)
return ret; return ret;
/* use verbatim mode for compression_level 0 */ /* use verbatim mode for compression_level 0 */

2
libavcodec/dcaenc.c
View File

@ -497,7 +497,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const int16_t *samples; const int16_t *samples;
int ret, real_channel = 0; int ret, real_channel = 0;
if ((ret = ff_alloc_packet2(avctx, avpkt, DCA_MAX_FRAME_SIZE + DCA_HEADER_SIZE))) if ((ret = ff_alloc_packet2(avctx, avpkt, DCA_MAX_FRAME_SIZE + DCA_HEADER_SIZE)) < 0)
return ret; return ret;
samples = (const int16_t *)frame->data[0]; samples = (const int16_t *)frame->data[0];

2
libavcodec/flacenc.c
View File

@ -1276,7 +1276,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, frame_bytes))) if ((ret = ff_alloc_packet2(avctx, avpkt, frame_bytes)) < 0)
return ret; return ret;
out_bytes = write_frame(s, avpkt); out_bytes = write_frame(s, avpkt);

2
libavcodec/g722enc.c
View File

@ -368,7 +368,7 @@ static int g722_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
int nb_samples, out_size, ret; int nb_samples, out_size, ret;
out_size = (frame->nb_samples + 1) / 2; out_size = (frame->nb_samples + 1) / 2;
if ((ret = ff_alloc_packet2(avctx, avpkt, out_size))) if ((ret = ff_alloc_packet2(avctx, avpkt, out_size)) < 0)
return ret; return ret;
nb_samples = frame->nb_samples - (frame->nb_samples & 1); nb_samples = frame->nb_samples - (frame->nb_samples & 1);

2
libavcodec/g723_1.c
View File

@ -2458,7 +2458,7 @@ static int g723_1_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
offset += LPC_ORDER; offset += LPC_ORDER;
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, 24))) if ((ret = ff_alloc_packet2(avctx, avpkt, 24)) < 0)
return ret; return ret;
*got_packet_ptr = 1; *got_packet_ptr = 1;

2
libavcodec/g726.c
View File

@ -362,7 +362,7 @@ static int g726_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
int i, ret, out_size; int i, ret, out_size;
out_size = (frame->nb_samples * c->code_size + 7) / 8; out_size = (frame->nb_samples * c->code_size + 7) / 8;
if ((ret = ff_alloc_packet2(avctx, avpkt, out_size))) if ((ret = ff_alloc_packet2(avctx, avpkt, out_size)) < 0)
return ret; return ret;
init_put_bits(&pb, avpkt->data, avpkt->size); init_put_bits(&pb, avpkt->data, avpkt->size);

2
libavcodec/libaacplus.c
View File

@ -104,7 +104,7 @@ static int aacPlus_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
int32_t *input_buffer = (int32_t *)frame->data[0]; int32_t *input_buffer = (int32_t *)frame->data[0];
int ret; int ret;
if ((ret = ff_alloc_packet2(avctx, pkt, s->max_output_bytes))) if ((ret = ff_alloc_packet2(avctx, pkt, s->max_output_bytes)) < 0)
return ret; return ret;
pkt->size = aacplusEncEncode(s->aacplus_handle, input_buffer, pkt->size = aacplusEncEncode(s->aacplus_handle, input_buffer,

4
libavcodec/libfaac.c
View File

@ -184,10 +184,8 @@ static int Faac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
int num_samples = frame ? frame->nb_samples : 0; int num_samples = frame ? frame->nb_samples : 0;
void *samples = frame ? frame->data[0] : NULL; void *samples = frame ? frame->data[0] : NULL;
if ((ret = ff_alloc_packet2(avctx, avpkt, (7 + 768) * avctx->channels))) { if ((ret = ff_alloc_packet2(avctx, avpkt, (7 + 768) * avctx->channels)) < 0)
av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
return ret; return ret;
}
bytes_written = faacEncEncode(s->faac_handle, samples, bytes_written = faacEncEncode(s->faac_handle, samples,
num_samples * avctx->channels, num_samples * avctx->channels,

2
libavcodec/libfdk-aacenc.c
View File

@ -339,7 +339,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
/* The maximum packet size is 6144 bits aka 768 bytes per channel. */ /* The maximum packet size is 6144 bits aka 768 bytes per channel. */
if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels)))) if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels))) < 0)
return ret; return ret;
out_ptr = avpkt->data; out_ptr = avpkt->data;

2
libavcodec/libgsm.c
View File

@ -107,7 +107,7 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
gsm_signal *samples = (gsm_signal *)frame->data[0]; gsm_signal *samples = (gsm_signal *)frame->data[0];
struct gsm_state *state = avctx->priv_data; struct gsm_state *state = avctx->priv_data;
if ((ret = ff_alloc_packet2(avctx, avpkt, avctx->block_align))) if ((ret = ff_alloc_packet2(avctx, avpkt, avctx->block_align)) < 0)
return ret; return ret;
switch(avctx->codec_id) { switch(avctx->codec_id) {

2
libavcodec/libmp3lame.c
View File

@ -254,7 +254,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
av_dlog(avctx, "in:%d packet-len:%d index:%d\n", avctx->frame_size, len, av_dlog(avctx, "in:%d packet-len:%d index:%d\n", avctx->frame_size, len,
s->buffer_index); s->buffer_index);
if (len <= s->buffer_index) { if (len <= s->buffer_index) {
if ((ret = ff_alloc_packet2(avctx, avpkt, len))) if ((ret = ff_alloc_packet2(avctx, avpkt, len)) < 0)
return ret; return ret;
memcpy(avpkt->data, s->buffer, len); memcpy(avpkt->data, s->buffer, len);
s->buffer_index -= len; s->buffer_index -= len;

2
libavcodec/libopencore-amr.c
View File

@ -247,7 +247,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s->enc_bitrate = avctx->bit_rate; s->enc_bitrate = avctx->bit_rate;
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, 32))) if ((ret = ff_alloc_packet2(avctx, avpkt, 32)) < 0)
return ret; return ret;
if (frame) { if (frame) {

2
libavcodec/libspeexenc.c
View File

@ -304,7 +304,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
/* write output if all frames for the packet have been encoded */ /* write output if all frames for the packet have been encoded */
if (s->pkt_frame_count == s->frames_per_packet) { if (s->pkt_frame_count == s->frames_per_packet) {
s->pkt_frame_count = 0; s->pkt_frame_count = 0;
if ((ret = ff_alloc_packet2(avctx, avpkt, speex_bits_nbytes(&s->bits)))) if ((ret = ff_alloc_packet2(avctx, avpkt, speex_bits_nbytes(&s->bits))) < 0)
return ret; return ret;
ret = speex_bits_write(&s->bits, avpkt->data, avpkt->size); ret = speex_bits_write(&s->bits, avpkt->data, avpkt->size);
speex_bits_reset(&s->bits); speex_bits_reset(&s->bits);

2
libavcodec/libtwolame.c
View File

@ -94,7 +94,7 @@ static int twolame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
TWOLAMEContext *s = avctx->priv_data; TWOLAMEContext *s = avctx->priv_data;
int ret; int ret;
if ((ret = ff_alloc_packet2(avctx, avpkt, MPA_MAX_CODED_FRAME_SIZE))) if ((ret = ff_alloc_packet2(avctx, avpkt, MPA_MAX_CODED_FRAME_SIZE)) < 0)
return ret; return ret;
if (frame) { if (frame) {

2
libavcodec/libvo-aacenc.c
View File

@ -161,7 +161,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return ret; return ret;
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels)))) if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels))) < 0)
return ret; return ret;
input.Buffer = samples; input.Buffer = samples;

2
libavcodec/libvo-amrwbenc.c
View File

@ -121,7 +121,7 @@ static int amr_wb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const int16_t *samples = (const int16_t *)frame->data[0]; const int16_t *samples = (const int16_t *)frame->data[0];
int size, ret; int size, ret;
if ((ret = ff_alloc_packet2(avctx, avpkt, MAX_PACKET_SIZE))) if ((ret = ff_alloc_packet2(avctx, avpkt, MAX_PACKET_SIZE)) < 0)
return ret; return ret;
if (s->last_bitrate != avctx->bit_rate) { if (s->last_bitrate != avctx->bit_rate) {

2
libavcodec/libvorbisenc.c
View File

@ -348,7 +348,7 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
av_fifo_generic_read(s->pkt_fifo, &op, sizeof(ogg_packet), NULL); av_fifo_generic_read(s->pkt_fifo, &op, sizeof(ogg_packet), NULL);
if ((ret = ff_alloc_packet2(avctx, avpkt, op.bytes))) if ((ret = ff_alloc_packet2(avctx, avpkt, op.bytes)) < 0)
return ret; return ret;
av_fifo_generic_read(s->pkt_fifo, avpkt->data, op.bytes, NULL); av_fifo_generic_read(s->pkt_fifo, avpkt->data, op.bytes, NULL);

2
libavcodec/mpegaudioenc.c
View File

@ -754,7 +754,7 @@ static int MPA_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
compute_bit_allocation(s, smr, bit_alloc, &padding); compute_bit_allocation(s, smr, bit_alloc, &padding);
if ((ret = ff_alloc_packet2(avctx, avpkt, MPA_MAX_CODED_FRAME_SIZE))) if ((ret = ff_alloc_packet2(avctx, avpkt, MPA_MAX_CODED_FRAME_SIZE)) < 0)
return ret; return ret;
init_put_bits(&s->pb, avpkt->data, avpkt->size); init_put_bits(&s->pb, avpkt->data, avpkt->size);

2
libavcodec/nellymoserenc.c
View File

@ -401,7 +401,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s->last_frame = 1; s->last_frame = 1;
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, NELLY_BLOCK_LEN))) if ((ret = ff_alloc_packet2(avctx, avpkt, NELLY_BLOCK_LEN)) < 0)
return ret; return ret;
encode_block(s, avpkt->data, avpkt->size); encode_block(s, avpkt->data, avpkt->size);

2
libavcodec/pcm.c
View File

@ -107,7 +107,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
n = frame->nb_samples * avctx->channels; n = frame->nb_samples * avctx->channels;
samples = (const short *)frame->data[0]; samples = (const short *)frame->data[0];
if ((ret = ff_alloc_packet2(avctx, avpkt, n * sample_size))) if ((ret = ff_alloc_packet2(avctx, avpkt, n * sample_size)) < 0)
return ret; return ret;
dst = avpkt->data; dst = avpkt->data;

2
libavcodec/ra144enc.c
View File

@ -458,7 +458,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))) if ((ret = ff_alloc_packet2(avctx, avpkt, FRAMESIZE)) < 0)
return ret; return ret;
/** /**

2
libavcodec/roqaudioenc.c
View File

@ -173,7 +173,7 @@ static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
else else
data_size = avctx->channels * avctx->frame_size; data_size = avctx->channels * avctx->frame_size;
if ((ret = ff_alloc_packet2(avctx, avpkt, ROQ_HEADER_SIZE + data_size))) if ((ret = ff_alloc_packet2(avctx, avpkt, ROQ_HEADER_SIZE + data_size)) < 0)
return ret; return ret;
out = avpkt->data; out = avpkt->data;

2
libavcodec/sonic.c
View File

@ -632,7 +632,7 @@ static int sonic_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
int ret; int ret;
const short *samples = (const int16_t*)frame->data[0]; const short *samples = (const int16_t*)frame->data[0];
if ((ret = ff_alloc_packet2(avctx, avpkt, s->frame_size * 5 + 1000))) if ((ret = ff_alloc_packet2(avctx, avpkt, s->frame_size * 5 + 1000)) < 0)
return ret; return ret;
init_put_bits(&pb, avpkt->data, avpkt->size); init_put_bits(&pb, avpkt->data, avpkt->size);

2
libavcodec/vorbisenc.c
View File

@ -1028,7 +1028,7 @@ static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return 0; return 0;
samples = 1 << (venc->log2_blocksize[0] - 1); samples = 1 << (venc->log2_blocksize[0] - 1);
if ((ret = ff_alloc_packet2(avctx, avpkt, 8192))) if ((ret = ff_alloc_packet2(avctx, avpkt, 8192)) < 0)
return ret; return ret;
init_put_bits(&pb, avpkt->data, avpkt->size); init_put_bits(&pb, avpkt->data, avpkt->size);

2
libavcodec/wmaenc.c
View File

@ -366,7 +366,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
} }
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * MAX_CODED_SUPERFRAME_SIZE))) if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * MAX_CODED_SUPERFRAME_SIZE)) < 0)
return ret; return ret;
total_gain= 128; total_gain= 128;