From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 02A2040E9C for ; Mon, 11 Apr 2022 07:31:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3769E68B37F; Mon, 11 Apr 2022 10:31:10 +0300 (EEST) Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BA9868B0AD for ; Mon, 11 Apr 2022 10:31:03 +0300 (EEST) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KcLBG4plpz9sTX for ; Mon, 11 Apr 2022 09:31:02 +0200 (CEST) Message-ID: Date: Mon, 11 Apr 2022 13:00:46 +0530 MIME-Version: 1.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <8fd28808-07f8-9458-b032-8792c67a38fd@gmail.com> From: Gyan Doshi In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH v2 1/2] doc/examples/transcode_aac: Don't ignore last encoded frame X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2022-04-11 12:16 pm, Paul B Mahol wrote: > On Tue, Mar 22, 2022 at 6:47 PM Andreas Unterweger > wrote: > >> The last encoded frame is now fetched on EOF. It was previously left in >> the encoder and caused a "1 frame left in queue" warning. >> >> Signed-off-by: Andreas Unterweger >> --- >> doc/examples/transcode_aac.c | 22 +++++++++++----------- >> 1 file changed, 11 insertions(+), 11 deletions(-) >> >> diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c >> index 9102e55f16..c9b93f6439 100644 >> --- a/doc/examples/transcode_aac.c >> +++ b/doc/examples/transcode_aac.c >> @@ -377,6 +377,8 @@ static int decode_audio_frame(AVFrame *frame, >> if (error < 0) >> return error; >> >> + *data_present = 0; >> + *finished = 0; >> /* Read one audio frame from the input file into a temporary packet. >> */ >> if ((error = av_read_frame(input_format_context, input_packet)) < 0) >> { >> /* If we are at the end of the file, flush the decoder below. */ >> @@ -555,7 +557,7 @@ static int read_decode_convert_and_store(AVAudioFifo >> *fifo, >> AVFrame *input_frame = NULL; >> /* Temporary storage for the converted input samples. */ >> uint8_t **converted_input_samples = NULL; >> - int data_present = 0; >> + int data_present; >> int ret = AVERROR_EXIT; >> >> /* Initialize temporary storage for one input frame. */ >> @@ -675,18 +677,17 @@ static int encode_audio_frame(AVFrame *frame, >> frame->pts = pts; >> pts += frame->nb_samples; >> } >> - >> + >> + *data_present = 0; >> /* Send the audio frame stored in the temporary packet to the >> encoder. >> * The output audio stream encoder is used to do this. */ >> error = avcodec_send_frame(output_codec_context, frame); >> - /* 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)); >> - goto cleanup; >> + /* Check for errors, but proceed with fetching encoded samples if the >> + * encoder signals that it has nothing more to encode. */ >> + if (error < 0 && error != AVERROR_EOF) { >> + fprintf(stderr, "Could not send packet for encoding (error '%s')\n", >> + av_err2str(error)); >> + goto cleanup; >> } >> >> /* Receive one encoded frame from the encoder. */ >> @@ -857,7 +858,6 @@ int main(int argc, char **argv) >> int data_written; >> /* Flush the encoder as it may have delayed frames. */ >> do { >> - data_written = 0; >> if (encode_audio_frame(NULL, output_format_context, >> output_codec_context, >> &data_written)) >> goto cleanup; >> -- >> 2.30.2 >> >> > LGTM. can someone apply this? Patch does not apply. May need to be manually rebased. Regards, Gyan _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".