From patchwork Mon Mar 4 13:06:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2789288pzb; Mon, 4 Mar 2024 05:08:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXFAoQUQfXBCn7cPONiadquGzq8H+672GEs/vXKvGBKNF/46nKOcJwm5nLouiU+XgthLb742ZTW+YEIabTifLUOOiJP8LRUUxCL9A== X-Google-Smtp-Source: AGHT+IEz63S3Fi4oxCEYe+G++D/5CvY9LnNLOS/BOQ1X9wd0Sr4Hfbu3j37pVqqynK3UostmavG7 X-Received: by 2002:a17:906:f750:b0:a3f:2b6f:6d57 with SMTP id jp16-20020a170906f75000b00a3f2b6f6d57mr6169487ejb.29.1709557722254; Mon, 04 Mar 2024 05:08:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557722; cv=none; d=google.com; s=arc-20160816; b=DkbudgS1UEbljL3O3jfat5sXHndqiM9kn6T3wxeDBZYAnGTM2+ti+BdleSnlWXMoYr 3o0mdsoK2lR+mquznm+W0SrOirW2qRqAomd/DatcrxsmlIGJWb2wgpLpT+VLjqoQ+uKr euWRsEqm2MO5SHERNREro+Syh1expki+pOKCbvCVu4Vv7VQLR3f7MmllBdoPpx7PAgKI EnsbTcdK4I5tFJEO34oCbgk6nUGychJzl+5R+Lw6HWNB3aylceFSDVXhKAbhzKv0IKrT vBA7K/my5jcQ0UdAybiQfRnXTvLvgsTqMaCsK0VbBZDMl+puyRTaTioihKDnxfZtJjf5 DYLA== 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=IqcaPTiGS8hpWT6zCxD9Tj2VSSpozum8AraehIVxz2Q=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=LdVwu02n0d+ucH1IpHK/sHNygaxPPpvLHnvNSZ6lJKCMGQZLZQFIXeLdGLEC3ba6vk u8wp0UzfO7Gm46+H3jZaJr8fRuF4J9uMKbLyfFzNCSiEOVi8R0Wq9wv0OuyjwfdzJiPX G3W1VKR82CxRx/IrCPZRjMg3GPUPcO1w2FHqak8W0VK13TINVDlq/QQCx3iFNdStG86Q n7ZhLQhtq8mETfrTIbxjb19TzpiXnWJHlxHmdTI+kDX7m1LWbBWw/m67PXUbWSqqJnKN FN1SAjr8LXDjQtA/Z19hzBhnDQPF8YKn/hbCq3kdvU8KBO+2jnvofpQQvITQiASGoUbL ESDQ==; 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=e9Grjy4f; 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 qk31-20020a1709077f9f00b00a4515b49cb3si1348557ejc.90.2024.03.04.05.08.41; Mon, 04 Mar 2024 05:08:42 -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=e9Grjy4f; 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 342C868D3B7; Mon, 4 Mar 2024 15:07:22 +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 683AF68D437 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=e9Grjy4f; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 905D34D54 for ; Mon, 4 Mar 2024 14:07:09 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 0299J4uVVHrq for ; Mon, 4 Mar 2024 14:07:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=1aJR+LwluwoSUi0bZzPp50PDeXNkqGaSR32ThKESvvE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=e9Grjy4fa6e/BzrUeyEV9/gqfa9PnDakYcV5XS7KnzWaWooB5mSHLgorLvVJPO699 UMPCg6izM5uqKMXHyJkjlWZ6w9ZsinWYPdUb/inoZFLPz2JEFHH2dQPlOzNjdEnSNv WhjDhSLS5Qa61YN19aJFpJcIIgJhE78+rt+PUG2dKezE5W2Ds7FVbYXJK88JE8cUce qcr8c/Uele9f66P1Oj9JVHTxDppEARu7EFZ3SUXd8fd+GktrcUsiGbohAjOQwGmS4h RTHikDqfQTiP7nXlJ5Ow59qCyfgfRqIuNyszGT5oxmnQX70TjXS4R91KpJ6h4yO4m2 GcpcTtMkkhM8g== 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 8DC364D5C 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 692F73A1050 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:27 +0100 Message-ID: <20240304130657.30631-12-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 12/29] avcodec/h264_slice: 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: OnfOzQ51l7qi From: Niklas Haas If the time code side data is overridden by the packet level, we also make sure not to update `out->metadata` to a mismatched timecode. --- libavcodec/h264_slice.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8464a0b34c..f30ff33188 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1257,26 +1257,27 @@ static int h264_export_frame_props(H264Context *h) if (h->sei.picture_timing.timecode_cnt > 0) { 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, + sizeof(uint32_t)*4, &tcside); + if (ret < 0) + return ret; - AVFrameSideData *tcside = av_frame_new_side_data(out, - AV_FRAME_DATA_S12M_TIMECODE, - sizeof(uint32_t)*4); - if (!tcside) - return AVERROR(ENOMEM); + if (tcside) { + tc_sd = (uint32_t*)tcside->data; + tc_sd[0] = h->sei.picture_timing.timecode_cnt; - tc_sd = (uint32_t*)tcside->data; - tc_sd[0] = h->sei.picture_timing.timecode_cnt; + for (int i = 0; i < tc_sd[0]; i++) { + int drop = h->sei.picture_timing.timecode[i].dropframe; + int hh = h->sei.picture_timing.timecode[i].hours; + int mm = h->sei.picture_timing.timecode[i].minutes; + int ss = h->sei.picture_timing.timecode[i].seconds; + int ff = h->sei.picture_timing.timecode[i].frame; - for (int i = 0; i < tc_sd[0]; i++) { - int drop = h->sei.picture_timing.timecode[i].dropframe; - int hh = h->sei.picture_timing.timecode[i].hours; - int mm = h->sei.picture_timing.timecode[i].minutes; - int ss = h->sei.picture_timing.timecode[i].seconds; - int ff = h->sei.picture_timing.timecode[i].frame; - - tc_sd[i + 1] = av_timecode_get_smpte(h->avctx->framerate, drop, hh, mm, ss, ff); - av_timecode_make_smpte_tc_string2(tcbuf, h->avctx->framerate, tc_sd[i + 1], 0, 0); - av_dict_set(&out->metadata, "timecode", tcbuf, 0); + tc_sd[i + 1] = av_timecode_get_smpte(h->avctx->framerate, drop, hh, mm, ss, ff); + av_timecode_make_smpte_tc_string2(tcbuf, h->avctx->framerate, tc_sd[i + 1], 0, 0); + av_dict_set(&out->metadata, "timecode", tcbuf, 0); + } } h->sei.picture_timing.timecode_cnt = 0; }