From patchwork Tue Nov 12 17:22:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52704 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:6704:20b0:4a6:637d:5226 with SMTP id mp4-n2csp449085vqb; Tue, 12 Nov 2024 09:23:05 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV4YmrTYnJtp0WSXpZh00nkSeSULU4Fs70ODBFGYvKFtNNV+dp+uIDubTMKXn4DAPNZL5ImhDNvlVzJ/pmU6OIc@gmail.com X-Google-Smtp-Source: AGHT+IHTa8dELeoGSPbc24C214MtZbK4yc9CRs2ray2xPAWeRQYx6WNzixXiaDj47KPoQg2fDtWI X-Received: by 2002:a17:907:7243:b0:a9a:49a8:f1fa with SMTP id a640c23a62f3a-a9eefeed031mr1601483566b.23.1731432184722; Tue, 12 Nov 2024 09:23:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731432184; cv=none; d=google.com; s=arc-20240605; b=R6MLX7PU7xIWl0Ba1Y4YiSO7Yig2k0a3uHbANpxDZx3ADVC2QuBS4vwmycNP3XYO05 p5NExmRX/kt4u1VNJBNeYO5Vrb9pyoVDYb1cBt29HDwRpzKkxHOM2mgCjdF6t1X5Xvkv 0vq0XvHfikQnR+sbgdp19MJuHMSMEY5nrTcHc9pi/qAp+KQlylZyaxTj2iSK9l/UhxYe g9LZ3s83Tf59aMWe+ZQiU47bfMw7sa7P1cmXKFY+RMYPdYdVKLi8DDFSkVubFh6lavqM qnAjD/5fOoYWFr5Z9qG/rOhBLPUGdQIiY8PFa8ZyB/JeiTNHJlhw03+1WA6bOwRBiFQL eKPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=QpvsWoffhruJRHk/1Zhnb9v3vCF3o+V4v2abSYcPF70=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=MQqlsMHmuE6tBykc4LI5TTL2eTI3F8bjU6NJCNN4Uu6nXye37pmwkQvyWJbGMvNxzY rO81WchFwwFJJfnnHJJYVP0v4Ab5UrLX8cWqgThV0p4kr597k/2XTb6wmHjvRxCiYkni rfLevVyoFLtPL1rx8pU+PyrVIgaCMUuXIx66ickRNxdmRe4z/8gXJ+uKtvVPjtXtuZXC Qe7jOqe/iftWRmtMWVXDOtsdqhW7uQ9nj7EFUpOKEk1yJl8ghHYv1r8c0WSP+NOxad+2 Sj383ekL7DM+hr23tNAK/fhM9ukMLwzouxa5sKTiBu9AhbrhTKAotts9hwx1QwrBxPWk orDA==; 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=jFRG+Jep; 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; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTPS id a640c23a62f3a-a9ee0dc2502si856288266b.274.2024.11.12.09.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 09:23:04 -0800 (PST) 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=jFRG+Jep; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 285FF68DDB2; Tue, 12 Nov 2024 19:22:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3F2B68DB6F for ; Tue, 12 Nov 2024 19:22:51 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20c693b68f5so61866775ad.1 for ; Tue, 12 Nov 2024 09:22:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731432169; x=1732036969; 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=r5hDplDHZuzprPcmZIuA57hb0H6497Znr7u30wGizyM=; b=jFRG+Jep6SW8j25fpD14Z2M0aRyrR5e765YUw4VImqo4pCjXENpxdRGRnZKCvdMMp5 ojneE1l9kOGyVK5c30HfhTrgM5vr6qk5KvANIeVjxFbJzOyfGJI8j6AWxlq1LanK04CV OHsxNe1tey4uZV64RwAflseCrMDFC4S9xRM5Q8wlNovWbZXPJfQdxgffguAqLk7MwQpw 6LzXjmv/JE6dd/44GJI1Mjz4UJ2gXcglsVo869PtPg0cNQ58Q72rOR/kJxgi3x4YVxf1 p+OrOFNAEKoJNhOVg7kBs+gP2y898B5/GFFjAtKHCPgliZEl8Hk8I8nhr8ozFxuRtdug JRfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731432169; x=1732036969; 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=r5hDplDHZuzprPcmZIuA57hb0H6497Znr7u30wGizyM=; b=IVsT7yvcADtJnAep5+DX5+FW0hQRNQK6T0fL++bIGOw8vDkoL7QDUeeTHxlRRS20+q 7y5qkNY07ADdK1wCtU8o7jm3PBnSZRTnkQlgMOs81HudbV3hRAPVH23os3GFmqwv0iKi 3dmzM3Kgpi8LZC/WomlDdDPEL73+K2tZ0GspPhpA1KMbSBnncrkHWjWazVvZvsoXewiY E3bd8QU04kv6BBSll5JlhuvQu1UEyMgYDQj/0xXVL29eJ/wT6nxyetqZs0W79fu1n7cD 17L8fU//1NqWqmN139hhXO2Y4fLScTuk1RgEfzHvzOvU3K3laqXSAKZW0l8dVE61DPRu 4txA== X-Gm-Message-State: AOJu0Yw+gMhU0g2mX+OIv6Xwj6cP2IcA1P2TgjSWT95rQOMhvCvie6Qd re1Gj8hEWb5fK4bOoSM4HnPqC/+uu3eRnNCngf4XsjCcGFhFn1XFK4LkfA== X-Received: by 2002:a17:902:dad0:b0:20c:7eaf:8945 with SMTP id d9443c01a7336-21183552135mr243043595ad.28.1731432168791; Tue, 12 Nov 2024 09:22:48 -0800 (PST) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21177dc9f17sm96354265ad.20.2024.11.12.09.22.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 09:22:48 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Nov 2024 14:22:42 -0300 Message-ID: <20241112172244.1528-1-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/h2645_sei: move some common SEI syncing code to ff_h2645_sei_ctx_replace() 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: ndnCTpOuCRkg Instead of duplicating it across all supported decoders. Signed-off-by: James Almer --- libavcodec/h2645_sei.c | 3 +++ libavcodec/h264_slice.c | 2 -- libavcodec/hevc/hevcdec.c | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 62369dd37f..986d1d250a 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -556,6 +556,9 @@ int ff_h2645_sei_ctx_replace(H2645SEI *dst, const H2645SEI *src) } dst->aom_film_grain.enable = src->aom_film_grain.enable; + dst->mastering_display = src->mastering_display; + dst->content_light = src->content_light; + ff_refstruct_replace(&dst->film_grain_characteristics, src->film_grain_characteristics); diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 84595b1a8b..08376ffa6d 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -442,8 +442,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, return ret; h->sei.common.unregistered.x264_build = h1->sei.common.unregistered.x264_build; - h->sei.common.mastering_display = h1->sei.common.mastering_display; - h->sei.common.content_light = h1->sei.common.content_light; if (!h->cur_pic_ptr) return 0; diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 19080255cb..fe8897fb6e 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -4003,8 +4003,6 @@ static int hevc_update_thread_context(AVCodecContext *dst, s->sei.common.frame_packing = s0->sei.common.frame_packing; s->sei.common.display_orientation = s0->sei.common.display_orientation; s->sei.common.alternative_transfer = s0->sei.common.alternative_transfer; - s->sei.common.mastering_display = s0->sei.common.mastering_display; - s->sei.common.content_light = s0->sei.common.content_light; s->sei.tdrdi = s0->sei.tdrdi; return 0; From patchwork Tue Nov 12 17:22:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:6704:20b0:4a6:637d:5226 with SMTP id mp4-n2csp449235vqb; Tue, 12 Nov 2024 09:23:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWZ9aiwA+jHzwuj0omYOta2X4wUN1rtebqBAhL8825FWiNF76kNmJZ2povZgebkv4YT+m4j6eyUbh8csEYAJvKg@gmail.com X-Google-Smtp-Source: AGHT+IEqJpKIl2KClMRkTkyLwRm5qdJiKVuHm5SgCZYfRkeXFml6aKalbrMKT4rIaw1krNuRS3jJ X-Received: by 2002:a05:6402:26c9:b0:5cf:420a:9 with SMTP id 4fb4d7f45d1cf-5cf420a0058mr6115934a12.5.1731432197196; Tue, 12 Nov 2024 09:23:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731432197; cv=none; d=google.com; s=arc-20240605; b=XJRnfqwv3KaEMYMgMDRM5b68UY69tpL5JO/u/BWRS8RvTMQ4wRbxzAUSPy2J5Nzcdw whzrB+dXQX2yAqrvdfI1WTj+s2YCnA21pgxMLh228UdLCFYaMC38kcfBuhqHrLInOVUr DL6r9gxBMFBUMhM97QgTEG7j7zPc0xMHWx6/+bdcUl2qxiO3SUNauhrtRJS3epGM34HB /9fE1GZ14+rDNMfk93kApFPk2nQTox2EobHA/RS1QetRwomqyaXx0rDAv88DutWqyB7r OYo52uacME4tbBPXl7tlV06sNLofMvjyocsVQUbzTwVRbyZSkQkoL1Uz2LyIvFa0S/7J LG0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=sEYGEvZHCPa+ck3q7oDyJ2MEvvGE3V6XOEw3X48F9YY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bWGyPCTT3oxR1Yx5LVukR9pz3vV3Ur/ul9v5jxiRgphILGdFHRAteUViBjDEvphiu6 35uMLPz1EGeZds3ksWSrJkArTOaiQJuHUn12H61Xqc8YJefGLBFCcYyag9B+KfvvbyQR jNeLl3wLh9j4gxL46IJ/Q5RdrdhPS3Cyahz+vUgz+sNlPNgzPJQwJNCcFimDaBUyoG1I 74xLa+FdjupSYxOO6QhkPxuW18vCdpiLbleOrm+7Dki5zu6r0cq5ADbArHUvUKb5lZxe xtyy4RVOxYtqQGA40Lobv/Eo+jwsHxHney+hyKn+ekc7Tss9aUA51bcvzU8qlyp10wdW 3w1A==; 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=b+AsMz1K; 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; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5cf03c9c52asi8343521a12.387.2024.11.12.09.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 09:23:17 -0800 (PST) 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=b+AsMz1K; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AD4D68DDDA; Tue, 12 Nov 2024 19:23:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C650B68DB6F for ; Tue, 12 Nov 2024 19:22:52 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-20c70abba48so57870855ad.0 for ; Tue, 12 Nov 2024 09:22:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731432171; x=1732036971; 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=Ts6SNo/RGHP+H5xMbsXuYp8BfroGrSipPnBK8xz8PXM=; b=b+AsMz1KYzER0zIj6cm3ESmr3nqTrTkVcD53wAM6KReiBezAECvKMeNXiEmmH1jz4u e8umpgXDA9NT/BsJHq3Mfi71jHkZkZeNc3zeiOqBeJ976yeBPq0jEzxM6pkKvMNQLSvO J07FhTMo/bOiiMO61aL9M/NWzZBtR0dvpfedMM9kraEXWpvRC4B3gTtbdu/3J9cd7NRj M8RjULQHoqf49RZ3XaoTRcVBBn/7PI2TNElGI43xJPhlvpUkYAu+Xd7wulrPKBJc87rr mlNibjx+HDJ3edWlw5HP2BXdg7IAVxLi3Nyp8JoF63EMsrtHa1kZoQMoiANmAE2HVBN5 qBYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731432171; x=1732036971; 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=Ts6SNo/RGHP+H5xMbsXuYp8BfroGrSipPnBK8xz8PXM=; b=WcuAtuFouVNlh28hnk2p71a3tAWEaVid1kkzS6OjyLUDS3zdz8hn+j5M+Zb64s9qrl vZbZbjWCvg+u6aO/GRa3RgA/bVj6PVBRck3bZv4k9QGU/QATjJqXAI24ywBvkbDNL3cE kk8Ys6pEq8Lk4XsNeZq77lXWbdNPidxDU/bZN1ponXJnbGD/ppZXldBS1HoI5XOz60yw n7jOqFhVCEZrqRenxWN/UBC2JpOt0saQGRB/BujeXnAbBNNEJ5N6Ky3nN8Di8/B+g51I Mzo3eOUfqOtIu0yuynMEFcUQW+M6HlBK5jklt+Rj+ez+g5jzzKZ6u8UJ1RhRIyflSdEk ju8A== X-Gm-Message-State: AOJu0YzIDXBorWASX3JlnN8EsjL5bKdqKbFs75PqAZQklplHjKVdgl/u e/p7qHVR80ojstWdRAmAmpX7cbiB3HWqNe8HrNUxyQbsq7oNmVP5Sj+mPQ== X-Received: by 2002:a17:903:2447:b0:20c:895d:b41c with SMTP id d9443c01a7336-21183d55336mr219616895ad.41.1731432170558; Tue, 12 Nov 2024 09:22:50 -0800 (PST) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21177dc9f17sm96354265ad.20.2024.11.12.09.22.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 09:22:49 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Nov 2024 14:22:43 -0300 Message-ID: <20241112172244.1528-2-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241112172244.1528-1-jamrial@gmail.com> References: <20241112172244.1528-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/hevc/sei: remove unused inline function 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: o+rxugpaApd+ It's also a pointless indirection. Signed-off-by: James Almer --- libavcodec/hevc/sei.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/hevc/sei.h b/libavcodec/hevc/sei.h index 806540fac6..ee640003bc 100644 --- a/libavcodec/hevc/sei.h +++ b/libavcodec/hevc/sei.h @@ -109,11 +109,6 @@ struct HEVCParamSets; int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s, const struct HEVCParamSets *ps, enum HEVCNALUnitType type); -static inline int ff_hevc_sei_ctx_replace(HEVCSEI *dst, const HEVCSEI *src) -{ - return ff_h2645_sei_ctx_replace(&dst->common, &src->common); -} - /** * Reset SEI values that are stored on the Context. * e.g. Caption data that was extracted during NAL From patchwork Tue Nov 12 17:22:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:6704:20b0:4a6:637d:5226 with SMTP id mp4-n2csp449369vqb; Tue, 12 Nov 2024 09:23:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXQC6GNRpX1QPfVJkMAMov2V5AJCRWoPg7f1D47uW8AiwAI+3UUU53SHfigCvnI+FSAQk9GkQm7kpZcCIBGACX9@gmail.com X-Google-Smtp-Source: AGHT+IFu7jI6CRZHYwUsF2VCFa6owWNibTlODyN2jRWvaqzqXWvia+PqCYlrlF1N6yGLcKQbQ+rh X-Received: by 2002:a05:6402:274b:b0:5ce:cd60:8ecc with SMTP id 4fb4d7f45d1cf-5cf0a446ad1mr5946600a12.9.1731432207348; Tue, 12 Nov 2024 09:23:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731432207; cv=none; d=google.com; s=arc-20240605; b=hCBtyMQ0PXANk6gbZ6tJbK3kpnjIMXPHlDuEWjVCM/kOZpThATpKubjaO8T38bW/OV y0CpFleSwP19rX6dYEIuVkz+eEjGveaGiSmNowGuWaaLeesCo6gVQpHbLvcqlttRNTfq jUwi3s2+fL8jW8QQ45kgkjmQw9od9XqL3vut3IoP1FraIZM9Frv7uIE6fi6Ev6WI4B3i PHqS7TSPc7VZwSoUguV+knNm7sv3OLfrtSM1XKE4gKeg7LldJkeyDH9vqNing4UPaRN5 AGbyq1YJs/QZlhOK6xpTvb7YCiZs5yRncCaPgqom2Q2lCvPsZvGSuvEVYGq0wYxlqvsb a31w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=l5z04/7UTNBfIiVcxhs/IdOAUAnv9HAFeRyrmWKb2u4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=B6h1P4eFt2qkA9RyMppJlaIaFk3jC2v6ncro148kpmtLFOwVojVBDkUqeT4l31uear K/oVvW4ezzWdIZy7AmyuAcnbPFb3UDPHcsABH/F+6LnknaozcD72+MsXWKqi2x1P1y42 U0tks7b8OWu+tl1uIyL+tuKrigGXCCVKhd0JjiWogw2FNmwLb1ZTW6k9d6szSbZGLKtq 8NbRhVngKrLjp0CAodMBGWTR6YDGztV7m91S9L3rVsjiX/LdxbxwqMBLzERHiE90XGOx NaZmL9+FCS/3umJIWkxmU28kvxkPJJOfMFSDX7x7Lz5feXXbWzeUcj+uVV23j3HJUugU qiAg==; 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=cG2zyZzd; 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; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5cf03cd1831si8710727a12.567.2024.11.12.09.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 09:23:27 -0800 (PST) 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=cG2zyZzd; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A19068DE22; Tue, 12 Nov 2024 19:23:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 360F068DDB9 for ; Tue, 12 Nov 2024 19:22:54 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2118dfe6042so26444805ad.2 for ; Tue, 12 Nov 2024 09:22:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731432172; x=1732036972; 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=vqQx5PbDnkvq939bLFRzjeiL7kcGK3g2EqwR74o7ZRo=; b=cG2zyZzdgfMAKPdmLh0qkFAt8X0cwnLRSW++v42+FanMhIZvmly7L0EMYIDUBAOcz1 AeCoKNDrPJ0bdWbyqYKLEQ18fJSWFt6IHLu5q/IERnHZbQnLXVzmDIEUmbI1qVMjhu/k JrRNV4XDjTSCUkEAedJf3pp4czqt8VLnpB06Nci/PCWvP+NF03YhjTAXx2nFGMAvqIYH W4wILsdRlGdKNaA8xbj/+HdXc5VElVv6N5cBvTVp41AyNKrUB9buzmRhVNF9irhkVCap HWgCyJr1ozvZDZGQnJq1HcV1mdU/+S0cgrj9EJPdM2Ilw/bUsIX24501YW0zbOGw8839 wTSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731432172; x=1732036972; 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=vqQx5PbDnkvq939bLFRzjeiL7kcGK3g2EqwR74o7ZRo=; b=piZxsM2+YIpYeUE3Gi6CNnmOqZ/dtZCOu99s8x0RptD4sDT2qjI3TAzafIyzXiizg8 qvyY5SdcoFYgYfD3DGNMZaoO5Krq79fdBlawnpUQqAlR43w0l4qms5+VJxG++SM44XYi 3zwjOELLJjLQc2W5bgEzpuMJPpSkygPG4/UyOelNW0ocSVpjFxZpUtdJGBaWiEuyMpXv 6HzZFcY4LiscbpNvd8goPaFqCWsJlrDnn3P5+EHKiKsR4F2bb4++CXLcEvluGD7MBN+I Ff5GbTdwrAWf3QMfsiDQ24/er6iN0LCfnygMKVdCZYcFLK+s0PU5+6UO6XEBM3CAGSGJ GWwQ== X-Gm-Message-State: AOJu0YyOlFaT4yq8lgGnmeRHYNn3lavsi6y/9PxZmRDy3guTdIbQKAR6 VYTCnL49L63gSim2ubxQiwY6G6yaoddf+4L7miCJDCZPo+9hwGG3dKbozA== X-Received: by 2002:a17:902:f690:b0:20c:ecca:432b with SMTP id d9443c01a7336-211ab9b7ae8mr44258985ad.35.1731432172107; Tue, 12 Nov 2024 09:22:52 -0800 (PST) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21177dc9f17sm96354265ad.20.2024.11.12.09.22.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 09:22:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Nov 2024 14:22:44 -0300 Message-ID: <20241112172244.1528-3-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241112172244.1528-1-jamrial@gmail.com> References: <20241112172244.1528-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/hevc/sei: remove unnecessary inline function 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: Sz/6Y8MIgmyD It's a pointless indirection. Signed-off-by: James Almer --- libavcodec/h264_sei.h | 6 ------ libavcodec/h264_slice.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h index bb9275e569..8c8f6e6c73 100644 --- a/libavcodec/h264_sei.h +++ b/libavcodec/h264_sei.h @@ -129,12 +129,6 @@ struct H264ParamSets; int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, const struct H264ParamSets *ps, void *logctx); -static inline int ff_h264_sei_ctx_replace(H264SEIContext *dst, - const H264SEIContext *src) -{ - return ff_h2645_sei_ctx_replace(&dst->common, &src->common); -} - /** * Reset SEI values at the beginning of the frame. */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 08376ffa6d..c35ad9b910 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -437,7 +437,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->frame_recovered = h1->frame_recovered; - ret = ff_h264_sei_ctx_replace(&h->sei, &h1->sei); + ret = ff_h2645_sei_ctx_replace(&h->sei.common, &h1->sei.common); if (ret < 0) return ret;