From patchwork Tue Apr 23 12:39:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 48236 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:2d06:b0:1a9:af23:56c1 with SMTP id tw6csp395734pzb; Tue, 23 Apr 2024 05:40:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDvSv9jsfduwj2j0Quk1zgrRSZ6IFQA+pYWYHco2+q1qtrfasDFN96ytNLSOe4lNfZmB2yMWbmWqNqjMphxle2aVfOSAvGSuX4UQ== X-Google-Smtp-Source: AGHT+IGY3e9ji58+M+3YLdPL/MiPpX664CFbayBEG9B89JkCRHl+E7G/MeiabanGvSdARMstAKKj X-Received: by 2002:a2e:82cd:0:b0:2dc:d26e:5e7 with SMTP id n13-20020a2e82cd000000b002dcd26e05e7mr7565477ljh.0.1713876002002; Tue, 23 Apr 2024 05:40:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713876001; cv=none; d=google.com; s=arc-20160816; b=dPQoLnZIeYFdMfyZuv7i3PejHDNCBbaFY0rvZu1X2SRxJaeqfnCkZ4rdLgTS/QJedt 1zDg/buqo3MKxdIqTeEqU+b2LB552OJuO2XxojbsGirAix/ZxVRIjBSIjGjutWfmUvL9 IhkaE8nSP6ySsUvgE/e6QPLABZk8bdcNEj4qsJCAogH8mYIGClbK3twxZIpwdhKY3OVs 3VqTFxwK9R5qeAbtifoYSbSTTUSGtg2WFMDYJ+L3Byy32P6iaQrJ0r3eTJYtX6kVWxnJ btkjQqZAJF4IiuJyAuEivPDfhiVVOiGcK7j9ksCyVYdOLLGFUaIqF99lw0Mll2EedUBV QHYw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=gtUdoP2Za6X2i3gWN+WwewunHyxRYJJadKA4wWY7Xi0=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=iy/uhVroIuT81P5G2RTzqXSVBqRlHtW7EPVoTSIBDYG5NXESvnSc7i+9ihndh3QY3k FYYqBeClcyiBjj6cAowkgUL49VnBBPCxHdt7WUFiMZYazij5E7GN2rpFhG147XZOX7T4 6wMqJ+/8wMC1Ox+nef2ih7Ltg6A7qfE7BpnAhpglE+TO1RV3vtcKhKdkTi+9kfLXl2xw pnE0VNtD6fTh2sB987fBXD8sZUror4EldcN32+CSSMNDnarrLbN6F/G6zGlGooWHYkoS M6bN78zzhSqJH3YMidZ8gx2hyxTJOcbGhYRVxTZD50Zw9wIMJIyzGDgr4eY3vcIyPqGk zURw==; 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=UYdcENiX; 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 p24-20020aa7d318000000b00572150d36efsi1668205edq.125.2024.04.23.05.40.01; Tue, 23 Apr 2024 05:40:01 -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=UYdcENiX; 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 9F1B368D373; Tue, 23 Apr 2024 15:39:57 +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 28D0C68CE38 for ; Tue, 23 Apr 2024 15:39:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1713875990; bh=N7nvh5zUw+I7HrmJX0xSJ97ecH1Z/8gK1lBqsKnCCiE=; h=From:To:Cc:Subject:Date:From; b=UYdcENiXo9tnubJ4vvvuKh7trz7MIh90kDdtGBtA3f3D9q4x9zgTzFGa0Xsc1JCmV TiGj1OomYZIb+b+mKIoC8N1Y8deE0LY9oZOf20AQP0lO5HMpsLyJ5slyOct1gVPZj1 2ZkL1ebhfQC5dfConpEsM+uxt/dTCsg/uiDSe1NI= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 4B9AC40356; Tue, 23 Apr 2024 14:39:50 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Apr 2024 14:39:47 +0200 Message-ID: <20240423123947.19112-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/f_sidedata: synchronize with side data list 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: hRgvEicS9ZS2 From: Niklas Haas Add all recently added frame data types, as well as the new name for DETECTION_BBOXES as an alias to the older DETECTION_BOUNDING_BOXES. --- libavfilter/f_sidedata.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index fe9607ed52..616fd0750c 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -71,8 +71,16 @@ static const AVOption filt_name##_options[] = { \ { "S12M_TIMECOD", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_S12M_TIMECODE }, 0, 0, FLAGS, .unit = "type" }, \ { "DYNAMIC_HDR_PLUS", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, 0, 0, FLAGS, .unit = "type" }, \ { "REGIONS_OF_INTEREST", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_REGIONS_OF_INTEREST }, 0, 0, FLAGS, .unit = "type" }, \ - { "DETECTION_BOUNDING_BOXES", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DETECTION_BBOXES }, 0, 0, FLAGS, .unit = "type" }, \ + { "VIDEO_ENC_PARAMS", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_VIDEO_ENC_PARAMS }, 0, 0, FLAGS, .unit = "type" }, \ { "SEI_UNREGISTERED", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_SEI_UNREGISTERED }, 0, 0, FLAGS, .unit = "type" }, \ + { "FILM_GRAIN_PARAMS", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_FILM_GRAIN_PARAMS }, 0, 0, FLAGS, .unit = "type" }, \ + { "DETECTION_BOUNDING_BOXES", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DETECTION_BBOXES }, 0, 0, FLAGS, .unit = "type" }, \ + { "DETECTION_BBOXES", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DETECTION_BBOXES }, 0, 0, FLAGS, .unit = "type" }, \ + { "DOVI_RPU_BUFFER", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DOVI_RPU_BUFFER }, 0, 0, FLAGS, .unit = "type" }, \ + { "DOVI_METADATA", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DOVI_METADATA }, 0, 0, FLAGS, .unit = "type" }, \ + { "DYNAMIC_HDR_VIVID", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DYNAMIC_HDR_VIVID }, 0, 0, FLAGS, .unit = "type" }, \ + { "AMBIENT_VIEWING_ENVIRONMENT","", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT}, 0, 0, FLAGS, .unit = "type" }, \ + { "VIDEO_HINT", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_VIDEO_HINT }, 0, 0, FLAGS, .unit = "type" }, \ { NULL } \ }