From patchwork Fri Feb 23 13:58:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46477 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp993887pze; Fri, 23 Feb 2024 06:34:41 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVj77g9k/zTILZ7xXjLdnwP+FP/i92y5O/P8NhlD1EASMBEoTxggsebTH1/DqqbXc9QyEz0C+tebCvicEUCV3ipQOoz6GhSGZFg+Q== X-Google-Smtp-Source: AGHT+IF1q86VjJcq9p4HV7PMIal6tp8d55BvYqN/0GCRpqkq/KFtdPv24eR1I7QBVQa4duRIdi4i X-Received: by 2002:a17:906:2c53:b0:a3e:ffd9:281e with SMTP id f19-20020a1709062c5300b00a3effd9281emr1252728ejh.77.1708698881471; Fri, 23 Feb 2024 06:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708698881; cv=none; d=google.com; s=arc-20160816; b=RGuzSaEdGRYeLHu2ZRAjWX5o7e+xflVOQ+/YrkNY6L1oAb6TSs4wKYOtO/ONRwU8c/ 4IdKPP6V9C70lYsAIc4qNq38FQ/+Kg4LOaIxo879Ptf/S0ZfWfQfKjoEyXNvlPUDmSC+ 3eOjr21OcogQjXomeEOsAKEubEbjZK8+zKSOzJXZ7N03WNHGchMKym45aXjKZfWjti94 u9/cxtbbSCcD/1BIpz9NmOJ3u8RnD8WTzTfCGm5s1PBxDE6J5p9Xh29gWJUz2tBWsNOS PSuUsYNw8jasJBlFAWQWPmAOhoXdVvAGbt2liRxYHNDz01rhDZAMdjunmYzLUfjp29KX vshw== 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=DJkWTWASdC/6Nn3G7Kp/ArWD39eKb+lKp4aJQqPS1UY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=a5+QVExFhi4Te7IFlSPB2Apw8wy+YuW2HwE9rOkqhIt3ZElzKmF6jgRm0TF6tVkVns kz8ckIJkfQCpOM+mC0L1JICi7MHJ0pqS77c3S6ExT+wn9/bDdEwtUfLfpklLZdG0N6ZE GRXlzFVQqaGj7zPNrQBZfTCC5d/9612h/GcueZY8kqidE9IACenMwjaH0CQJ9kBHG1Ic X6nwxtyiFRsTGlGTLPlCzcqp5V1Vpf3fFziQyfI4FwKoCUJv17aXCwQKL6tKKtctEBMP Ato54aasalt5t/UOs+N5IaTgf3RPRHGYSZCie4mS4EYivJPuxRo2jt5Dx0evDCcHHC5v 31Bw==; 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=MHdpkY1u; 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 gs18-20020a1709072d1200b00a3e819b857csi5304530ejc.82.2024.02.23.06.34.41; Fri, 23 Feb 2024 06:34:41 -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=MHdpkY1u; 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 6DDA368CAA2; Fri, 23 Feb 2024 16:31:59 +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 E155E68C692 for ; Fri, 23 Feb 2024 16:31:35 +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=MHdpkY1u; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id CAE994CFF for ; Fri, 23 Feb 2024 15:31:35 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 2ds4e2eCRTdP for ; Fri, 23 Feb 2024 15:31:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698688; bh=tXUY0imMRuTMiZoxEWnV+v7AfMMGX/qRpB49BDs6gvg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=MHdpkY1u/Q0n82o7/dBdj8mi2hAA7IOPV2CVXrfy+iDjRGDqgP6rAUMwwmVuBIE9K qLcbKo6yfS/Lr6WAxS4AJ8NmTLO4I4hBRHqrDgiejFPSa4OzApZqDJC5aZWMnO0wXQ fZxniU7Pi3WhxdUV8vlyuohW+EuX4Pv5sHHWyGuxHgOWofHEiBWSTmJuugP9IqTbW3 36cnyOXbrauHKGaSliSc7NFXJzP/pK0E1FeoVXuw5bX/MrK2ko4eU0a+o5OyQyugyj 6SU/EKRUf8eK676frqZGjuBy+2FfOro7me9Z56BMNjzNYi7Rq4RncAIJJmby52jFP7 u//ahdoTqaUDw== 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 AF4EE4D6C for ; Fri, 23 Feb 2024 15:31:28 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C7EE13A1EDF for ; Fri, 23 Feb 2024 15:31:22 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:43 +0100 Message-ID: <20240223143115.16521-22-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/38] 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: lAwgnqktugxm 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; }