From patchwork Fri Jul 10 13:22: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: 20942 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 1B20A44BC80 for ; Fri, 10 Jul 2020 16:23:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5A356880E7; Fri, 10 Jul 2020 16:23:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A71668803D for ; Fri, 10 Jul 2020 16:23:10 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id f16so2614607pjt.0 for ; Fri, 10 Jul 2020 06:23:10 -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=e4vkBq8WIhD0cJv779foljQFvJEvOYCK5WwI7JRJ6TE=; b=ZBYnkJWW1hcS6dCor9QhWM5TSKvV5fjYbdaPwWQdNiM407wY4CgZEhZZvm9zXG7xiX q51iMdUgmx6OU/EeH8xv5C0xQjC09xFhkqIxGhWj3sqs7OSazmJMCj5uK+k9VBWMGaST QO1IAzm1tYkMa2T65RUQ5MdbU0GfRd0WoNozN0YpZKXCEYWCq94HYOG+5Gv4Z3CiYuM1 Gg1uI8aVIsZq930dphBFox3aUcDCFp2KbYFEEXyW2neXa2GFUKbZLwKXuXn/CrKHEDuj D0p9FGNFeZzrxKNP4niMFE+W2SrpdadAtdOZlkYe2A1Itbl59wPctbcyDqI2fzIC3wub x73A== 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=e4vkBq8WIhD0cJv779foljQFvJEvOYCK5WwI7JRJ6TE=; b=lVas9PNPSVvdhwCiXmq/AbXZr3Uyu6feI97K8ihod5kXmvdzDiG/K66OEmFcGKySpF HLfYoBw3ho1GQvniBTkhH6HkPZuxum2cWWgE9EeUOoW+cHNwxxUP1ZI1bzDyJ8r/kEdB Juhqq1qLASQ86gH/FrQrJygI6+9bNGDO7HCSnGE2bgvJoJtO7yyKqiHUUU/8ICyoV5Se XX/gww1sBVaMMsRs9WwOMwpct+TPUjar7g+ubHNuxa3ylbERjbtMluO1bUumSr/eDsv7 SSH25qWfIhwmdrlBLqgSdmr1qgY8vRYNL3+G3GMZhs+zJClDf6XVuxCg69B8PKoEeTqt j/vg== X-Gm-Message-State: AOAM532s669fk373ohmlMSvWGkpany6FtQUE7k/bLoiZVrm9SR7UWUOD QgR6tzmbYWvqsJ5oba+VESJfI6+q X-Google-Smtp-Source: ABdhPJw2RK86OaYvAG9P0w4gMCHfyC1hyRQUVOMcBCklhlOoCHRlBFMZVjAviHlV6oqzujojEnXelw== X-Received: by 2002:a17:90a:2427:: with SMTP id h36mr5592140pje.229.1594387388002; Fri, 10 Jul 2020 06:23:08 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id g5sm5694099pjl.31.2020.07.10.06.23.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jul 2020 06:23:05 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jul 2020 21:22:59 +0800 Message-Id: <1594387379-22873-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593610798-21093-3-git-send-email-lance.lmwang@gmail.com> References: <1593610798-21093-3-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 3/3] avdevice/decklink_dec: export timecode with s12m 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 --- libavdevice/decklink_dec.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index a499972..8adc00b 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -42,6 +42,7 @@ extern "C" { #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/time.h" +#include "libavutil/timecode.h" #include "libavutil/mathematics.h" #include "libavutil/reverse.h" #include "avdevice.h" @@ -882,6 +883,21 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( AVDictionary* metadata_dict = NULL; int metadata_len; uint8_t* packed_metadata; + AVTimecode tcr; + + if (av_timecode_init_from_string(&tcr, ctx->video_st->r_frame_rate, tc, ctx) >= 0) { + uint32_t tc_data; + uint8_t *sd; + int size = sizeof(uint32_t) * 4; + + tc_data = av_timecode_get_smpte_from_framenum(&tcr, 0); + sd = av_packet_new_side_data(&pkt, AV_PKT_DATA_S12M_TIMECODE, size); + if (sd) { + AV_WL32(sd, 1); // one TC ; + AV_WL32(sd + 4, tc_data); // TC; + } + } + if (av_dict_set(&metadata_dict, "timecode", tc, AV_DICT_DONT_STRDUP_VAL) >= 0) { packed_metadata = av_packet_pack_dictionary(metadata_dict, &metadata_len); av_dict_free(&metadata_dict);