From patchwork Wed Aug 3 13:58:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37114 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp459364pzb; Wed, 3 Aug 2022 07:01:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR4agAV184LEc1j92zFXlZMw4IfCG9H3jwn0YZvttIOxu7Te/s8CTzm+9dSkg9cHCH58i6a8 X-Received: by 2002:a17:907:6d16:b0:730:9955:4e30 with SMTP id sa22-20020a1709076d1600b0073099554e30mr8485813ejc.634.1659535315910; Wed, 03 Aug 2022 07:01:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659535315; cv=none; d=google.com; s=arc-20160816; b=vabCwFq8f4Q8cG69kDBdTC/YoHwZ7GP+s4Umq984ehcjXrxgIHQ3SSxjB31sqPgE9T nuWMducZgJb7MbOETn/0lbQlv/IIb0OJwQQ2L0aK57gg3xtoVhTAOX5Z8A6iZOtqMBS/ nmwf3pgKxrcJRTRhB3+bB1qbK3PLkmIJEUFbz35BGgLaYTxCEsMvdSkQaxfSSPuEo+nO 4wrJ9p4SCAuKMhcNuUIhMZw1aqrgSyCgHlQwWg2vRttjIR1YPWYnBqW+aH/KwNX0/8Wu q80Zfu7WDpEanNhi1yfUuv+KVVsxQWIzmrw6lh+tzecQsqxGONnQqvwhCMCpWNi6N2Bi yxyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=ShI+Bw/DMQhN9+uayEMdceLGfoeAOh744yPL3IRgMiM=; b=PfEZFPMAoR5uQ95CHgXacumxfB89JtTNninR8fgqx7Fb7SzU7EtC/hheegHbOMEx3r bV5GZjcu2suYA4RV3YrgqoJJU29jNL8ZVesxhNtapgDBEjB2ch81gBAPJSAsQXgdNBy8 Y1LoxhMlltEoXw3oA466faWbg27UsVZoGrFHgQU0cjWFxrJhBtQvsOVNK9tykl/c9BF4 CIzVBwkGhABmTeZvWQGVP0tms10KIlRkZlIbIn9u2LSOIr3Y0WqpWeFGkLOXGUn0Hvt8 93OXXKhZk9FJVBvqLeKibmzT9+f/X8j67ysxsIyUZAjl1lKA3DV4yj/Tzojqy5IFHws0 +l5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m18-20020a056402511200b0043d69430478si5167947edd.308.2022.08.03.07.01.55; Wed, 03 Aug 2022 07:01:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 665CF68B9A8; Wed, 3 Aug 2022 16:59:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D353768B878 for ; Wed, 3 Aug 2022 16:59:06 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 206352405F0 for ; Wed, 3 Aug 2022 15:59:06 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id WJ_8xSSDkB8Z for ; Wed, 3 Aug 2022 15:59:05 +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 1E0BB240688 for ; Wed, 3 Aug 2022 15:58:55 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 3F4B43A0656; Wed, 3 Aug 2022 15:58:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 15:58:39 +0200 Message-Id: <20220803135844.16662-20-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220803135844.16662-1-anton@khirnov.net> References: <20220803135844.16662-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/25] fftools/ffmpeg: move get_input_packet() to ffmpeg_demux.c 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KU8mNJDPC8mj Also rename it to use the ifile_* namespace. --- fftools/ffmpeg.c | 30 ++---------------------------- fftools/ffmpeg.h | 1 + fftools/ffmpeg_demux.c | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 37f52f0208..497a847101 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3610,32 +3610,6 @@ static int check_keyboard_interaction(int64_t cur_time) return 0; } -static int get_input_packet(InputFile *f, AVPacket **pkt) -{ - if (f->readrate || f->rate_emu) { - int i; - int64_t file_start = copy_ts * ( - (f->ctx->start_time != AV_NOPTS_VALUE ? f->ctx->start_time * !start_at_zero : 0) + - (f->start_time != AV_NOPTS_VALUE ? f->start_time : 0) - ); - float scale = f->rate_emu ? 1.0 : f->readrate; - for (i = 0; i < f->nb_streams; i++) { - InputStream *ist = input_streams[f->ist_index + i]; - int64_t stream_ts_offset, pts, now; - if (!ist->nb_packets || (ist->decoding_needed && !ist->got_output)) continue; - stream_ts_offset = FFMAX(ist->first_dts != AV_NOPTS_VALUE ? ist->first_dts : 0, file_start); - pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE); - now = (av_gettime_relative() - ist->start) * scale + stream_ts_offset; - if (pts > now) - return AVERROR(EAGAIN); - } - } - - return av_thread_message_queue_recv(f->in_thread_queue, pkt, - f->non_blocking ? - AV_THREAD_MESSAGE_NONBLOCK : 0); -} - static int got_eagain(void) { int i; @@ -3752,7 +3726,7 @@ static int process_input(int file_index) int disable_discontinuity_correction = copy_ts; is = ifile->ctx; - ret = get_input_packet(ifile, &pkt); + ret = ifile_get_packet(ifile, &pkt); if (ret == AVERROR(EAGAIN)) { ifile->eagain = 1; @@ -3777,7 +3751,7 @@ static int process_input(int file_index) if (ret < 0) av_log(NULL, AV_LOG_WARNING, "Seek to start failed.\n"); else - ret = get_input_packet(ifile, &pkt); + ret = ifile_get_packet(ifile, &pkt); if (ret == AVERROR(EAGAIN)) { ifile->eagain = 1; return ret; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 81356fd566..f983d077d9 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -710,6 +710,7 @@ int64_t of_filesize(OutputFile *of); AVChapter * const * of_get_chapters(OutputFile *of, unsigned int *nb_chapters); +int ifile_get_packet(InputFile *f, AVPacket **pkt); int init_input_threads(void); int init_input_thread(int i); void free_input_threads(void); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 66cb6ebd5f..1e95be349c 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -163,3 +163,29 @@ int init_input_threads(void) } return 0; } + +int ifile_get_packet(InputFile *f, AVPacket **pkt) +{ + if (f->readrate || f->rate_emu) { + int i; + int64_t file_start = copy_ts * ( + (f->ctx->start_time != AV_NOPTS_VALUE ? f->ctx->start_time * !start_at_zero : 0) + + (f->start_time != AV_NOPTS_VALUE ? f->start_time : 0) + ); + float scale = f->rate_emu ? 1.0 : f->readrate; + for (i = 0; i < f->nb_streams; i++) { + InputStream *ist = input_streams[f->ist_index + i]; + int64_t stream_ts_offset, pts, now; + if (!ist->nb_packets || (ist->decoding_needed && !ist->got_output)) continue; + stream_ts_offset = FFMAX(ist->first_dts != AV_NOPTS_VALUE ? ist->first_dts : 0, file_start); + pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE); + now = (av_gettime_relative() - ist->start) * scale + stream_ts_offset; + if (pts > now) + return AVERROR(EAGAIN); + } + } + + return av_thread_message_queue_recv(f->in_thread_queue, pkt, + f->non_blocking ? + AV_THREAD_MESSAGE_NONBLOCK : 0); +}