mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
tests/api/api-flac-test: use av_packet_alloc() to allocate packets
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
36d4e4c9b5
commit
7643a35474
@ -108,7 +108,7 @@ static int init_decoder(AVCodec *dec, AVCodecContext **dec_ctx,
|
|||||||
static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
|
static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
|
||||||
AVCodecContext *dec_ctx)
|
AVCodecContext *dec_ctx)
|
||||||
{
|
{
|
||||||
AVPacket enc_pkt;
|
AVPacket *enc_pkt;
|
||||||
AVFrame *in_frame, *out_frame;
|
AVFrame *in_frame, *out_frame;
|
||||||
uint8_t *raw_in = NULL, *raw_out = NULL;
|
uint8_t *raw_in = NULL, *raw_out = NULL;
|
||||||
int in_offset = 0, out_offset = 0;
|
int in_offset = 0, out_offset = 0;
|
||||||
@ -116,6 +116,12 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
|
|||||||
int i = 0;
|
int i = 0;
|
||||||
int in_frame_bytes, out_frame_bytes;
|
int in_frame_bytes, out_frame_bytes;
|
||||||
|
|
||||||
|
enc_pkt = av_packet_alloc();
|
||||||
|
if (!enc_pkt) {
|
||||||
|
av_log(NULL, AV_LOG_ERROR, "Can't allocate output packet\n");
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
}
|
||||||
|
|
||||||
in_frame = av_frame_alloc();
|
in_frame = av_frame_alloc();
|
||||||
if (!in_frame) {
|
if (!in_frame) {
|
||||||
av_log(NULL, AV_LOG_ERROR, "Can't allocate input frame\n");
|
av_log(NULL, AV_LOG_ERROR, "Can't allocate input frame\n");
|
||||||
@ -149,10 +155,6 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < NUMBER_OF_AUDIO_FRAMES; i++) {
|
for (i = 0; i < NUMBER_OF_AUDIO_FRAMES; i++) {
|
||||||
av_init_packet(&enc_pkt);
|
|
||||||
enc_pkt.data = NULL;
|
|
||||||
enc_pkt.size = 0;
|
|
||||||
|
|
||||||
result = av_frame_make_writable(in_frame);
|
result = av_frame_make_writable(in_frame);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
return result;
|
return result;
|
||||||
@ -173,7 +175,7 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
while (result >= 0) {
|
while (result >= 0) {
|
||||||
result = avcodec_receive_packet(enc_ctx, &enc_pkt);
|
result = avcodec_receive_packet(enc_ctx, enc_pkt);
|
||||||
if (result == AVERROR(EAGAIN))
|
if (result == AVERROR(EAGAIN))
|
||||||
break;
|
break;
|
||||||
else if (result < 0 && result != AVERROR_EOF) {
|
else if (result < 0 && result != AVERROR_EOF) {
|
||||||
@ -182,8 +184,8 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* if we get an encoded packet, feed it straight to the decoder */
|
/* if we get an encoded packet, feed it straight to the decoder */
|
||||||
result = avcodec_send_packet(dec_ctx, &enc_pkt);
|
result = avcodec_send_packet(dec_ctx, enc_pkt);
|
||||||
av_packet_unref(&enc_pkt);
|
av_packet_unref(enc_pkt);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
av_log(NULL, AV_LOG_ERROR, "Error submitting a packet for decoding\n");
|
av_log(NULL, AV_LOG_ERROR, "Error submitting a packet for decoding\n");
|
||||||
return result;
|
return result;
|
||||||
@ -234,6 +236,7 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
|
|||||||
|
|
||||||
av_freep(&raw_in);
|
av_freep(&raw_in);
|
||||||
av_freep(&raw_out);
|
av_freep(&raw_out);
|
||||||
|
av_packet_free(&enc_pkt);
|
||||||
av_frame_free(&in_frame);
|
av_frame_free(&in_frame);
|
||||||
av_frame_free(&out_frame);
|
av_frame_free(&out_frame);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user