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 782B445B33 for ; Wed, 17 May 2023 10:30:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE92C68C141; Wed, 17 May 2023 13:30:05 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 425B068BE3E for ; Wed, 17 May 2023 13:29:59 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0B9BF240177 for ; Wed, 17 May 2023 12:29:59 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 1zla6LF-wfXZ for ; Wed, 17 May 2023 12:29:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E812A2404EE for ; Wed, 17 May 2023 12:29:57 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id ED8C43A2278 for ; Wed, 17 May 2023 12:20:40 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 May 2023 12:20:27 +0200 Message-Id: <20230517102029.541-34-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517102029.541-1-anton@khirnov.net> References: <20230517102029.541-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 34/36] fftools/ffmpeg_dec: deduplicate code in decode_audio/video() 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- fftools/ffmpeg_dec.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 79e9c04fc1..4662d0a265 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -130,18 +130,13 @@ static void audio_ts_process(InputStream *ist, AVFrame *frame) static int decode_audio(InputStream *ist, AVFrame *decoded_frame) { - int ret, err = 0; - ist->samples_decoded += decoded_frame->nb_samples; - ist->frames_decoded++; audio_ts_process(ist, decoded_frame); ist->nb_samples = decoded_frame->nb_samples; - err = send_frame_to_filters(ist, decoded_frame); - av_frame_unref(decoded_frame); - return err < 0 ? err : ret; + return 0; } static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *frame) @@ -197,8 +192,6 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr static int decode_video(InputStream *ist, AVFrame *frame) { - int ret = 0, err = 0; - // The following line may be required in some cases where there is no parser // or the parser does not has_b_frames correctly if (ist->par->video_delay < ist->dec_ctx->has_b_frames) { @@ -229,12 +222,10 @@ static int decode_video(InputStream *ist, AVFrame *frame) if(ist->top_field_first>=0) frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; - ist->frames_decoded++; - if (ist->hwaccel_retrieve_data && frame->format == ist->hwaccel_pix_fmt) { - err = ist->hwaccel_retrieve_data(ist->dec_ctx, frame); + int err = ist->hwaccel_retrieve_data(ist->dec_ctx, frame); if (err < 0) - goto fail; + return err; } frame->pts = frame->best_effort_timestamp; @@ -275,11 +266,7 @@ static int decode_video(InputStream *ist, AVFrame *frame) if (ist->st->sample_aspect_ratio.num) frame->sample_aspect_ratio = ist->st->sample_aspect_ratio; - err = send_frame_to_filters(ist, frame); - -fail: - av_frame_unref(frame); - return err < 0 ? err : ret; + return 0; } static void sub2video_flush(InputStream *ist) @@ -485,6 +472,13 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof) "data for stream #%d:%d\n", ist->file_index, ist->st->index); exit_program(1); } + + ist->frames_decoded++; + + ret = send_frame_to_filters(ist, frame); + av_frame_unref(frame); + if (ret < 0) + exit_program(1); } } -- 2.39.2 _______________________________________________ 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".