From patchwork Tue Jul 14 23:30:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21024 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 601DF44BBA3 for ; Wed, 15 Jul 2020 02:30:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C34868AF66; Wed, 15 Jul 2020 02:30:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD8BC68AFE9 for ; Wed, 15 Jul 2020 02:30:24 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id m9so41582pfh.0 for ; Tue, 14 Jul 2020 16:30:24 -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=Or56HTgsKKpTu93z5rpqHmE34lcwce+sPjUF7v3tEFA=; b=kZ25+ctm02evzD5JXiPAoQwLnW8zo2nHDZrsOWBQzXxMN/wJkR61d1WjcpcMbgKnd0 F54CoyiD9aClovfjkqW83gc+yL3QNEV4d97014PThpxw7z44C3AIIwI/ilIWYYYyDcou NyrwZqp1l6uBSkRLglYCg9fDXgG31vi/8wErR723zw6GmQk9FrdaCpD+H2ub3jJw4cd/ PmZQvqHWQdd81Jj8ERd+Bix2QiiNfefEMIhkjPXbGkb0FGKdmUH5ZME7PuTHoM/kelPj ILh8GL1MRlMk0JRav/sbEj2ru1e0SepLFz5NPnRGwWMz8ox9cK/jCnWuumovuD0Uxu2J 6Yng== 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=Or56HTgsKKpTu93z5rpqHmE34lcwce+sPjUF7v3tEFA=; b=U0NwdBHiQBiD+0HCrFSUoblFy6PVNp+V77pypUgRomQzH+krIO3CTbGYS5BaXWlT7d CeYu0QWEFENO4ImKCUXfJ7hZN2a5VkDlBI6Awzaq8vmTiA6a1sHn0YObN1BhfC1EipP9 Of5L7VepcYWCDt/qD374otfPDvxrHL2IdMj8/IxYUG2Ol7yBPq5C9bEsH0W9S3AeQ/OW 6i3OBhEeWHiKhOle1dlvg8mshw17j9mv66vZbuwxWf6s5C9qmNKqr1ac5Ralm4/aZSVg oDbNzakfeinqsPrp/FZpaLjQZIp1FgC2B8NqC56uLcO7jfns1cHAG7O0LJnDl9Jo3VBu haiA== X-Gm-Message-State: AOAM530IcaPu8MBaehHR8vt3B399jC1myIdDgG5R42mqcclj5z3XAzyt Cg30y8F/zW1PoC0/NCKWBCZ6AmeK X-Google-Smtp-Source: ABdhPJyMA8ELfsSPa/xIlZIoKzjC2Em+iR+gyEfZuvM1YCmb2dUeRVccpcQvDwNUglxG2bdsD8Az+Q== X-Received: by 2002:a62:794e:: with SMTP id u75mr6308609pfc.298.1594769422854; Tue, 14 Jul 2020 16:30:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y198sm212954pfg.116.2020.07.14.16.30.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2020 16:30:22 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Jul 2020 07:30:02 +0800 Message-Id: <1594769402-22526-6-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 6/6] avformat/dv: use the stream s12m side data for timecode track if avaiable 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 --- libavformat/dvenc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index b04d604..b5fea8f 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -396,6 +396,18 @@ static int dv_write_header(AVFormatContext *s) } if (tcr && av_timecode_init_from_string(&dvc->tc, rate, tcr->value, s) >= 0) return 0; + + for (int i = 0; i < s->nb_streams; i++) { + uint32_t *sd = (uint32_t *)av_stream_get_side_data(s->streams[i], + AV_PKT_DATA_S12M_TIMECODE, NULL); + if (sd && sd[0] > 0) { + char tcbuf[AV_TIMECODE_STR_SIZE]; + /* use the first timecode */ + av_timecode_make_smpte_tc_string(tcbuf, sd[1], 0); + return av_timecode_init_from_string(&dvc->tc, rate, tcbuf, s); + } + } + return av_timecode_init(&dvc->tc, rate, 0, 0, s); }