From patchwork Wed Jun 14 16:48:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp192064pzb; Wed, 14 Jun 2023 09:53:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6FzTcpVT+pCJm4oYRBCMRVLdl5HUj4nRcloV9s+gofvjsu1ZGQFcIAAdHyaX5XLXqKeheC X-Received: by 2002:ac2:5b11:0:b0:4f1:30cc:3dae with SMTP id v17-20020ac25b11000000b004f130cc3daemr11019789lfn.10.1686761597318; Wed, 14 Jun 2023 09:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686761597; cv=none; d=google.com; s=arc-20160816; b=jg2c0lRXWn477+jYzI8rEpDadxx44Q0/iLb2BJ5ML0EmVEPJvCvg3phw5yeTeAqf3y 7VbIhCCjLkSFTNIVzY//Jn92Jihq75EN1oA+sX10IP4AcK96lmj3YHDU7jnlT/RAcKeN gsFQcWQZiSTHvt6eRrfTPts1CwK6DfHHeH4THjfSqCgT78U576SaS4+kEt+Hr/J+yMFJ oxPrWyeXGBdD02EUvyh9OYwM08DcajUUY0tmgmSk9FdFVUo+p3+NtrWEYGoDIX1XG8Ls OuqXIrFKiB6FY8xzgSP77jD84e4E7jvVZnSVgpWuHm9YSLbYAxaCyHa2KWsk+p12LfL4 lY5g== 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=maCMY/56grh12sd5ZpU8muPpxmDYr9lRILugUVNtl4U=; b=cxt47vyhDURji1rRVsOQqUfhgrkfUckkl9PTZAjZZ1FYUlpcIl7ACgcz62qKD9DCgI 2g6CYoVfA4ql9mwSrm2kDwKkQ1lzlPRYMcnd1uKvnr8FJsinfhZTrHNdrjayVlQABcvM e4na6HjsCzsp7sZN/BHknD1YaSmhE8dthrvkqjb4D4mP3s1+arffkoNV25XbN6chsRgc D/pZYoMW+pR2XmDISsDrGplQx4ZRCt37VlDtSHwLRe4GB1IK/1wkIc160wR8kK+TSoAJ 1is0YqugJYRiydiVuKfwDg7BSjJPvYCDYs0bStdaS2HoywBwetT/UqxTh0W7zWcwRH+a JwCA== 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 y12-20020a50eb0c000000b005187d2ba7b5si1296161edp.261.2023.06.14.09.53.17; Wed, 14 Jun 2023 09:53:17 -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 8606668C515; Wed, 14 Jun 2023 19:50: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 EF13568C4B1 for ; Wed, 14 Jun 2023 19:50:00 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 08D912406CA for ; Wed, 14 Jun 2023 18:50:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 8q3f_37ZJqVo for ; Wed, 14 Jun 2023 18:49:59 +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 C9B762405B5 for ; Wed, 14 Jun 2023 18:49:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 85E823A07F4 for ; Wed, 14 Jun 2023 18:49:47 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jun 2023 18:48:56 +0200 Message-Id: <20230614164908.28712-9-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230614164908.28712-1-anton@khirnov.net> References: <20230614164908.28712-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/21] fftools/ffmpeg_dec: move InputStream.hwaccel_pix_fmt to Decoder 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: CFVvbfHX6h1B It is purely decoder-internal state. --- fftools/ffmpeg.h | 2 -- fftools/ffmpeg_dec.c | 8 ++++++-- fftools/ffmpeg_demux.c | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 2559225dd6..3c7e819507 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -393,8 +393,6 @@ typedef struct InputStream { char *hwaccel_device; enum AVPixelFormat hwaccel_output_format; - enum AVPixelFormat hwaccel_pix_fmt; - /* stats */ // number of frames/samples retrieved from the decoder uint64_t frames_decoded; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 85132050d8..586be83dc1 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -35,6 +35,8 @@ struct Decoder { AVFrame *frame; AVPacket *pkt; + enum AVPixelFormat hwaccel_pix_fmt; + // pts/estimated duration of the last decoded frame // * in decoder timebase for video, // * in last_frame_tb (may change during decoding) for audio @@ -79,6 +81,7 @@ static int dec_alloc(Decoder **pdec) dec->last_filter_in_rescale_delta = AV_NOPTS_VALUE; dec->last_frame_pts = AV_NOPTS_VALUE; dec->last_frame_tb = (AVRational){ 1, 1 }; + dec->hwaccel_pix_fmt = AV_PIX_FMT_NONE; *pdec = dec; @@ -272,7 +275,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) if(ist->top_field_first>=0) frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; - if (frame->format == ist->hwaccel_pix_fmt) { + if (frame->format == d->hwaccel_pix_fmt) { int err = hwaccel_retrieve_data(ist->dec_ctx, frame); if (err < 0) return err; @@ -537,6 +540,7 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof) static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat *pix_fmts) { InputStream *ist = s->opaque; + Decoder *d = ist->decoder; const enum AVPixelFormat *p; for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { @@ -561,7 +565,7 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat } } if (config && config->device_type == ist->hwaccel_device_type) { - ist->hwaccel_pix_fmt = *p; + d->hwaccel_pix_fmt = *p; break; } } diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 84c286dd65..1c6a5aab7b 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1149,8 +1149,6 @@ static void ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) if (!ist->hwaccel_device) report_and_exit(AVERROR(ENOMEM)); } - - ist->hwaccel_pix_fmt = AV_PIX_FMT_NONE; } ist->dec = choose_decoder(o, ic, st, ist->hwaccel_id, ist->hwaccel_device_type);