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 7F4BC45E6C for ; Thu, 13 Apr 2023 14:17:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8DE368BEBA; Thu, 13 Apr 2023 17:16:08 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB28068BE0A for ; Thu, 13 Apr 2023 17:16:02 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7A0482404F8 for ; Thu, 13 Apr 2023 16:16:02 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id o5qu4u-HZUhe for ; Thu, 13 Apr 2023 16:16:01 +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 A7B13240D03 for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 986CF3A038E for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 16:12:16 +0200 Message-Id: <20230413141223.17245-18-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230413141223.17245-1-anton@khirnov.net> References: <20230413141223.17245-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/25] fftools/ffmpeg: move do_streamcopy() to ffmpeg_mux 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: do_streamcopy() is muxing code, so this is a more appropriate place for this. The last uses of InputStream in it will be removed in following commits. --- fftools/ffmpeg.c | 81 +------------------------------------------- fftools/ffmpeg.h | 7 ++++ fftools/ffmpeg_mux.c | 76 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 80 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 30b42b4fde..92cc98b089 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -914,85 +914,6 @@ int ifilter_parameters_from_codecpar(InputFilter *ifilter, AVCodecParameters *pa return 0; } -/** - * @param dts predicted packet dts in AV_TIME_BASE_Q - */ -static void do_streamcopy(InputStream *ist, OutputStream *ost, - const AVPacket *pkt, int64_t dts) -{ - OutputFile *of = output_files[ost->file_index]; - int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; - int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase); - AVPacket *opkt = ost->pkt; - - av_packet_unref(opkt); - // EOF: flush output bitstream filters. - if (!pkt) { - of_output_packet(of, opkt, ost, 1); - return; - } - - if (!ost->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) && - !ost->copy_initial_nonkeyframes) - return; - - if (!ost->streamcopy_started) { - if (!ost->copy_prior_start && - (pkt->pts == AV_NOPTS_VALUE ? - dts < ost->ts_copy_start : - pkt->pts < av_rescale_q(ost->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base))) - return; - - if (of->start_time != AV_NOPTS_VALUE && dts < of->start_time) - return; - } - - if (of->recording_time != INT64_MAX && - dts >= of->recording_time + start_time) { - close_output_stream(ost); - return; - } - - if (av_packet_ref(opkt, pkt) < 0) - exit_program(1); - - opkt->time_base = ost->mux_timebase; - - if (pkt->pts != AV_NOPTS_VALUE) - opkt->pts = av_rescale_q(pkt->pts, pkt->time_base, opkt->time_base) - ost_tb_start_time; - - if (pkt->dts == AV_NOPTS_VALUE) { - opkt->dts = av_rescale_q(dts, AV_TIME_BASE_Q, opkt->time_base); - } else if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { - int duration = av_get_audio_frame_duration2(ist->par, pkt->size); - if(!duration) - duration = ist->par->frame_size; - opkt->dts = av_rescale_delta(pkt->time_base, pkt->dts, - (AVRational){1, ist->par->sample_rate}, duration, - &ist->filter_in_rescale_delta_last, opkt->time_base); - /* dts will be set immediately afterwards to what pts is now */ - opkt->pts = opkt->dts - ost_tb_start_time; - } else - opkt->dts = av_rescale_q(pkt->dts, pkt->time_base, opkt->time_base); - opkt->dts -= ost_tb_start_time; - - opkt->duration = av_rescale_q(pkt->duration, pkt->time_base, opkt->time_base); - - { - int ret = trigger_fix_sub_duration_heartbeat(ost, pkt); - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, - "Subtitle heartbeat logic failed in %s! (%s)\n", - __func__, av_err2str(ret)); - exit_program(1); - } - } - - of_output_packet(of, opkt, ost, 0); - - ost->streamcopy_started = 1; -} - static void check_decode_result(InputStream *ist, int *got_output, int ret) { if (*got_output || ret<0) @@ -1847,7 +1768,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo continue; } - do_streamcopy(ist, ost, pkt, ist->dts); + of_streamcopy(ist, ost, pkt, ist->dts); } return !eof_reached; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 8ec0f1b3f3..46b4614ec4 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -872,6 +872,13 @@ void of_enc_stats_close(void); * must be supplied in this case. */ void of_output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof); + +/** + * @param dts predicted packet dts in AV_TIME_BASE_Q + */ +void of_streamcopy(InputStream *ist, OutputStream *ost, + const AVPacket *pkt, int64_t dts); + int64_t of_filesize(OutputFile *of); int ifile_open(const OptionsContext *o, const char *filename); diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 40b439eea2..96ed50f73c 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -378,6 +378,82 @@ fail: } +void of_streamcopy(InputStream *ist, OutputStream *ost, + const AVPacket *pkt, int64_t dts) +{ + OutputFile *of = output_files[ost->file_index]; + int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; + int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase); + AVPacket *opkt = ost->pkt; + + av_packet_unref(opkt); + // EOF: flush output bitstream filters. + if (!pkt) { + of_output_packet(of, opkt, ost, 1); + return; + } + + if (!ost->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) && + !ost->copy_initial_nonkeyframes) + return; + + if (!ost->streamcopy_started) { + if (!ost->copy_prior_start && + (pkt->pts == AV_NOPTS_VALUE ? + dts < ost->ts_copy_start : + pkt->pts < av_rescale_q(ost->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base))) + return; + + if (of->start_time != AV_NOPTS_VALUE && dts < of->start_time) + return; + } + + if (of->recording_time != INT64_MAX && + dts >= of->recording_time + start_time) { + close_output_stream(ost); + return; + } + + if (av_packet_ref(opkt, pkt) < 0) + exit_program(1); + + opkt->time_base = ost->mux_timebase; + + if (pkt->pts != AV_NOPTS_VALUE) + opkt->pts = av_rescale_q(pkt->pts, pkt->time_base, opkt->time_base) - ost_tb_start_time; + + if (pkt->dts == AV_NOPTS_VALUE) { + opkt->dts = av_rescale_q(dts, AV_TIME_BASE_Q, opkt->time_base); + } else if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { + int duration = av_get_audio_frame_duration2(ist->par, pkt->size); + if(!duration) + duration = ist->par->frame_size; + opkt->dts = av_rescale_delta(pkt->time_base, pkt->dts, + (AVRational){1, ist->par->sample_rate}, duration, + &ist->filter_in_rescale_delta_last, opkt->time_base); + /* dts will be set immediately afterwards to what pts is now */ + opkt->pts = opkt->dts - ost_tb_start_time; + } else + opkt->dts = av_rescale_q(pkt->dts, pkt->time_base, opkt->time_base); + opkt->dts -= ost_tb_start_time; + + opkt->duration = av_rescale_q(pkt->duration, pkt->time_base, opkt->time_base); + + { + int ret = trigger_fix_sub_duration_heartbeat(ost, pkt); + if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, + "Subtitle heartbeat logic failed in %s! (%s)\n", + __func__, av_err2str(ret)); + exit_program(1); + } + } + + of_output_packet(of, opkt, ost, 0); + + ost->streamcopy_started = 1; +} + static int thread_stop(Muxer *mux) { void *ret; -- 2.39.1 _______________________________________________ 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".