From patchwork Tue Jul 14 23:29:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21025 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AAFD444585D for ; Wed, 15 Jul 2020 02:36:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B62568AE37; Wed, 15 Jul 2020 02:36:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFA9768AE37 for ; Wed, 15 Jul 2020 02:36:16 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id n5so153262pgf.7 for ; Tue, 14 Jul 2020 16:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PfPUDPSKlE0UFQ70ymGHanTWNYyRlQ2O90Vn/IHc0H8=; b=LNZ7G+JRS/i4aS84NpCHI37aNzLU1Atggb+KHJeT0trlTp2gqAi6LP3tI9kieoMry8 D626n5DKfI8ZBgGO5F2AHofvmaDbLKwagCziovO5R+MKzRqYvF0Le8iat+l0mwt8Skkx 6FUs3d14IjgJH2MhnIopbtKzBdaqaE0UYudMcdhK1gr0ScXptqc/+kziXrn31hCE3yKf vHVW+VMGxm2VLUx5fYTLQG7jJf+GwDGsGAvfbg3a5mvIASDqVRyIpvruDWokdMdo14S/ ErD66XCS1Szr1+2Igt/zaARTi2CG7LO477y8p4FXWFh/CCrW7HKFjEELCfllExBg4sUt PK2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PfPUDPSKlE0UFQ70ymGHanTWNYyRlQ2O90Vn/IHc0H8=; b=qKZkeRm54iEIMpPr9pQhmsCrIm/hA8aiYIla0jeRDNoBn/87G9DjvEEa2wK7ryMd+V vQ2GeOHvKc5YVswu49Zfs8KiVBtoRIj//o6afV9v8bMsM8S9NslivgDKrMSf3Q+DHzZb AdAauweDJc+RImnz+xgPtx8c70gdpqJovQW6oixmz7iv5Lq6TC9BopwYyn7YuxZ+34dB LDgT9FnCnLJRauhLzE6XBXXYdCJ71m+CKtuZQd6DEOgGe090T5rkcTgmy/3/SPAvPp1F XdSlK8CKujOR4E9xFW3fDIVz/RNUhS3Jz0ztkz5Oi4YkSb14tqOK5Hr7tLPPKlcjjNyE HVQA== X-Gm-Message-State: AOAM533d0ku3ZTTumu5lqlUVb3uybnX2ezCBdGt8C4hIJVTTKqtFUR/G FIDlvbNJbICmGgifRDPjv/gFp48r X-Google-Smtp-Source: ABdhPJxLPuxQZuIx84uDS9pYNz27Eyx74hlU8k1jLaV36sKydZFBo7k1sj5RwKsXOea4mWa522hI8g== X-Received: by 2002:a17:902:6a8b:: with SMTP id n11mr5754487plk.264.1594769418273; Tue, 14 Jul 2020 16:30:18 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y198sm212954pfg.116.2020.07.14.16.30.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2020 16:30:17 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Jul 2020 07:29:59 +0800 Message-Id: <1594769402-22526-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1594769402-22526-1-git-send-email-lance.lmwang@gmail.com> References: <1594769402-22526-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/h264_slice: export S12M timecode side data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/h264_slice.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index c7b2764..db720de 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1307,6 +1307,7 @@ 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]; + uint32_t *s12m_sd; AVFrameSideData *tcside = av_frame_new_side_data(out, AV_FRAME_DATA_S12M_TIMECODE, @@ -1316,6 +1317,12 @@ static int h264_export_frame_props(H264Context *h) tc_sd = (uint32_t*)tcside->data; tc_sd[0] = h->sei.picture_timing.timecode_cnt; + if (h->avctx->export_side_data & AV_CODEC_EXPORT_DATA_S12M_TC) { + s12m_sd = ff_add_s12m_timecode_side_data(h->avctx); + if (!s12m_sd) + return AVERROR(ENOMEM); + s12m_sd[0] = tc_sd[0]; + } for (int i = 0; i < tc_sd[0]; i++) { int drop = h->sei.picture_timing.timecode[i].dropframe; @@ -1325,6 +1332,9 @@ static int h264_export_frame_props(H264Context *h) 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); + if (h->avctx->export_side_data & AV_CODEC_EXPORT_DATA_S12M_TC) { + s12m_sd[i + 1] = tc_sd[i + 1]; + } av_timecode_make_smpte_tc_string(tcbuf, tc_sd[i + 1], 0); av_dict_set(&out->metadata, "timecode", tcbuf, 0); }