From patchwork Thu Apr 11 15:42:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 48012 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a83:b0:1a7:a0dc:8de5 with SMTP id zv3csp49789pzb; Thu, 11 Apr 2024 08:42:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUaAKO/q4QJyxAow48INjp7y8a8mc65/HWmy9PQcl/uVeJaQn66K2tUEPdJY1KC6jttbzzgCJJx/89qGPpukXrUMgpHvy/3/T8rvw== X-Google-Smtp-Source: AGHT+IF08/o7IZgigPbuqu0PtfbCWvOFWhD0fD/Omh0MTpOe5GR9VMDJ0F72tvLCADW2vFxCK0w9 X-Received: by 2002:a50:c05b:0:b0:56e:3e0c:968c with SMTP id u27-20020a50c05b000000b0056e3e0c968cmr108850edd.2.1712850167158; Thu, 11 Apr 2024 08:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712850167; cv=none; d=google.com; s=arc-20160816; b=qjfENNpWbb8HAhUnYSihD4nDWVQ00Tm0OqC/gIkce7nh/36Fx09Tkt6dxvOKGWLEa6 digg8TEltmVpmfpSxsdF5WfHVwPkSO9sYv6LocIqZfSQrkAtwwnkJclosHEX3k9m919y +CyoCZIilTUey0W0sc5DpzJ4DAVVfkB7NSlybGaV1saQJFQvUT6og3erBuCK6AdwY2IW TXaRtFTWMhNIiyM5CI8pGC2Q9iD8IHxrb/xhQWpeLC3syR61oZgIJgQrwdJBKRvLpjc5 QLSxUbUxUOxCDki+6yeeV+7ydFfI6JIDAmWPFlBdZLcS2aoEeiUpTubw7o3W9bcagwng hMNA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=vYtZav9htMAo1gtmIEgOjrLIHAIK/MkWhxm4nnlM62M=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=fb/34lyeG8BhYcV/zxK5LPCMDDshZWqMqKxUxcKaa/Ra6AaGYS4FgqVM17q7lrF1oh CmRIt/6LTYlHNhEc+CePAnZwXpc3Tw2wA66XxjBiYfGTO6oX6U5ea63hErdGk4d5gFl3 aAWn2v0+36EpKcEynG2qEMuHhlMbVeov0b2Kc7OqlqxTKfRmmTrB3Zab2Ff5iUTozMIe j4LCEMaeEOJMuB0TTwK/S0zvrN82wrafd4VNtTeCUI3v2cP4iFDJ7ZdtBkPMp000WoXU VQRSCQPlbRHahu5pwbPRrCTsdVwnvjtSk6j7sAy+67is5goQHL6SFPoiahQoL5ohO570 ML0w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=kWgUv3HB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i42-20020a0564020f2a00b0056e2cb204cbsi583776eda.571.2024.04.11.08.42.46; Thu, 11 Apr 2024 08:42:47 -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=@gmail.com header.s=20230601 header.b=kWgUv3HB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD25A68D1D1; Thu, 11 Apr 2024 18:42:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B959368C25D for ; Thu, 11 Apr 2024 18:42:37 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1e4149e7695so168805ad.0 for ; Thu, 11 Apr 2024 08:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712850155; x=1713454955; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=uyBdqIZwXsOMX30hDtz4Dv9jWBpcXgsM4WncInL0/xs=; b=kWgUv3HBjJrx+uz+PFdHaOHFkENAq7F+3LgklxVz1MNNG2nA3F2bb8IhL3u5vivlnk xxltUhbW1G/NoKqlUwYBPSS9IIwBCsA44CC5sRA5RcqK9TnVq20+wH+D9cvlyO8tDdg0 rgNRNoNLwohAfiXVZnl6HNI3QY9R6u1JXEUCv0PzoiZ1HHXH9K2KJ0O/MYue/4mfGUEZ T0OVHkecaCL1Fe2SqEYJuiZs+iINb3Oh5nkQiuL8fMqDXve2ZpsmsAo33T29r2lsScZt JVbC0aF5ng2zA9/vPdOIM+7vBTfvkYX+W3DNbiU6rCO5I8PDbIXhibNfjosrhT1hxx0g CPZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712850155; x=1713454955; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uyBdqIZwXsOMX30hDtz4Dv9jWBpcXgsM4WncInL0/xs=; b=EauF5d1YZy/IzntjLKOLr9/f7QZf1E/SXi0peoQinqj2Ysrv7ih/uBfExC7R2cz7nA I/j0lrUdFXJt7DPZmU072ozC7z7i8s6rakLvM0tVIJq+lfRqPo59JdgMtysVgOswLYVg dU2LgHbmwj6zxyd1jhp1RUGAdQrJIkqJYlcbc0wANFk/XHvT1aygaIjtCXd2IBCcb0bA XOSp9H9CDOm7tzP7FOz6K3v8iCeQw8PI5pw1zlqysvbGeLu5CprM2shE7UZ5rYoOZL8o WkMMpGAlGeFJ5GEDhV1QROMM8YL6E3OCyxzPboy0oMj+29/KXX5PyCsMZBOBos8XpIfJ tqSg== X-Gm-Message-State: AOJu0Yxr4PjBzf+sg+9fQVhWICEsMmFWCWFt84fNvqLL69e7WyS7wORk eeAa1fORXJHdssuC8bM+ROw07zftxILcDZxZ8YgoYE0T0SAz0i10A+9bXg== X-Received: by 2002:a17:903:2352:b0:1e5:86ba:88b5 with SMTP id c18-20020a170903235200b001e586ba88b5mr455562plh.7.1712850154702; Thu, 11 Apr 2024 08:42:34 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2-20020a170902cec200b001e403970ec0sm1307471plg.277.2024.04.11.08.42.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:42:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Apr 2024 12:42:23 -0300 Message-ID: <20240411154223.61774-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/frame: flag A53_CC side data type as allowing multiple entries 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: YC8PLjM1Z6fj Some interlaced h264 samples may export one caption per field. Signed-off-by: James Almer --- libavutil/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 0775e2abd9..fdac6f8ee2 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -30,7 +30,6 @@ static const AVSideDataDescriptor sd_props[] = { [AV_FRAME_DATA_PANSCAN] = { "AVPanScan" }, - [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 Closed Captions" }, [AV_FRAME_DATA_MATRIXENCODING] = { "AVMatrixEncoding" }, [AV_FRAME_DATA_DOWNMIX_INFO] = { "Metadata relevant to a downmix procedure" }, [AV_FRAME_DATA_AFD] = { "Active format description" }, @@ -55,6 +54,7 @@ static const AVSideDataDescriptor sd_props[] = { [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { "Ambient viewing environment", AV_SIDE_DATA_PROP_GLOBAL }, [AV_FRAME_DATA_SPHERICAL] = { "Spherical Mapping", AV_SIDE_DATA_PROP_GLOBAL }, [AV_FRAME_DATA_ICC_PROFILE] = { "ICC profile", AV_SIDE_DATA_PROP_GLOBAL }, + [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 Closed Captions", AV_SIDE_DATA_PROP_MULTI }, [AV_FRAME_DATA_SEI_UNREGISTERED] = { "H.26[45] User Data Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI }, };