From patchwork Mon Mar 4 13:06:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46772 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2791069pzb; Mon, 4 Mar 2024 05:11:25 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV9fgLMOS3NHN6GhJPXBkfEjTEFQg16+cjHFuffM/axAWUNaAXaVCjO1+NLPYxYVQ6vBdth2BaXzeBAl9WNq4PKcn1DzHkZdZ4eqg== X-Google-Smtp-Source: AGHT+IGpYRFzex+l1TDl/cHrXfkgxbZJR/NR0Huorfl6sqVfTBtmrcEwZKrsrFNYIqwtQaqaPhH9 X-Received: by 2002:a17:906:3846:b0:a3d:ed30:11c8 with SMTP id w6-20020a170906384600b00a3ded3011c8mr6681934ejc.15.1709557885195; Mon, 04 Mar 2024 05:11:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557885; cv=none; d=google.com; s=arc-20160816; b=ubClEkS74BbJfsAJylz0imXhHWzazayL+Znzy/Gr90sqPV7NWfs+QW1WANZvGeOIVZ oXgGVsRXF97/eUeqpWT/6kiC0pyr9LHRra9GUIspoz4aIPo7hImiQAya8iA5qtLKD0rP T2noRLoUIiW7ZRbX/M/ieoSVE6A2S76IYjbIV7Tg3anpwKVvwdNyPXTNo2kjMRtL0Hry spEpnKqjxgUjlls4TAtCaXD1y7A+lysFdM1OLkY7Ej9d3vN+YIfxYJtQ9WtJw4mEkplh gmaYHWhPXarr50oCPoXjxdwCJodvfGnaM/gGaZMTif8pmBXwiuNatIQV2y8FoRkA/26v Rb+w== 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=EuOPPzWmh2YtIF1Iu6xw70UOLdtUlKg+1LZWKY8UM8M=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mvtX4mX1RMtySoXdFLAdds1e456u8nrbOtqcBiHW1dYKvrqisnCF7owqTGea0Fl3qj wwBcOEyzRp+lKKKYKhfk9sfsI9KS0+DmeC07r1ozDem6xFsDzMkuANIVvy2IcWZ/14ck fSj72Y9DfZsaypemPQ7cx+UqBtJ/E5Nxgl+AuhAdkJ8KaM1UQ632E/0nQ1dAV8ZDLSOk g4PcXwa3L/7VZxZASj0FsH8HOid9N/mCMEzBXNUIN9NegyYiSs0gV31zk539zWa7c2HD MdBfTR3wvm7Z5s0NBC4EB39mmRHvpbfsFXsjfpmUDNH2yYkyhG8Ky/iyIZnbScHScFFX xfoQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=UIfEOIcC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a3-20020a1709066d4300b00a388d084d2bsi3912568ejt.744.2024.03.04.05.11.24; Mon, 04 Mar 2024 05:11:25 -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=@khirnov.net header.s=mail header.b=UIfEOIcC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C78CC68D459; Mon, 4 Mar 2024 15:07:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C065468D43B for ; Mon, 4 Mar 2024 15:07:14 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=UIfEOIcC; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 151E44D61 for ; Mon, 4 Mar 2024 14:07:11 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id o2C5XkYsgPTC for ; Mon, 4 Mar 2024 14:07:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=GEGNEp7HIy5y2kd87yuwNys3coA8OD+ynNQ1qWusLpI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UIfEOIcCy2YIfZoDs/cCX7bXXSso+xDxszm42JCoNt0/4gmskbyb6SLJvc4JOZL+8 ZCi5Z6eWS4b4aQ1qhgpPIYRGMDWKMKQ/J0+tBwCO3QGcxFyd6pgdtdrfAmVfX5X7qK bo+DAJEmEq8v0I4kVQpb2BFmlAYQcuLHDvsyXjGaAsMU+OCnimnkvLmSqLbsoQNDbE 2X0jNUtPFyuMrbzA9pxvnowO3hENFqDjEIBCf59Ok2/4vlZWwM5SAmP+NwKQNP6JwS TbWGOMlebqWWoQnKsMRDXFuYC6zBk7tiaE/gM7NFC4k7IoWD8vSbZvCnedS6P1kBpc DnZrAEyDieoOQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id AE8DB4D6E for ; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id DE6233A16D3 for ; Mon, 4 Mar 2024 14:07:00 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:37 +0100 Message-ID: <20240304130657.30631-22-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/29] avcodec/dpx: respect side data preference 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: l4pC81lN+1OS From: Niklas Haas If the time code side data is overridden by the packet level, we also make sure not to update `p->metadata` to a mismatched timecode. --- libavcodec/dpx.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 31e4a3f82c..80616d98a2 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -287,19 +287,21 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, tc = av_bswap32(read32(&buf, endian)); if (i != 0xFFFFFFFF) { - AVFrameSideData *tcside = - av_frame_new_side_data(p, AV_FRAME_DATA_S12M_TIMECODE, - sizeof(uint32_t) * 4); - if (!tcside) - return AVERROR(ENOMEM); + AVFrameSideData *tcside; + ret = ff_frame_new_side_data(avctx, p, AV_FRAME_DATA_S12M_TIMECODE, + sizeof(uint32_t) * 4, &tcside); + if (ret < 0) + return ret; - tc_sd = (uint32_t*)tcside->data; - tc_sd[0] = 1; - tc_sd[1] = tc; + if (tcside) { + tc_sd = (uint32_t*)tcside->data; + tc_sd[0] = 1; + tc_sd[1] = tc; - av_timecode_make_smpte_tc_string2(tcbuf, avctx->framerate, - tc_sd[1], 0, 0); - av_dict_set(&p->metadata, "timecode", tcbuf, 0); + av_timecode_make_smpte_tc_string2(tcbuf, avctx->framerate, + tc_sd[1], 0, 0); + av_dict_set(&p->metadata, "timecode", tcbuf, 0); + } } }