From patchwork Fri Mar 22 23:31:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp237979pzb; Fri, 22 Mar 2024 16:31:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1NkbkViRlwV2p9V9KSP2IY9+uULn2WpRM9tYQgvDaFnpvggX69jB7+RT4AWP25MNlwby/JABZunHJPLIEF0rADgce9YemqjFxbg== X-Google-Smtp-Source: AGHT+IHxQ4gvNnG3zpWgZnw4UYDs/M51BKl8rxAcnXTYVls8oUCEVuBopVzsmAVc/TmUhyiPmJjz X-Received: by 2002:a50:9e65:0:b0:56b:eb93:3eab with SMTP id z92-20020a509e65000000b0056beb933eabmr547420ede.4.1711150319683; Fri, 22 Mar 2024 16:31:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711150319; cv=none; d=google.com; s=arc-20160816; b=yQBdEu7fb9dpJW6qpHBovfm+kCkwK3TZUMBuiXqrQLb27YxukwVb7ANh40iNNwjmMX ejveXT2PHGrcLAtbSoZs5qdeSjxniD/x3OkmKsu/7FeGqHIHHLma4Wf7Ru5nn3f/WukV /W7mTWzXghar2lqNbiLwjeQHU541O7eUaUkER0LI/CEAtJP7XJT+ktxECQrMeIncuHBZ Yx2skW+sIWVAD6Ra/Ba6NmzLAgvcQNe+Mc5s/heAsBkpABRr/96i60ktm/56KHOkMp3e ECNQNA3SbqHt5vQ/C5PqQh3mgtzBiSsczq+6E38bKIkJTY2MiFb2uqJT942EPZuArrUY Z4Jw== 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=WOEHMcluNQi9+/DQB2xzOTgmhufU+rZ/Nah6nCxu7d8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Qc1Jp8rtYRIfbCPofMkc5hDrnhrX32kFTKK3dDiKgddmaICEzIuUrgwuqTOpGdOyjp ++pwT8Zo6+dkWs5eTv+qbj5X1OAlLctaOhwKeDbIufKU9WA+v5AdX/QU81S2CHYfuYaa LoV+HYbUEeI1uetnhNnLfnZqLNCy7l0CX5ggWpNK1EHYJVdAwL2/agrzDNJE5zJDCgHB 5+qCMxVTvLiWmjvaG22vOegarKflneMsARZWb+VgDsW6Y48+1vYU+8Ei/JYb8x3n+FUI zAPxo3pncdZ4eJ3gOypU2K51c5Efauh/KaXx6wMwaiReX52cfJd8VY+TgBmmo4w/LSi3 TD9g==; 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="cx0XsL/O"; 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 g19-20020a056402091300b0056bb0f4b9aasi278432edz.246.2024.03.22.16.31.55; Fri, 22 Mar 2024 16:31:59 -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="cx0XsL/O"; 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 7171968D529; Sat, 23 Mar 2024 01:31:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8566C68D496 for ; Sat, 23 Mar 2024 01:31:46 +0200 (EET) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5ce2aada130so1717206a12.1 for ; Fri, 22 Mar 2024 16:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711150303; x=1711755103; 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=J2L0nFizXbgiDzCXyBqNYCVRC6bGX+saNNzsfditppk=; b=cx0XsL/Oq3+4Qu0iwGDW56zfFSv4JbrGq4Ngwr1rfuWOesCmU8472ycuq8JOBIr6CO SjU6QmXG65KdbW1IhiXNAZRTnMcEsPhUUJepDzgzni9Y2cPBxks1J4OjQzwXA2seYvta rAIbo/P5gc1y4SktIWK55k7WYTfysX7D3If8KPQUqhvvbqZgHYqQ/99mgOo+G7QCAZPO yIR1Lv7tu4QT5ejfbbuyMHrvxQokLDPHJkOBkA4C71W4oiO57wwn+8pGnVd3QobE0VB/ fcsrDSQanq3juxTzM97A2raCAOk8m5xukx/T6Sf50h9OKltxx2BzC4Yc1v7Kyrs7qcHk T30Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711150303; x=1711755103; 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=J2L0nFizXbgiDzCXyBqNYCVRC6bGX+saNNzsfditppk=; b=rMyEQWYP82cEGt6GGZ9svv3NGzYQxlEW/t13MrFkwKFvekaconyr7Q66va9yJLhg/O 1l9PS8RlQD76CWzsb9ArixczcaGOyaHC91wSwiTGM5SNusdxROFjTwMKr/FQlIOzqCvJ v5H1Cnswr85Ed8rpX9yeWtIu1Vaiu2QVzwL1yxHzHJD5AiLno1y+YxCfhlAwiZ+xKNoZ ZZXeIlM1fYoyeMe7GEdUgccgCKHRvr+FKQfs4iC02qV6+zJCGrU8CcB37TMFYkSIAVdi X8U+oWoAMeLxGK7KWefkScjzbsmP0O0TDC+bruDt5qwQP7w5TCE3igTxK4vQ+qKGC6Rx MikQ== X-Gm-Message-State: AOJu0YwZtnoQDF3iBWekTWUBOJy+Sa2Dk4flwccj04eScqboF8Qoelaw kpOJvQakHsWgOOZ3IAe3GU7i1hFv3/R2eNF9PXCZ0uU4sRBip42AoJdJ0v/F X-Received: by 2002:a17:90a:db54:b0:2a0:4008:2ac1 with SMTP id u20-20020a17090adb5400b002a040082ac1mr1117351pjx.26.1711150303337; Fri, 22 Mar 2024 16:31:43 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029d7e7b7b41sm6642890pjj.33.2024.03.22.16.31.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 16:31:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 20:31:25 -0300 Message-ID: <20240322233129.62994-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avutil/frame: add helper for adding side data w/ AVBufferRef to array 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: EbTfZ3WChjv3 Signed-off-by: James Almer --- Now taking ownership of the passed in buffer, as Anton suggested. libavutil/frame.c | 22 ++++++++++++++++++++++ libavutil/frame.h | 23 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index d7a32cdc92..0717d89711 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -782,6 +782,28 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, return ret; } +AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type, + AVBufferRef **buf, + unsigned int flags) +{ + AVFrameSideData *sd_dst = NULL; + + if (!sd || !buf || !nb_sd || (*nb_sd && !*sd)) + return NULL; + + if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) + remove_side_data(sd, nb_sd, type); + + sd_dst = add_side_data_from_buf(sd, nb_sd, type, *buf); + if (!sd_dst) + return NULL; + + *buf = NULL; + + return sd_dst; +} + int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 373866c600..e3733ce928 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1021,6 +1021,29 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, size_t size, unsigned int flags); +/** + * Add a new side data entry to an array from an existing AVBufferRef. + * + * @param sd pointer to array of side data to which to add another entry, + * or to NULL in order to start a new array. + * @param nb_sd pointer to an integer containing the number of entries in + * the array. + * @param type type of the added side data + * @param buf Pointer to AVBufferRef to add to the array. On success, + * the ownership of the AVBufferRef is transferred to the frame + * and *buf is set to NULL. + * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. + * + * @return newly added side data on success, NULL on error. In case of + * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching + * AVFrameSideDataType will be removed before the addition is + * attempted. + */ +AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type, + AVBufferRef **buf, + unsigned int flags); + /** * Add a new side data entry to an array based on existing side data, taking * a reference towards the contained AVBufferRef. From patchwork Fri Mar 22 23:31:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp238013pzb; Fri, 22 Mar 2024 16:32:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQoQVR3mAt01aII6c9yV5xdTGNGsXAPkCESCnplospejVeeF4OkN9HHRm2TwUhYEakHRmzP6j/F3CwKg0sIzDtnw4kWCr21ycwiA== X-Google-Smtp-Source: AGHT+IH1R5MCWv6i3jiRYo2OPsOFzCCtCGXBpWL5JU947vapGCAYhbOED4aSOzCmyGnL7mEhorFn X-Received: by 2002:a50:d4cf:0:b0:565:e610:c358 with SMTP id e15-20020a50d4cf000000b00565e610c358mr538646edj.38.1711150325185; Fri, 22 Mar 2024 16:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711150325; cv=none; d=google.com; s=arc-20160816; b=YH2rvwuYVktSdIclksrURxiUC/9XAcHBuIbdwh6ndHlLku15zjSTErhtTWFW8X8497 G6RU9XI5pPcf4F7gUTa1X601IOfWmRjxZ7+dyqRS5o/UFBWQyh6VLYIjoMsnLdvAIYXV tew/QbjcEez4ueTmsnW5G8LD5Ni8qaEYqr4VjmZ3O1N6QRJuImVEwPrpXVjh1rylUw++ xTciD7RcagoTNrSj+sa6vyZ1nGMq+rY9uuiU08fD3IdehfoH1fpBzb02sy7mHBWKUDZ5 4ZqJKeIkvJ+seFwkCLJQ7QGNFN5TFNtjRdJvMNhEAdgHp90OhBakjjWZlysL3iwweZYW b6Mw== 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:dkim-signature:delivered-to; bh=z1H9C9w67IoGFu/y5q1k9POU3ta81ayrmBXgQYLu50o=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OquOFLrfoXeEhTCKKgcUyycY1+jgsgxvyQzOcp6FQSmoPTnESDL32M5fce7M9wLWjh PimaO6nAZSl3mhz2oNmZjRFNGqACQ3BpjN2qsCswv/n+x59rnoG208qx8o+L8N6RabHc PQGGQ9ooKeXSWmTNUfTAKcyhxhAx+B8xJb0OmoN929KcvABVjzybG64Y/awB4L2Fnigg dBIUknWXWP1LnDs2TJZviE8FsMnpz39T4HJ5M91wHlzofaa0fZi4Zfhz756Z5Rjudpf6 yDEjbTi4oI6sVCMbIAidki4VVpnDazqjGmaa4NsF84v0XaRKIto+dGrfkJs32MkPXVv0 f4jw==; 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=IVEGLZWL; 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 n7-20020a509347000000b005687127cdeesi278822eda.557.2024.03.22.16.32.04; Fri, 22 Mar 2024 16:32:05 -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=IVEGLZWL; 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 9038568D50D; Sat, 23 Mar 2024 01:31:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE79768D52A for ; Sat, 23 Mar 2024 01:31:47 +0200 (EET) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-29de2dd22d8so1571229a91.2 for ; Fri, 22 Mar 2024 16:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711150305; x=1711755105; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=E9r46w9GXd5ijcdjY4utbFE/RzM+BslgN4WHutJ2++Q=; b=IVEGLZWL9zhKLesicgyJ1dCP5bbD9wdMJu1htCqp9sjMXCMynWkkP6Ivi54lVphWtO jCIshFfOJELmTULS8TKT311EQL8rb/l6WY+WXkcbPv+3KYQpsWmhZdy9Teilb/o16eSL Wz5Pb5QL0m8eJJbEAohFiFUwvy+4mVi/GSBYOu/bHCcUKB9cSC2e+Zau5e/bVLPLFXj3 uKbZU8A2AdOTbppsxzMuvIuWUcg2GrhfCF7AsW8hULpT50qLKU/Bq6rgIE9mBpY5PdwR 29Y68oqSVWUB2j0RpmjCyiKE3IjQyKtWuvue2BXwcFUsQfrveFZQEmlFWnM4nv+hE+sX 0l+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711150305; x=1711755105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E9r46w9GXd5ijcdjY4utbFE/RzM+BslgN4WHutJ2++Q=; b=IL/miZ8jYfXPQOFRdhcbnUz2dNbL22uPGVW+N1KxVfLkn1OTOJhf3qfUs2MUuX2kIP 00J7yHV/oQ1NkEtyE04+cg1RAqcXO97UdStpHa4qngrrYlRShh0uIRtCKiXL6lQbTl+r ZypAixkFqr/M519Yj4won9pUd2ETh2V8Yrz1GQrQIo1F6G/jbBIoWpqsw7Z5CbO4FN6M HEfFZn8a0aGL2W7SknoPiGnPe+i0BJ5JfQGbUdOiFkeSTP1owE6bUwPw8nrHItlyBlUR mSb1dNAC+M7Qsah4mDQkcWfIb/kqotp5cHSFwi43ZKr3LTGQGIi5D759ufuva37UCepk TrPA== X-Gm-Message-State: AOJu0YxNsh9oGaHwU5d8Sjpu9kyaKEb5fSihBrBDrfvy4o3Uqj3n89NU p76fJHPOG3QP6nONwL+vsJr3Jcxr3/xHm6yBFY0kuZbaA42hRzuaS1Yv84iE X-Received: by 2002:a17:90a:bc8e:b0:29c:5b1b:f75c with SMTP id x14-20020a17090abc8e00b0029c5b1bf75cmr957527pjr.47.1711150305163; Fri, 22 Mar 2024 16:31:45 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029d7e7b7b41sm6642890pjj.33.2024.03.22.16.31.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 16:31:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 20:31:26 -0300 Message-ID: <20240322233129.62994-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240322233129.62994-1-jamrial@gmail.com> References: <20240322233129.62994-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avutil/frame: add helper to remove side data of a given type from an array 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: C3sKkdntFfq/ Signed-off-by: James Almer --- libavutil/frame.c | 6 ++++++ libavutil/frame.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 0717d89711..3e225ce5a4 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -847,6 +847,12 @@ const AVFrameSideData *av_frame_side_data_get_c(const AVFrameSideData * const *s return NULL; } +void av_frame_side_data_remove(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type) +{ + remove_side_data(sd, nb_sd, type); +} + AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, enum AVFrameSideDataType type) { diff --git a/libavutil/frame.h b/libavutil/frame.h index e3733ce928..671f75698c 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1093,6 +1093,11 @@ const AVFrameSideData *av_frame_side_data_get(AVFrameSideData * const *sd, nb_sd, type); } +/** + * Remove and free all side data instances of the given type from an array. + */ +void av_frame_side_data_remove(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type); /** * @} */ From patchwork Fri Mar 22 23:31:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47343 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp238053pzb; Fri, 22 Mar 2024 16:32:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXMdAH3jUJjDy7CHi/wsqjS4qJi8qf3w+Gi6YRNS30SsK0G01MvaUGcW1RNfETKXP561v3T6nvA9x81wJ4AwnrD21oItQ4y5x/FjQ== X-Google-Smtp-Source: AGHT+IG87A5H5bECedQfVIL5CVMxee7xhZk7nO27WmddWHBPm+pVe5wnLc6VDN/3ZKYYnWYumEnj X-Received: by 2002:a2e:8055:0:b0:2d6:bb62:1fca with SMTP id p21-20020a2e8055000000b002d6bb621fcamr624157ljg.26.1711150333129; Fri, 22 Mar 2024 16:32:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711150333; cv=none; d=google.com; s=arc-20160816; b=vIztQwKl1WtdvHDGr0zvv5YbxBdrrAwAfw3/TA9WUtVzW6cJ6OdRbvsWeyMoMPIh0C Ze5WlX5GE104ykFzhF0U6vWHA/FEe0Rkf9782whvv+PpSwqL5yKB7pYV7/wuvmMTuMu6 MibAknfwZp9U5+MGJ+gAS4f59ATlvEkBrEHMTxAwehJbdyN08mMtuX6nXOsjgF3qRDpI QSoJ7u/Ngc1I0mtt5OPzNBtA4WffWPJPOgw/PI+y+8tZAc0t20JIpjjLURsTnLKgYZ2E +49ATzdjMXrmdg5UdH6ZRPz7AkeQf4D7sd8AsAkgJ+e2xhWndd8zf7G8cu/A2K0b88qo m26w== 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:dkim-signature:delivered-to; bh=VxU1ItF8LyqtxVTuI5jMO5NWiQlysJeZnKsQ7BiKSnc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GulRVC9hVWFfnE5HU0BYN/MVP0+iWROIlqtE8Ziks8V3wl2uObxgLohqgB4AdrdGGe A7+Pyk92hYmYunX/2LYbBxMDPk23D/rNQa32gnrnEdwjlgBNoEdc7RfIJ0zdu3FR5oZW hS870ycqq9WWWB03FLSGX41FRgqjcA0MaV2TtQUuXk+4gvJKr6OdIuaGIi4ZVVIcXhaK GwfkRgsfqk20hsWPd8MBpz+u08kVvi6fyIlzDR+tdZg0BneqeRelE28XHnXDrZDn6FlE IDz41AfeF+fCNkj06TDJDo4UQKdFcTFJK/dlAQI0KcqmLWNWh9R+lWUddq7e+agSLg/7 mFew==; 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=bDvbkaUx; 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 dk10-20020a0564021d8a00b0056bd7f3fcf3si272122edb.624.2024.03.22.16.32.12; Fri, 22 Mar 2024 16:32:13 -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=bDvbkaUx; 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 B124968D576; Sat, 23 Mar 2024 01:31:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48ED968D50D for ; Sat, 23 Mar 2024 01:31:49 +0200 (EET) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6e6ca2ac094so2316702b3a.0 for ; Fri, 22 Mar 2024 16:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711150307; x=1711755107; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1uQMWq6P4ssIQk1TVdIDJPalkdBu2cfzLwJH9YIwCqg=; b=bDvbkaUxspki7W4DZ4w4GC1uzr+EvyZQ/A8VsXccRSmPtv6zqKSe7Ja+CyUb56f6xF eIHm8fhGxqbzyjrJ8f6SYVJGbfz0yJlNQ3TQfTVkBLbzlvFCO09rAQzy94viQp48KQIY wTVUOrE1c/qW1iu4Xvs0yo7b1/uB9GHouEajBGknxiZETU41IQpQPKpIZICscx6K89Zi GWFTzgz7iTkZNVvW45b7Pb/taretQUvfs16Oebj/DpQs1DIcEq6TdoSdeox00yNqp7FP RT1HhHkFdo1L3XeGo4nZqjk12FCYd6UzX8TZ8A2E9vjYjJoBBoC+Il7B1470d7cST42V nVIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711150307; x=1711755107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1uQMWq6P4ssIQk1TVdIDJPalkdBu2cfzLwJH9YIwCqg=; b=D0Jr2T9sonAzSN7Qrqma+Ng5bZ6IvrUWSKuukJ2HXZEyHORv2FUBg9cfEZ+N5LkaMv JS0AXo2Xq9rSc/Rqo6uHjd9oXQWhWx00hEd3U7G6YxmOJwn/MCj4gEvYfIcEOLyL9sVc TJ7QQUxYnehAnNI2qloeh2pMWHfhJfU/D5pGqzN0vwSjbFf/iD05bQWgvAnyR4GTmxHS wv90ICYc0ikHriAcjV0DJKU9F2eujxvo/w8SRq9JXru0eIYBbVNxM4HtODcGZtyWrzr6 82HH4VjZEevPPv87ygEAv1M4esO6zoywuv23NQkL37URD8PegkI8dnz5DJWSFa0ja7et XI4w== X-Gm-Message-State: AOJu0Yy6crCbloCftoMvCKCPiaoI0ZmM5Z2lgs/JhqOlFw8VFhiyFbRD 2I1XMR+KQvSI41CecodI0mjrIFVTX2FYPZ7Q9WIeq8KEvqdFwYddlRYs9f9a X-Received: by 2002:a05:6a20:1e4d:b0:1a3:6462:798c with SMTP id cy13-20020a056a201e4d00b001a36462798cmr863586pzb.61.1711150306695; Fri, 22 Mar 2024 16:31:46 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029d7e7b7b41sm6642890pjj.33.2024.03.22.16.31.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 16:31:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 20:31:27 -0300 Message-ID: <20240322233129.62994-3-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240322233129.62994-1-jamrial@gmail.com> References: <20240322233129.62994-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avutil/mastering_display_metadata: add a new allocator function that returns a size 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: JJaucXdF3Q9g av_mastering_display_metadata_alloc() is not useful in scenarios where you need to know the runtime size of AVMasteringDisplayMetadata. Signed-off-by: James Almer --- Could also name it av_mastering_display_metadata_alloc2() libavutil/mastering_display_metadata.c | 13 +++++++++++++ libavutil/mastering_display_metadata.h | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c index 6069347617..ea41f13f9d 100644 --- a/libavutil/mastering_display_metadata.c +++ b/libavutil/mastering_display_metadata.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include @@ -29,6 +30,18 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void) return av_mallocz(sizeof(AVMasteringDisplayMetadata)); } +AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size) +{ + AVMasteringDisplayMetadata *mastering = av_mallocz(sizeof(AVMasteringDisplayMetadata)); + if (!mastering) + return NULL; + + if (size) + *size = sizeof(*mastering); + + return mastering; +} + AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame) { AVFrameSideData *side_data = av_frame_new_side_data(frame, diff --git a/libavutil/mastering_display_metadata.h b/libavutil/mastering_display_metadata.h index c23b07c3cd..52fcef9e37 100644 --- a/libavutil/mastering_display_metadata.h +++ b/libavutil/mastering_display_metadata.h @@ -77,6 +77,15 @@ typedef struct AVMasteringDisplayMetadata { */ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void); +/** + * Allocate an AVMasteringDisplayMetadata structure and set its fields to + * default values. The resulting struct can be freed using av_freep(). + * + * @return An AVMasteringDisplayMetadata filled with default values or NULL + * on failure. + */ +AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size); + /** * Allocate a complete AVMasteringDisplayMetadata and add it to the frame. * From patchwork Fri Mar 22 23:31:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47344 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp238116pzb; Fri, 22 Mar 2024 16:32:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXboZkYuO+kRKBsVafMLpuxIbo+5uIZ8LxBHOJo5VUzfdzr1Qxfbrzy79NefGUx48xulR/7JB1BLRmVZaJE+azQmwlGDaggOP0lyg== X-Google-Smtp-Source: AGHT+IGVfN+y+H1d/5hRR8rsAfWiyQbtZKj/PnHWvvYe4Sb6DPCGYzuGbLurXnxzz/Q6TBuEk1IC X-Received: by 2002:aa7:c546:0:b0:56b:f5ae:d626 with SMTP id s6-20020aa7c546000000b0056bf5aed626mr463279edr.20.1711150341681; Fri, 22 Mar 2024 16:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711150341; cv=none; d=google.com; s=arc-20160816; b=0Sj/iXsSc+7SQ5zRzBipHThlRjv1r3vnv6m8f4AtKVsRnEPI55IO7NlQbA3uegV9b8 S2iBUZ1p8LPmi0w/LlkZXDZtDnAwLOfW6OuG+SLoCo53M7jSi1fQSrHFecrUh9r5fqn4 vk6KY2jbHjLKDvEzrdsVJin7GyidbLID1Z6bvIk/laEEtWDpJJKnAyF03sDLIIqjmfZ2 lPpFHZZ7GRjX0vr9xytG+jjgz+gAoWZGS8yjp3jGwQr6p+VBwqjXFWnfcfIDcPXbYvRQ xARViPZtRvNyQnITMLsFffxD01+wda/vUadn8yF8JLtcFlYBKNnUv3avNdTMC3eSrcdO i8cQ== 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:dkim-signature:delivered-to; bh=8nD1j6tiI1onz3OdYFO1xDpfLbOHLjQCMvIldSN89aQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=JvXQccRl3+NRXVAg8uOQitvj682xP77FRn+ecIwuqb/oj6uM3mrCFkd/5izAyjZXoT mip7EMmDaoHe+QmbpL6SEcGoz21t9ktOHYanH4dipLGouj1W48n2mICUlCehMTo9VEvf xhvJ9tZXZ86r8y2UA3Tf9cJFYejosdNO78vcKdpN9R8+LmxPjBEAdQXsvWlFzfeaBtjT EVmhJekL0hQiaLMnL3v5j1O7mux5wH5l+JWCn8pIYhaEA/ivPMLwN3E3nzQ4CIY46nNY za2z3Ta1pL8+S4jmZNEvUWy/1OIpA/OREKFAjUQjFJBf0aF0/rblIfwob+ngwd28/H3d lv3g==; 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=DmHOUX7j; 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 t8-20020a056402240800b0056b83ea0cdasi281640eda.162.2024.03.22.16.32.21; Fri, 22 Mar 2024 16:32:21 -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=DmHOUX7j; 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 AAF0E68D595; Sat, 23 Mar 2024 01:31:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C78868D485 for ; Sat, 23 Mar 2024 01:31:51 +0200 (EET) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6e6bee809b8so2200224b3a.1 for ; Fri, 22 Mar 2024 16:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711150308; x=1711755108; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Sd5v4Fv8Tm8KtRLEuefZ1d0XW5+0NyLSsWXWXkXLqio=; b=DmHOUX7jIAG+re9xtmhfYl2fhxOcAmhBW8119ilSga097PNQD/RDU7olJHDp0hhJ/Q O+Mlj0B3TNS7pFABrUeT1DPzn5Uvj+L+fSIeO/U2WCM3OwAXH9d4ZaaQoi57sCVRLdPR mMIT3ajLEx7zgCBeKUYCIve1zwkJ8HzY6511xlwXpYO70xKO7tEUojdArhDm1nlzqt+9 nxG9As/fIXuZb9bxkzZ3IAr3BJXvWiZO+gUtUlTlkYQeYm7Zcbi/EJ7vL5DO84MmDsle 6x+EZd3t7u+tTy4LiY2P/3OfvE//RsNGfsTFEwHJ9AsJOFJAQszVKFA+7TP6dMc2mV8f KbWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711150308; x=1711755108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sd5v4Fv8Tm8KtRLEuefZ1d0XW5+0NyLSsWXWXkXLqio=; b=ALsL8pL2cyetM+Ao/GhDtdwXBP+d4NtD/z5WfnZ2AWCpdD4LOHRq7ptE0PCo+SzuYO yosWBs5R/xBKZwj+YwStlX7TcGdzo3Q+A+sAbxdhqk9oH525PW1mxlpMm93Fk1FIoSUJ ywNC6TagiYZvyvLwqZw4NaFM7KI3rxNg6juAv1NNOiWdeHqWq8qwgn+GdhJMGufH39ET RI3ERzx79Ns6w85GjrV3gXTju0fmvVLa81LXoPNurgumy8l7anSAxzLZDKRSmo4VQsE1 nKWWIpOIGb9XW18igMPsXWVdRHnAoexvtfh0yZxL46+lO2lxqRb4am3AMvG82p24tFgF c6QA== X-Gm-Message-State: AOJu0YxscODs9OwINOX/rAxGZPProd7A9CO8Sis63Cop5JjFBC/8M85l YdV1QYuB0nQ9hpYOChV3qt54KsgUvwB0e1Blfe9yEpCqrLX51igbUG0OW2Xu X-Received: by 2002:a05:6a20:6b96:b0:1a3:ae4a:92f with SMTP id bu22-20020a056a206b9600b001a3ae4a092fmr986552pzb.32.1711150308134; Fri, 22 Mar 2024 16:31:48 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029d7e7b7b41sm6642890pjj.33.2024.03.22.16.31.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 16:31:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 20:31:28 -0300 Message-ID: <20240322233129.62994-4-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240322233129.62994-1-jamrial@gmail.com> References: <20240322233129.62994-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/decode: make the AVFrameSideData helper wrappers not depend on frames 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: aJKu/qY1UzI8 They can be useful to fill arrays stored in other structs. Signed-off-by: James Almer --- libavcodec/av1dec.c | 7 +-- libavcodec/cri.c | 3 +- libavcodec/decode.c | 98 ++++++++++++++++++++++++++--------------- libavcodec/decode.h | 28 ++++++------ libavcodec/dpx.c | 3 +- libavcodec/h2645_sei.c | 4 +- libavcodec/h264_slice.c | 3 +- libavcodec/hevcdec.c | 6 ++- libavcodec/libdav1d.c | 7 +-- libavcodec/libjxldec.c | 3 +- libavcodec/mjpegdec.c | 3 +- libavcodec/mpeg12dec.c | 11 +++-- libavcodec/pngdec.c | 8 ++-- libavcodec/qsvdec.c | 4 +- libavcodec/tiff.c | 3 +- libavcodec/webp.c | 3 +- 16 files changed, 118 insertions(+), 76 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 4d074c3908..d130244f13 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -964,7 +964,8 @@ static int export_itut_t35(AVCodecContext *avctx, AVFrame *frame, if (!ret) break; - ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf, NULL); + ret = ff_frame_new_side_data_from_buf(avctx, &frame->side_data, &frame->nb_side_data, + AV_FRAME_DATA_A53_CC, &buf); if (ret < 0) return ret; @@ -1028,7 +1029,7 @@ static int export_metadata(AVCodecContext *avctx, AVFrame *frame) if (s->mdcv) { AVMasteringDisplayMetadata *mastering; - ret = ff_decode_mastering_display_new(avctx, frame, &mastering); + ret = ff_decode_mastering_display_new(avctx, &frame->side_data, &frame->nb_side_data, &mastering); if (ret < 0) return ret; @@ -1051,7 +1052,7 @@ static int export_metadata(AVCodecContext *avctx, AVFrame *frame) if (s->cll) { AVContentLightMetadata *light; - ret = ff_decode_content_light_new(avctx, frame, &light); + ret = ff_decode_content_light_new(avctx, &frame->side_data, &frame->nb_side_data, &light); if (ret < 0) return ret; diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 990e52ac99..94468e7515 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -398,7 +398,8 @@ skip: } if (hflip || vflip) { - ff_frame_new_side_data(avctx, p, AV_FRAME_DATA_DISPLAYMATRIX, + ff_frame_new_side_data(avctx, &p->side_data, &p->nb_side_data, + AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9, &rotation); if (rotation) { av_display_rotation_set((int32_t *)rotation->data, 0.f); diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 34bcb7cc64..e6b32fcb26 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1799,87 +1799,115 @@ int ff_decode_preinit(AVCodecContext *avctx) * @retval 0 side data of this type can be added to frame * @retval 1 side data of this type should not be added to frame */ -static int side_data_pref(const AVCodecContext *avctx, AVFrame *frame, - enum AVFrameSideDataType type) +static int side_data_pref(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, enum AVFrameSideDataType type) { DecodeContext *dc = decode_ctx(avctx->internal); // Note: could be skipped for `type` without corresponding packet sd - if (av_frame_get_side_data(frame, type)) { + if (av_frame_side_data_get(*sd, *nb_sd, type)) { if (dc->side_data_pref_mask & (1ULL << type)) return 1; - av_frame_remove_side_data(frame, type); + av_frame_side_data_remove(sd, nb_sd, type); } return 0; } - -int ff_frame_new_side_data(const AVCodecContext *avctx, AVFrame *frame, - enum AVFrameSideDataType type, size_t size, +int ff_frame_new_side_data(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, enum AVFrameSideDataType type, size_t size, AVFrameSideData **psd) { - AVFrameSideData *sd; - - if (side_data_pref(avctx, frame, type)) { + if (side_data_pref(avctx, sd, nb_sd, type)) { if (psd) *psd = NULL; return 0; } - sd = av_frame_new_side_data(frame, type, size); - if (psd) - *psd = sd; + *psd = av_frame_side_data_new(sd, nb_sd, type, size, AV_FRAME_SIDE_DATA_FLAG_UNIQUE); - return sd ? 0 : AVERROR(ENOMEM); + return *psd ? 0 : AVERROR(ENOMEM); } -int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx, - AVFrame *frame, enum AVFrameSideDataType type, - AVBufferRef **buf, AVFrameSideData **psd) +int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, enum AVFrameSideDataType type, + AVBufferRef **buf) { - AVFrameSideData *sd = NULL; int ret = 0; - if (side_data_pref(avctx, frame, type)) + if (side_data_pref(avctx, sd, nb_sd, type)) goto finish; - sd = av_frame_new_side_data_from_buf(frame, type, *buf); - if (sd) - *buf = NULL; - else + if (!av_frame_side_data_add(sd, nb_sd, type, buf, + AV_FRAME_SIDE_DATA_FLAG_UNIQUE)) ret = AVERROR(ENOMEM); finish: av_buffer_unref(buf); - if (psd) - *psd = sd; return ret; } -int ff_decode_mastering_display_new(const AVCodecContext *avctx, AVFrame *frame, - AVMasteringDisplayMetadata **mdm) +int ff_decode_mastering_display_new(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, AVMasteringDisplayMetadata **mdm) { - if (side_data_pref(avctx, frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA)) { + AVBufferRef *buf; + size_t size; + + if (side_data_pref(avctx, sd, nb_sd, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA)) { *mdm = NULL; return 0; } - *mdm = av_mastering_display_metadata_create_side_data(frame); - return *mdm ? 0 : AVERROR(ENOMEM); + *mdm = av_mastering_display_metadata_alloc_size(&size); + if (!*mdm) + return AVERROR(ENOMEM); + + buf = av_buffer_create((uint8_t *)*mdm, size, NULL, NULL, 0); + if (!buf) { + av_freep(mdm); + return AVERROR(ENOMEM); + } + + if (!av_frame_side_data_add(sd, nb_sd, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA, + &buf, AV_FRAME_SIDE_DATA_FLAG_UNIQUE)) { + *mdm = NULL; + av_buffer_unref(&buf); + return AVERROR(ENOMEM); + } + + return 0; } -int ff_decode_content_light_new(const AVCodecContext *avctx, AVFrame *frame, - AVContentLightMetadata **clm) +int ff_decode_content_light_new(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, AVContentLightMetadata **clm) { - if (side_data_pref(avctx, frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL)) { + AVBufferRef *buf; + size_t size; + + if (side_data_pref(avctx, sd, nb_sd, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL)) { *clm = NULL; return 0; } - *clm = av_content_light_metadata_create_side_data(frame); - return *clm ? 0 : AVERROR(ENOMEM); + *clm = av_content_light_metadata_alloc(&size); + if (!*clm) + return AVERROR(ENOMEM); + + buf = av_buffer_create((uint8_t *)*clm, size, NULL, NULL, 0); + if (!buf) { + av_freep(clm); + return AVERROR(ENOMEM); + } + + if (!av_frame_side_data_add(sd, nb_sd, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + &buf, AV_FRAME_SIDE_DATA_FLAG_UNIQUE)) { + *clm = NULL; + av_buffer_unref(&buf); + return AVERROR(ENOMEM); + } + + return 0; } int ff_copy_palette(void *dst, const AVPacket *src, void *logctx) diff --git a/libavcodec/decode.h b/libavcodec/decode.h index 4ffbd9db8e..1026c9dae9 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -156,14 +156,14 @@ const AVPacketSideData *ff_get_coded_side_data(const AVCodecContext *avctx, enum AVPacketSideDataType type); /** - * Wrapper around av_frame_new_side_data, which rejects side data overridden by + * Wrapper around av_frame_side_data_new, which rejects side data overridden by * the demuxer. Returns 0 on success, and a negative error code otherwise. - * If successful and sd is not NULL, *sd may either contain a pointer to the new + * If successful and psd is not NULL, *psd may either contain a pointer to the new * side data, or NULL in case the side data was already present. */ -int ff_frame_new_side_data(const AVCodecContext *avctx, AVFrame *frame, - enum AVFrameSideDataType type, size_t size, - AVFrameSideData **sd); +int ff_frame_new_side_data(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, enum AVFrameSideDataType type, size_t size, + AVFrameSideData **psd); /** * Similar to `ff_frame_new_side_data`, but using an existing buffer ref. @@ -171,29 +171,29 @@ int ff_frame_new_side_data(const AVCodecContext *avctx, AVFrame *frame, * *buf is ALWAYS consumed by this function and NULL written in its place, even * on failure. */ -int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx, - AVFrame *frame, enum AVFrameSideDataType type, - AVBufferRef **buf, AVFrameSideData **sd); +int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, enum AVFrameSideDataType type, + AVBufferRef **buf); struct AVMasteringDisplayMetadata; struct AVContentLightMetadata; /** - * Wrapper around av_mastering_display_metadata_create_side_data(), which + * Similar to av_mastering_display_metadata_create_side_data(), but * rejects side data overridden by the demuxer. Returns 0 on success, and a * negative error code otherwise. If successful, *mdm may either be a pointer to * the new side data, or NULL in case the side data was already present. */ -int ff_decode_mastering_display_new(const AVCodecContext *avctx, AVFrame *frame, - struct AVMasteringDisplayMetadata **mdm); +int ff_decode_mastering_display_new(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, struct AVMasteringDisplayMetadata **mdm); /** - * Wrapper around av_content_light_metadata_create_side_data(), which + * Similar to av_content_light_metadata_create_side_data(), but * rejects side data overridden by the demuxer. Returns 0 on success, and a * negative error code otherwise. If successful, *clm may either be a pointer to * the new side data, or NULL in case the side data was already present. */ -int ff_decode_content_light_new(const AVCodecContext *avctx, AVFrame *frame, - struct AVContentLightMetadata **clm); +int ff_decode_content_light_new(const AVCodecContext *avctx, AVFrameSideData ***sd, + int *nb_sd, struct AVContentLightMetadata **clm); #endif /* AVCODEC_DECODE_H */ diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 80616d98a2..ff9115bf86 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -288,7 +288,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, if (i != 0xFFFFFFFF) { AVFrameSideData *tcside; - ret = ff_frame_new_side_data(avctx, p, AV_FRAME_DATA_S12M_TIMECODE, + ret = ff_frame_new_side_data(avctx, &p->side_data, &p->nb_side_data, + AV_FRAME_DATA_S12M_TIMECODE, sizeof(uint32_t) * 4, &tcside); if (ret < 0) return ret; diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index e8eb15524f..2e098d1069 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -716,7 +716,7 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, int i; AVMasteringDisplayMetadata *metadata; - ret = ff_decode_mastering_display_new(avctx, frame, &metadata); + ret = ff_decode_mastering_display_new(avctx, &frame->side_data, &frame->nb_side_data, &metadata); if (ret < 0) return ret; @@ -759,7 +759,7 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, if (sei->content_light.present) { AVContentLightMetadata *metadata; - ret = ff_decode_content_light_new(avctx, frame, &metadata); + ret = ff_decode_content_light_new(avctx, &frame->side_data, &frame->nb_side_data, &metadata); if (ret < 0) return ret; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index e9a404e41b..6d9d2ddc14 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1253,7 +1253,8 @@ static int h264_export_frame_props(H264Context *h) uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside; - ret = ff_frame_new_side_data(h->avctx, out, AV_FRAME_DATA_S12M_TIMECODE, + ret = ff_frame_new_side_data(h->avctx, &out->side_data, &out->nb_side_data, + AV_FRAME_DATA_S12M_TIMECODE, sizeof(uint32_t)*4, &tcside); if (ret < 0) return ret; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 76aa6b4588..565c94cf95 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2789,7 +2789,8 @@ static int set_side_data(HEVCContext *s) uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside; - ret = ff_frame_new_side_data(s->avctx, out, AV_FRAME_DATA_S12M_TIMECODE, + ret = ff_frame_new_side_data(s->avctx, &out->side_data, &out->nb_side_data, + AV_FRAME_DATA_S12M_TIMECODE, sizeof(uint32_t) * 4, &tcside); if (ret < 0) return ret; @@ -2819,7 +2820,8 @@ static int set_side_data(HEVCContext *s) if (!info_ref) return AVERROR(ENOMEM); - ret = ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS, &info_ref, NULL); + ret = ff_frame_new_side_data_from_buf(s->avctx, &out->side_data, &out->nb_side_data, + AV_FRAME_DATA_DYNAMIC_HDR_PLUS, &info_ref); if (ret < 0) return ret; } diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 17b0743cf0..4c65bfc18b 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -471,7 +471,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (p->mastering_display) { AVMasteringDisplayMetadata *mastering; - res = ff_decode_mastering_display_new(c, frame, &mastering); + res = ff_decode_mastering_display_new(c, &frame->side_data, &frame->nb_side_data, &mastering); if (res < 0) goto fail; @@ -493,7 +493,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (p->content_light) { AVContentLightMetadata *light; - res = ff_decode_content_light_new(c, frame, &light); + res = ff_decode_content_light_new(c, &frame->side_data, &frame->nb_side_data, &light); if (res < 0) goto fail; @@ -528,7 +528,8 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (!res) break; - res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf, NULL); + res = ff_frame_new_side_data_from_buf(c, &frame->side_data, &frame->nb_side_data, + AV_FRAME_DATA_A53_CC, &buf); if (res < 0) goto fail; diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index d57a27418f..6e95c79177 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -483,7 +483,8 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) /* full image is one frame, even if animated */ av_log(avctx, AV_LOG_DEBUG, "FULL_IMAGE event emitted\n"); if (ctx->iccp) { - ret = ff_frame_new_side_data_from_buf(avctx, ctx->frame, AV_FRAME_DATA_ICC_PROFILE, &ctx->iccp, NULL); + ret = ff_frame_new_side_data_from_buf(avctx, &ctx->frame->side_data, &ctx->frame->nb_side_data, + AV_FRAME_DATA_ICC_PROFILE, &ctx->iccp); if (ret < 0) return ret; } diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c9409eac6c..89443dc4cd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2839,7 +2839,8 @@ the_end: for (i = 0; i < s->iccnum; i++) total_size += s->iccentries[i].length; - ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_ICC_PROFILE, total_size, &sd); + ret = ff_frame_new_side_data(avctx, &frame->side_data, &frame->nb_side_data, + AV_FRAME_DATA_ICC_PROFILE, total_size, &sd); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); return ret; diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 4ad1eb6572..2665ee2f95 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1314,7 +1314,8 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) } } - ret = ff_frame_new_side_data(s->avctx, s->current_picture_ptr->f, + ret = ff_frame_new_side_data(s->avctx, &s->current_picture_ptr->f->side_data, + &s->current_picture_ptr->f->nb_side_data, AV_FRAME_DATA_PANSCAN, sizeof(s1->pan_scan), &pan_scan); if (ret < 0) @@ -1324,8 +1325,9 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if (s1->a53_buf_ref) { ret = ff_frame_new_side_data_from_buf( - s->avctx, s->current_picture_ptr->f, AV_FRAME_DATA_A53_CC, - &s1->a53_buf_ref, NULL); + s->avctx, &s->current_picture_ptr->f->side_data, + &s->current_picture_ptr->f->nb_side_data, + AV_FRAME_DATA_A53_CC, &s1->a53_buf_ref); if (ret < 0) return ret; } @@ -1341,7 +1343,8 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if (s1->has_afd) { AVFrameSideData *sd; - ret = ff_frame_new_side_data(s->avctx, s->current_picture_ptr->f, + ret = ff_frame_new_side_data(s->avctx, &s->current_picture_ptr->f->side_data, + &s->current_picture_ptr->f->nb_side_data, AV_FRAME_DATA_AFD, 1, &sd); if (ret < 0) return ret; diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index de50e6a5b6..68c25cb5bd 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -680,8 +680,8 @@ static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) } } else if (s->iccp_data) { AVFrameSideData *sd; - ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_ICC_PROFILE, - s->iccp_data_len, &sd); + ret = ff_frame_new_side_data(avctx, &frame->side_data, &frame->nb_side_data, + AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len, &sd); if (ret < 0) return ret; if (sd) { @@ -748,7 +748,7 @@ static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) if (s->have_clli) { AVContentLightMetadata *clli; - ret = ff_decode_content_light_new(avctx, frame, &clli); + ret = ff_decode_content_light_new(avctx, &frame->side_data, &frame->nb_side_data, &clli); if (ret < 0) return ret; @@ -765,7 +765,7 @@ static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) if (s->have_mdvc) { AVMasteringDisplayMetadata *mdvc; - ret = ff_decode_mastering_display_new(avctx, frame, &mdvc); + ret = ff_decode_mastering_display_new(avctx, &frame->side_data, &frame->nb_side_data, &mdvc); if (ret < 0) return ret; diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index fd9267c6f4..de3ed3c357 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -661,7 +661,7 @@ static int qsv_export_hdr_side_data(AVCodecContext *avctx, mfxExtMasteringDispla const int luma_den = 10000; int i; - ret = ff_decode_mastering_display_new(avctx, frame, &mastering); + ret = ff_decode_mastering_display_new(avctx, &frame->side_data, &frame->nb_side_data, &mastering); if (ret < 0) return ret; @@ -687,7 +687,7 @@ static int qsv_export_hdr_side_data(AVCodecContext *avctx, mfxExtMasteringDispla if (clli->InsertPayloadToggle) { AVContentLightMetadata *light; - ret = ff_decode_content_light_new(avctx, frame, &light); + ret = ff_decode_content_light_new(avctx, &frame->side_data, &frame->nb_side_data, &light); if (ret < 0) return ret; diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 7ce1ab32f6..9cde2e60e1 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1706,7 +1706,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) if (bytestream2_get_bytes_left(&gb_temp) < count) return AVERROR_INVALIDDATA; - ret = ff_frame_new_side_data(s->avctx, frame, AV_FRAME_DATA_ICC_PROFILE, count, &sd); + ret = ff_frame_new_side_data(s->avctx, &frame->side_data, &frame->nb_side_data, + AV_FRAME_DATA_ICC_PROFILE, count, &sd); if (ret < 0) return ret; if (sd) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 9308ea2b69..ec23533ef2 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1501,7 +1501,8 @@ exif_end: s->has_iccp = 1; - ret = ff_frame_new_side_data(avctx, p, AV_FRAME_DATA_ICC_PROFILE, chunk_size, &sd); + ret = ff_frame_new_side_data(avctx, &p->side_data, &p->nb_side_data, + AV_FRAME_DATA_ICC_PROFILE, chunk_size, &sd); if (ret < 0) return ret; From patchwork Fri Mar 22 23:31:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp238172pzb; Fri, 22 Mar 2024 16:32:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3trsksLOvvMIKFrh9mmQGW+vUFTpQDULR1Pz/Qf4ZuZ0BJVq+VNW7isvCuG46jGINXNiUdaqxuV8M2+UKRTAElQ+yQ0ZtpnkzpA== X-Google-Smtp-Source: AGHT+IEuwLq3yl+OZODnG/7hsEnFtiMoVb24a3Q97JoI8pArOSik+wdoNGqmNgQmoerMHUwnog1p X-Received: by 2002:a17:906:f0c7:b0:a47:ab9:89c6 with SMTP id dk7-20020a170906f0c700b00a470ab989c6mr642796ejb.30.1711150350942; Fri, 22 Mar 2024 16:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711150350; cv=none; d=google.com; s=arc-20160816; b=jmX9uticZIujGEzxX19iNMLETxdAP8AAt5DHavAt0tG1sBMn2afRJWmIMG3NNv3jKq b7MzW1NSA59Ny+aPnvbY6FtNhGi1RbqyypXRAX+dgCkZrKQJ9y/+1DDZKI/4tIOxdG7c /gRM2J/ulW27SJsBIIh04x976VTtV6sOygnRXztc47qRuTVmujTGWjkP6HMePJnhGPGt xe2k9MMoXWR/7c9JhD/7lL4TwGwyTSxdm3iXesOioD6XHpDFNww1P0lqNt07KLUb3rr7 fvXN5n+/TnT+B/mKRlCilqXfaisizf46zIBqUC6wReaQPqpErKsnaEtHZ0uefpEn/BHz wPuw== 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:dkim-signature:delivered-to; bh=aQseuhI58qNwl49M8jhNhTTLWzO3qS1G+eGIH9bEwsU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ai5R+qNIcKABKD+LFnNFPOEhzrtady6WtLPoWVqvrZ5E88qTPCWOhhaQ0N2E5Axagc w9iePIN4Ng2Bz9fWf7rifE7IZIv2uWwDWetjeZefSWm1HCkbkbrPb8YUohuLIOql9W6l Sd97+ov4ZIKM1Eo9uZnoKdT2VBFctEGi0tCnNZUWVkF9pqPOzrBTQiaa5lmhUVOmt0tq k44cSZdfO31SEkGdR96LH9UQK3KZhdjU21JhvYxMKF1u2bxj5XZNi/j9Gtfen2Sk9mKr sb7cPnH1+/Fld9lzjZQvyLmsQ5Xm3g/bxKai9mPAw5JrNi8t4JzNNxNy3qfg419EDmIR 2nog==; 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=PZB1cFfk; 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 kt11-20020a170906aacb00b00a46d5915561si274345ejb.550.2024.03.22.16.32.30; Fri, 22 Mar 2024 16:32:30 -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=PZB1cFfk; 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 A50F568D53F; Sat, 23 Mar 2024 01:31:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F8BF68D595 for ; Sat, 23 Mar 2024 01:31:52 +0200 (EET) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-5e152c757a5so1328994a12.2 for ; Fri, 22 Mar 2024 16:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711150310; x=1711755110; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=M4zaM0rkeTDQWIhGY6fm7GNZS8Qjo8UBH6gWwGb62R8=; b=PZB1cFfk/GQiVF6KTJ4v12K+rMXK+i/jToBFiNaPCxhD/mrL0iUwLQ9ph/aVWmCXAg 0MXrNjpOMvfYoCufhic8lkhbtmS0xPIuQZxLkYSpJ85wegGQRUJl/u7uWfbdtXdNETv5 hW0Pd69jPP3s5wBRKc0iMT057RTFKI8zULjc5cvfIcdMPHehfRZFInwtIKFBsjZsr5bX piYelSpJeUScXJ4myeW5Rzzrsm1NwYiL3m+isl8iGIIJINcy5CGQF0JnM9dJXOaxStwp UdyOH3b9Lr0MKFBGaj4GhijiuDyGPc5djbmCxYzlrI7irsKxAxO9FUGfa0USs4D5rZBA 3fKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711150310; x=1711755110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M4zaM0rkeTDQWIhGY6fm7GNZS8Qjo8UBH6gWwGb62R8=; b=YnflNGrYRaxUxIHrXmcVsbXJbhmfr2QSaVxzRX/F21uM4kvRDByk2spm4YDZ1UIIn5 EL2PKr37vVRCtrzEfSRbkouFy/YwLo+qL+xTsKUCpudu9MR0IaTIawN+UKZrM3MG06OG rnQFP9oB4Pqqew8zetmNCzaaR/kMvG0zyQ/nK9lEUcjogg2SeU6jDL1UrvDD72Vx9IZ3 ijNmsjD/9sO3qhL9jyciAadyuEEFA/6anFEjncFPR1qJjc4exnVmkGCTizPAz7Na2sGR BftlMQ+3QmSc9Kml467r3/ma+jnDa0+3sSYTk7Gjus7cCNCqmKt+ium4ygWnzM2wK8CO Fi6Q== X-Gm-Message-State: AOJu0YzTY+QDBpWObYEJIoxF1NMwtwjykGPhPiLTFqJyUjTPjdeUcUPU WMxJZhJ/6SUmBHtd+y5T+mafkCMYM7SxK5IlXs+DWi/W/lGmBcaqxu8eLRUi X-Received: by 2002:a05:6a20:9151:b0:1a3:ac3f:f08b with SMTP id x17-20020a056a20915100b001a3ac3ff08bmr1354389pzc.5.1711150309805; Fri, 22 Mar 2024 16:31:49 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029d7e7b7b41sm6642890pjj.33.2024.03.22.16.31.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 16:31:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 20:31:29 -0300 Message-ID: <20240322233129.62994-5-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240322233129.62994-1-jamrial@gmail.com> References: <20240322233129.62994-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/hevcdec: export global side data in AVCodecContext 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: p0HGKDx6Ce/N Signed-off-by: James Almer --- libavcodec/avcodec.h | 2 +- libavcodec/h2645_sei.c | 217 ++++++++++++++++++++++++----------------- libavcodec/h2645_sei.h | 2 + libavcodec/hevcdec.c | 4 + 4 files changed, 136 insertions(+), 89 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 83dc487251..968009a192 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2071,7 +2071,7 @@ typedef struct AVCodecContext { * - encoding: may be set by user before calling avcodec_open2() for * encoder configuration. Afterwards owned and freed by the * encoder. - * - decoding: unused + * - decoding: may be set by libavcodec in avcodec_open2(). */ AVFrameSideData **decoded_side_data; int nb_decoded_side_data; diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 2e098d1069..32bb4f841d 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -511,6 +511,124 @@ static int is_frame_packing_type_valid(SEIFpaType type, enum AVCodecID codec_id) type >= SEI_FPA_TYPE_SIDE_BY_SIDE; } +static int h2645_sei_to_side_data(AVCodecContext *avctx, H2645SEI *sei, + AVFrameSideData ***sd, int *nb_sd) +{ + int ret; + + for (unsigned i = 0; i < sei->unregistered.nb_buf_ref; i++) { + H2645SEIUnregistered *unreg = &sei->unregistered; + AVBufferRef *buf; + + if (!unreg->buf_ref[i]) + continue; + + buf = av_buffer_ref(unreg->buf_ref[i]); + if (!buf) + return AVERROR(ENOMEM); + + if (!av_frame_side_data_add(sd, nb_sd, AV_FRAME_DATA_SEI_UNREGISTERED, &buf, 0)) { + av_buffer_unref(&buf); + return AVERROR(ENOMEM); + } + } + + if (sei->ambient_viewing_environment.present) { + H2645SEIAmbientViewingEnvironment *env = + &sei->ambient_viewing_environment; + AVBufferRef *buf; + size_t size; + + AVAmbientViewingEnvironment *dst_env = + av_ambient_viewing_environment_alloc(&size); + if (!dst_env) + return AVERROR(ENOMEM); + + buf = av_buffer_create((uint8_t *)dst_env, size, NULL, NULL, 0); + if (!buf) { + av_free(dst_env); + return AVERROR(ENOMEM); + } + + ret = ff_frame_new_side_data_from_buf(avctx, sd, nb_sd, + AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT, &buf); + + if (ret < 0) + return ret; + + dst_env->ambient_illuminance = av_make_q(env->ambient_illuminance, 10000); + dst_env->ambient_light_x = av_make_q(env->ambient_light_x, 50000); + dst_env->ambient_light_y = av_make_q(env->ambient_light_y, 50000); + } + + if (sei->mastering_display.present) { + // HEVC uses a g,b,r ordering, which we convert to a more natural r,g,b + const int mapping[3] = {2, 0, 1}; + const int chroma_den = 50000; + const int luma_den = 10000; + int i; + AVMasteringDisplayMetadata *metadata; + + ret = ff_decode_mastering_display_new(avctx, sd, nb_sd, &metadata); + if (ret < 0) + return ret; + + if (metadata) { + for (i = 0; i < 3; i++) { + const int j = mapping[i]; + metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; + metadata->display_primaries[i][0].den = chroma_den; + metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; + metadata->display_primaries[i][1].den = chroma_den; + } + metadata->white_point[0].num = sei->mastering_display.white_point[0]; + metadata->white_point[0].den = chroma_den; + metadata->white_point[1].num = sei->mastering_display.white_point[1]; + metadata->white_point[1].den = chroma_den; + + metadata->max_luminance.num = sei->mastering_display.max_luminance; + metadata->max_luminance.den = luma_den; + metadata->min_luminance.num = sei->mastering_display.min_luminance; + metadata->min_luminance.den = luma_den; + metadata->has_luminance = 1; + metadata->has_primaries = 1; + + av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); + av_log(avctx, AV_LOG_DEBUG, + "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", + av_q2d(metadata->display_primaries[0][0]), + av_q2d(metadata->display_primaries[0][1]), + av_q2d(metadata->display_primaries[1][0]), + av_q2d(metadata->display_primaries[1][1]), + av_q2d(metadata->display_primaries[2][0]), + av_q2d(metadata->display_primaries[2][1]), + av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1])); + av_log(avctx, AV_LOG_DEBUG, + "min_luminance=%f, max_luminance=%f\n", + av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); + } + } + + if (sei->content_light.present) { + AVContentLightMetadata *metadata; + + ret = ff_decode_content_light_new(avctx, sd, nb_sd, &metadata); + if (ret < 0) + return ret; + + if (metadata) { + metadata->MaxCLL = sei->content_light.max_content_light_level; + metadata->MaxFALL = sei->content_light.max_pic_average_light_level; + + av_log(avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); + av_log(avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", + metadata->MaxCLL, metadata->MaxFALL); + } + } + + return 0; +} + int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, enum AVCodecID codec_id, AVCodecContext *avctx, const H2645VUI *vui, @@ -607,17 +725,13 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } + ret = h2645_sei_to_side_data(avctx, sei, &frame->side_data, &frame->nb_side_data); + if (ret < 0) + return ret; + for (unsigned i = 0; i < sei->unregistered.nb_buf_ref; i++) { H2645SEIUnregistered *unreg = &sei->unregistered; - - if (unreg->buf_ref[i]) { - AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, - AV_FRAME_DATA_SEI_UNREGISTERED, - unreg->buf_ref[i]); - if (!sd) - av_buffer_unref(&unreg->buf_ref[i]); - unreg->buf_ref[i] = NULL; - } + av_buffer_unref(&unreg->buf_ref[i]); } sei->unregistered.nb_buf_ref = 0; @@ -694,88 +808,15 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; } - if (sei->ambient_viewing_environment.present) { - H2645SEIAmbientViewingEnvironment *env = - &sei->ambient_viewing_environment; - - AVAmbientViewingEnvironment *dst_env = - av_ambient_viewing_environment_create_side_data(frame); - if (!dst_env) - return AVERROR(ENOMEM); - - dst_env->ambient_illuminance = av_make_q(env->ambient_illuminance, 10000); - dst_env->ambient_light_x = av_make_q(env->ambient_light_x, 50000); - dst_env->ambient_light_y = av_make_q(env->ambient_light_y, 50000); - } - - if (sei->mastering_display.present) { - // HEVC uses a g,b,r ordering, which we convert to a more natural r,g,b - const int mapping[3] = {2, 0, 1}; - const int chroma_den = 50000; - const int luma_den = 10000; - int i; - AVMasteringDisplayMetadata *metadata; - - ret = ff_decode_mastering_display_new(avctx, &frame->side_data, &frame->nb_side_data, &metadata); - if (ret < 0) - return ret; - - if (metadata) { - for (i = 0; i < 3; i++) { - const int j = mapping[i]; - metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; - metadata->display_primaries[i][0].den = chroma_den; - metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; - metadata->display_primaries[i][1].den = chroma_den; - } - metadata->white_point[0].num = sei->mastering_display.white_point[0]; - metadata->white_point[0].den = chroma_den; - metadata->white_point[1].num = sei->mastering_display.white_point[1]; - metadata->white_point[1].den = chroma_den; - - metadata->max_luminance.num = sei->mastering_display.max_luminance; - metadata->max_luminance.den = luma_den; - metadata->min_luminance.num = sei->mastering_display.min_luminance; - metadata->min_luminance.den = luma_den; - metadata->has_luminance = 1; - metadata->has_primaries = 1; - - av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); - av_log(avctx, AV_LOG_DEBUG, - "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", - av_q2d(metadata->display_primaries[0][0]), - av_q2d(metadata->display_primaries[0][1]), - av_q2d(metadata->display_primaries[1][0]), - av_q2d(metadata->display_primaries[1][1]), - av_q2d(metadata->display_primaries[2][0]), - av_q2d(metadata->display_primaries[2][1]), - av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1])); - av_log(avctx, AV_LOG_DEBUG, - "min_luminance=%f, max_luminance=%f\n", - av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); - } - } - - if (sei->content_light.present) { - AVContentLightMetadata *metadata; - - ret = ff_decode_content_light_new(avctx, &frame->side_data, &frame->nb_side_data, &metadata); - if (ret < 0) - return ret; - - if (metadata) { - metadata->MaxCLL = sei->content_light.max_content_light_level; - metadata->MaxFALL = sei->content_light.max_pic_average_light_level; - - av_log(avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); - av_log(avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", - metadata->MaxCLL, metadata->MaxFALL); - } - } - return 0; } +int ff_h2645_sei_to_context(AVCodecContext *avctx, H2645SEI *sei) +{ + return h2645_sei_to_side_data(avctx, sei, &avctx->decoded_side_data, + &avctx->nb_decoded_side_data); +} + void ff_h2645_sei_reset(H2645SEI *s) { av_buffer_unref(&s->a53_caption.buf_ref); diff --git a/libavcodec/h2645_sei.h b/libavcodec/h2645_sei.h index 0ebf48011a..1b55280c05 100644 --- a/libavcodec/h2645_sei.h +++ b/libavcodec/h2645_sei.h @@ -165,4 +165,6 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, unsigned bit_depth_luma, unsigned bit_depth_chroma, int seed); +int ff_h2645_sei_to_context(AVCodecContext *avctx, H2645SEI *sei); + #endif /* AVCODEC_H2645_SEI_H */ diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 565c94cf95..17c77f0919 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3643,6 +3643,10 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) if (ret < 0) { return ret; } + + ret = ff_h2645_sei_to_context(s->avctx, &s->sei.common); + if (ret < 0) + return ret; } sd = ff_get_coded_side_data(avctx, AV_PKT_DATA_DOVI_CONF);