RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0711d142997b2662ba9198e607015b06c6eed0d8' 

* commit '0711d142997b2662ba9198e607015b06c6eed0d8':
  examples: Use new API for transcoding example

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-03-15 17:57:18 -03:00
parent 061337a073 0711d14299
commit 75aa14b870
1 changed files with 70 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
doc/examples/transcode_aac.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2017 Andreas Unterweger * Copyright (c) 2013-2018 Andreas Unterweger
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
@ -387,24 +387,39 @@ static int decode_audio_frame(AVFrame *frame,
} }
} }
/* Decode the audio frame stored in the temporary packet. /* Send the audio frame stored in the temporary packet to the decoder.
* The input audio stream decoder is used to do this. * The input audio stream decoder is used to do this. */
* If we are at the end of the file, pass an empty packet to the decoder if ((error = avcodec_send_packet(input_codec_context, &input_packet)) < 0) {
* to flush it. */ fprintf(stderr, "Could not send packet for decoding (error '%s')\n",
if ((error = avcodec_decode_audio4(input_codec_context, frame,
data_present, &input_packet)) < 0) {
fprintf(stderr, "Could not decode frame (error '%s')\n",
av_err2str(error)); av_err2str(error));
av_packet_unref(&input_packet);
return error; return error;
} }
/* If the decoder has not been flushed completely, we are not finished, /* Receive one frame from the decoder. */
* so that this function has to be called again. */ error = avcodec_receive_frame(input_codec_context, frame);
if (*finished && *data_present) /* If the decoder asks for more data to be able to decode a frame,
*finished = 0; * return indicating that no data is present. */
if (error == AVERROR(EAGAIN)) {
error = 0;
goto cleanup;
/* If the end of the input file is reached, stop decoding. */
} else if (error == AVERROR_EOF) {
*finished = 1;
error = 0;
goto cleanup;
} else if (error < 0) {
fprintf(stderr, "Could not decode frame (error '%s')\n",
av_err2str(error));
goto cleanup;
/* Default case: Return decoded data. */
} else {
*data_present = 1;
goto cleanup;
}
cleanup:
av_packet_unref(&input_packet); av_packet_unref(&input_packet);
return 0; return error;
} }
/** /**
@ -538,7 +553,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
AVFrame *input_frame = NULL; AVFrame *input_frame = NULL;
/* Temporary storage for the converted input samples. */ /* Temporary storage for the converted input samples. */
uint8_t **converted_input_samples = NULL; uint8_t **converted_input_samples = NULL;
int data_present; int data_present = 0;
int ret = AVERROR_EXIT; int ret = AVERROR_EXIT;
/* Initialize temporary storage for one input frame. */ /* Initialize temporary storage for one input frame. */
@ -551,7 +566,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
/* If we are at the end of the file and there are no more samples /* If we are at the end of the file and there are no more samples
* in the decoder which are delayed, we are actually finished. * in the decoder which are delayed, we are actually finished.
* This must not be treated as an error. */ * This must not be treated as an error. */
if (*finished && !data_present) { if (*finished) {
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
@ -637,7 +652,7 @@ static int64_t pts = 0;
* @param output_format_context Format context of the output file * @param output_format_context Format context of the output file
* @param output_codec_context Codec context of the output file * @param output_codec_context Codec context of the output file
* @param[out] data_present Indicates whether data has been * @param[out] data_present Indicates whether data has been
* decoded * encoded
* @return Error code (0 if successful) * @return Error code (0 if successful)
*/ */
static int encode_audio_frame(AVFrame *frame, static int encode_audio_frame(AVFrame *frame,
@ -656,31 +671,52 @@ static int encode_audio_frame(AVFrame *frame,
pts += frame->nb_samples; pts += frame->nb_samples;
} }
/* Encode the audio frame and store it in the temporary packet. /* Send the audio frame stored in the temporary packet to the encoder.
* The output audio stream encoder is used to do this. */ * The output audio stream encoder is used to do this. */
if ((error = avcodec_encode_audio2(output_codec_context, &output_packet, error = avcodec_send_frame(output_codec_context, frame);
frame, data_present)) < 0) { /* The encoder signals that it has nothing more to encode. */
if (error == AVERROR_EOF) {
error = 0;
goto cleanup;
} else if (error < 0) {
fprintf(stderr, "Could not send packet for encoding (error '%s')\n",
av_err2str(error));
return error;
}
/* Receive one encoded frame from the encoder. */
error = avcodec_receive_packet(output_codec_context, &output_packet);
/* If the encoder asks for more data to be able to provide an
* encoded frame, return indicating that no data is present. */
if (error == AVERROR(EAGAIN)) {
error = 0;
goto cleanup;
/* If the last frame has been encoded, stop encoding. */
} else if (error == AVERROR_EOF) {
error = 0;
goto cleanup;
} else if (error < 0) {
fprintf(stderr, "Could not encode frame (error '%s')\n", fprintf(stderr, "Could not encode frame (error '%s')\n",
av_err2str(error)); av_err2str(error));
av_packet_unref(&output_packet); goto cleanup;
return error; /* Default case: Return encoded data. */
} else {
*data_present = 1;
} }
/* Write one audio frame from the temporary packet to the output file. */ /* Write one audio frame from the temporary packet to the output file. */
if (*data_present) { if (*data_present &&
if ((error = av_write_frame(output_format_context, &output_packet)) < 0) { (error = av_write_frame(output_format_context, &output_packet)) < 0) {
fprintf(stderr, "Could not write frame (error '%s')\n", fprintf(stderr, "Could not write frame (error '%s')\n",
av_err2str(error)); av_err2str(error));
goto cleanup;
}
cleanup:
av_packet_unref(&output_packet); av_packet_unref(&output_packet);
return error; return error;
} }
av_packet_unref(&output_packet);
}
return 0;
}
/** /**
* Load one audio frame from the FIFO buffer, encode and write it to the * Load one audio frame from the FIFO buffer, encode and write it to the
* output file. * output file.
@ -816,6 +852,7 @@ int main(int argc, char **argv)
int data_written; int data_written;
/* Flush the encoder as it may have delayed frames. */ /* Flush the encoder as it may have delayed frames. */
do { do {
data_written = 0;
if (encode_audio_frame(NULL, output_format_context, if (encode_audio_frame(NULL, output_format_context,
output_codec_context, &data_written)) output_codec_context, &data_written))
goto cleanup; goto cleanup;