From patchwork Mon Apr 8 12:57:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2456539pzd; Mon, 8 Apr 2024 06:01:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXybhOaCvcHQ9/jPxN44bYZXvmmesGTfyD4nC1nhT5gFIshWuS06BlLYeNx7kBXHdNAELccOCnzecqciKTpbhd0y0s54xPYVNr47w== X-Google-Smtp-Source: AGHT+IGzUHjdeSoHeD06fw8TjTumPNVcLDMyZVd+n34Nc8sj9ZQ8O608C0XFKPSjGazo+eiN4uWO X-Received: by 2002:ac2:5612:0:b0:513:ebb5:d9b0 with SMTP id v18-20020ac25612000000b00513ebb5d9b0mr6982239lfd.52.1712581316424; Mon, 08 Apr 2024 06:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712581316; cv=none; d=google.com; s=arc-20160816; b=SemaW2lTsuSnmWoxGM/JLDFC0m9vcb9uoQ+v01ULZb7dAB7Bb81adwJAkU7eDmED2X KTjstN+dfHJ5Q9mngjawXriWxpoTGZ0SncUtOSA4d6L/DbUc3sUVKOqQBgpWSWE1biEj lgNLQWEQCpMcGGssciOfd/AIRJ5/ceI0L9LkpomdFLXzumNyt8u66HVH4/kwXD+j2Nl2 wMJkfw9dYB2XoI3U5sgiW8BMM21khL5lBPAvYnTgArObGQ7ITVCpr7WhlFJGvCtUtrod DMPk4TJ9/1eAoq0CS+6JNJ+6+0cC2DPAr8IHWdW4zWjS3B7JEvDD8Pykx5YzAoNTyrnu 0cNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:dkim-signature:delivered-to; bh=LME+B311ZHF8MhwEzm8ijZw4XzsTFU0SHkhEZysvENY=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=O0Fl0gekR356p1KkWcsWHuZ5qveFwK7p53d49NBJcCpGFOqLDHTXDWSNIaqSyovls9 AI8vdB7qF63KmvqeKQg8p1peMSnVKtPvVfRyVvE+Ld3rqebZeGMK4/vNkpFBKCi5/45K zVl5uNkRKVZ9V0Vn07iKcPvH9CQLVGp7KOvMRep/7OYu6hZdqfvViJbkbpKR1x1zxoD7 lMcVnx/bW1Y86jubPhcHd+5vDSs6vVWtfcqTwVSKhdQ1cCK6zBDWv3gxVdz65zXcwr2B u5NcDYywz28p+3UDsEXF1SsK6ctqbpasav+s4JE9qCJsY+rksG689hkayycL3s+aXBiD JY7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=a0qTeEIE; 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 d14-20020a1709067f0e00b00a51943cb794si3637019ejr.343.2024.04.08.06.01.55; Mon, 08 Apr 2024 06:01:56 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=a0qTeEIE; 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 9192068D2D9; Mon, 8 Apr 2024 16:00:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2F6668D16F for ; Mon, 8 Apr 2024 15:59:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712581195; bh=k6INEYxc0ZiXvX9FExKjWSZ3i/7SgcaWesIChSE/mcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a0qTeEIEheK/WrxVgiPpADsHJAUx9ziTGTsHkqb2/wBM6w7ICGkALmlLheONof/4y GBUJ0pZD8N3CoMiZaZm6yMw+42TOpfsucZGN5if6CBBlk4rti2/JHT6wAWIje7gSzI yeECiwaAFEu7D0dXZt9q86g0GJhlaWnckA4Sl9sg= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id DA97A47ADA; Mon, 8 Apr 2024 14:59:55 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 14:57:20 +0200 Message-ID: <20240408125950.53472-17-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125950.53472-1-ffmpeg@haasn.xyz> References: <20240408125950.53472-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 16/17] fftools/ffmpeg_filter: propagate codec yuv metadata to filters 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Xz9ljAbHy8s/ From: Niklas Haas To convert between color spaces/ranges, if needed by the codec properties. --- fftools/ffmpeg_filter.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 83259416a68..a40c6f381f2 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -193,6 +193,8 @@ typedef struct OutputFilterPriv { int width, height; int sample_rate; AVChannelLayout ch_layout; + enum AVColorSpace color_space; + enum AVColorRange color_range; // time base in which the output is sent to our downstream // does not need to match the filtersink's timebase @@ -208,6 +210,8 @@ typedef struct OutputFilterPriv { const int *formats; const AVChannelLayout *ch_layouts; const int *sample_rates; + const enum AVColorSpace *color_spaces; + const enum AVColorRange *color_ranges; AVRational enc_timebase; // offset for output timestamps, in AV_TIME_BASE_Q @@ -379,6 +383,12 @@ DEF_CHOOSE_FORMAT(sample_fmts, enum AVSampleFormat, format, formats, DEF_CHOOSE_FORMAT(sample_rates, int, sample_rate, sample_rates, 0, "%d", ) +DEF_CHOOSE_FORMAT(color_spaces, enum AVColorSpace, color_space, color_spaces, + AVCOL_SPC_UNSPECIFIED, "%s", av_color_space_name); + +DEF_CHOOSE_FORMAT(color_ranges, enum AVColorRange, color_range, color_ranges, + AVCOL_RANGE_UNSPECIFIED, "%s", av_color_range_name); + static void choose_channel_layouts(OutputFilterPriv *ofp, AVBPrint *bprint) { if (av_channel_layout_check(&ofp->ch_layout)) { @@ -607,6 +617,8 @@ static OutputFilter *ofilter_alloc(FilterGraph *fg) ofilter->graph = fg; ofp->format = -1; ofp->index = fg->nb_outputs - 1; + ofp->color_space = AVCOL_SPC_UNSPECIFIED; + ofp->color_range = AVCOL_RANGE_UNSPECIFIED; return ofilter; } @@ -789,6 +801,24 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->formats = mjpeg_formats; } } + if (ost->enc_ctx->colorspace != AVCOL_SPC_UNSPECIFIED) { + ofp->color_space = ost->enc_ctx->colorspace; + } else { + ret = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_COLOR_SPACE, 0, + (const void **) &ofp->color_spaces); + if (ret < 0) + return ret; + } + if (ost->enc_ctx->color_range != AVCOL_RANGE_UNSPECIFIED) { + ofp->color_range = ost->enc_ctx->color_range; + } else { + ret = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_COLOR_RANGE, 0, + (const void **) &ofp->color_ranges); + if (ret < 0) + return ret; + } fgp->disable_conversions |= ost->keep_pix_fmt; @@ -1347,6 +1377,8 @@ static int configure_output_video_filter(FilterGraph *fg, AVFilterGraph *graph, av_assert0(!ost->keep_pix_fmt || (!ofp->format && !ofp->formats)); av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); choose_pix_fmts(ofp, &bprint); + choose_color_spaces(ofp, &bprint); + choose_color_ranges(ofp, &bprint); if (!av_bprint_is_complete(&bprint)) return AVERROR(ENOMEM); if (bprint.len) { @@ -1777,6 +1809,8 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt) ofp->width = av_buffersink_get_w(sink); ofp->height = av_buffersink_get_h(sink); + ofp->color_space = av_buffersink_get_colorspace(sink); + ofp->color_range = av_buffersink_get_color_range(sink); // If the timing parameters are not locked yet, get the tentative values // here but don't lock them. They will only be used if no output frames