From patchwork Mon Jun 29 14:44:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20727 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2866104ybm; Mon, 29 Jun 2020 07:45:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3ktFWzLA9pbN8b0g2PTIu4Op0KYcVgPgoLRMDdos4UxFfMQhBn210sxGmNiKwlXTBnYHI X-Received: by 2002:a1c:2d83:: with SMTP id t125mr17400212wmt.187.1593441901868; Mon, 29 Jun 2020 07:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593441901; cv=none; d=google.com; s=arc-20160816; b=r7KsAuN18ZL42UJrxxDtQLkB9dpN0y0ihAMqPcdM6hWyyJEQ5KVMXs3LfkvNzhj92C hnmHQxODetrhzqFN/rCqcch83j7UTasAS9pAMJ4YWsShlG1kCsUEPqbl97JJ1B4iDH/x DtosDlZ6GxGpglp4rgUVFYV/UyeDiGucmG20OLU/xOujGvaetcAMh6srvHp4BGh08EUf BEcJlnGY/BClW6YO6WhLGKvQQRQJRz+zf4554cx+RzG6D2fgjVR1qBT3wSZ2LAE0nxmP acy5wtfNQZipTeHqbL3OgCSnliho7kPDzGMRp+SPmCRi6iwMJARIrfcabiXzJUT2AaXg B42A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=9PNQliuPZsr50XvhSRbYrKitGNb7pWZj0Wbe1gVpU9o=; b=pP4Ad3Ol/Nwl3OpXLb2UR93VOwoaMYjKiCnUrKj5DMnT6v1TMSPDBLwCR2imcHhsKa /Bs5DL4j+CyEMs1jpeLoRy/MRjC8D1LFeJ9HBBXmzPojktedHZ6d7B4fm812oozIGdPI Xuoybxf7IekYBWMd7QgeLWTkGK9gdQE3OR6DtVDJH9PO+vUPDiHry8PRiVSfrbf4hmQ7 KYerC5OjE2+0USJ7cSt6133eAYhzXX5SL0B/ZXI3RagYk5lGWKhnu+ab0nA+2B41NHaC ChOrh4zsIwHrL3nZ1GUlhgRtH52EZL0x2wj8gIl2jdr5puLfB2rpQPYLop0Pqsh+1Vax 3okw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XZYlJumZ; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u8si129457wrm.67.2020.06.29.07.45.00; Mon, 29 Jun 2020 07:45:01 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=XZYlJumZ; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFCB668AA33; Mon, 29 Jun 2020 17:44:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA4036882F5 for ; Mon, 29 Jun 2020 17:44:47 +0300 (EEST) Received: by mail-pj1-f53.google.com with SMTP id b92so8116987pjc.4 for ; Mon, 29 Jun 2020 07:44:47 -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=3RSy/VoQR1Bn5KpvW6ZZywmquILdxh1+VsIclqhvaSM=; b=XZYlJumZqxn+hICEsGlr6F6KrS3UhbWAGZw+7e9lo1xI3QwhB4uDd3wNZbTIqZwnhP +Ua/GwP11j+9ikPDgGrSot3LojmixRyUeClv04sDSqOGjRX5NbAUN9warjnKHVAlv2Ra f7chvyT1hztxIWnGSeELkgR6iOKfy1jAxs3Hh3byqQjDJiBa9OdIuiF2fKfvhkxvVPwF 0KKawwKsXUMLAg/1ufb+2FAg0hZJk7q6uuYtRqlxEIgA81l1yO0ug8wfClFvvUlQzR0B 5+njnqGwS8IOEN9kx44Tpq2gqdRcvL9xdTwvy2QAEBVseIjmsox9VUe26MM72wKDrG1v LOzg== 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=3RSy/VoQR1Bn5KpvW6ZZywmquILdxh1+VsIclqhvaSM=; b=VDWpOa2zLop/Vaie6gSojwjk+ZFjEvyPW/eQIRCKcHxr2GQRYA+5waldC6cIcH3EJe uA5TXV+H9zMknFpHEVyiWWF5n7vBnnaK0N4Br2SXvUNyT44PjLDcSVALxT/6q7GVeDu1 WCln4optkclbdNnMWjCgZKu9zOdwx04c2VkL/uZ9yElN1SNUgWHKscXToAPYZyaTnY/P A4eCBLz3L3jemVerlVsRAjkBLHZlVoIVRCQkFlobiPVHWghM3Oa9IhgUxEgme4HRtDkq n+j2tKT8Qb/GU2V2B80vcjUtqtaonAkZ/1A+vqZmzsxR/VkAIsdhQOpBx/RFxndOMf/Y NvUQ== X-Gm-Message-State: AOAM530Jgm5Qf2d/IR9NsKCBq7SI47kKkpxzbIehdICMw1jdfBneuo9C WA1adTZOF4g4Gjq/6wmZpY7/wOu7 X-Received: by 2002:a17:902:b197:: with SMTP id s23mr6264002plr.157.1593441885588; Mon, 29 Jun 2020 07:44:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id m19sm40930pfa.114.2020.06.29.07.44.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2020 07:44:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 22:44:39 +0800 Message-Id: <1593441879-26057-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592663151-24180-1-git-send-email-lance.lmwang@gmail.com> References: <1592663151-24180-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 1/2] API: add AV_PKT_DATA_S12M_TIMECODE to AVPacketSideDataType 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" X-TUID: OEiuDqEXFjgB Content-Length: 6420 From: Limin Wang Signed-off-by: Limin Wang --- doc/APIchanges | 3 +++ libavcodec/avpacket.c | 1 + libavcodec/decode.c | 1 + libavcodec/packet.h | 6 ++++++ libavcodec/version.h | 2 +- libavformat/dump.c | 21 +++++++++++++++++++++ 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 1d6cc36..7cad7fa 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2020-06-xx - xxxxxxxxxx - lavc 58.94.100 - packet.h + Add AV_PKT_DATA_S12M_TIMECODE. + 2020-06-12 - b09fb030c1 - lavu 56.55.100 - pixdesc.h Add AV_PIX_FMT_X2RGB10. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index dce26cb..24e2a74 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -400,6 +400,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_PRFT: return "Producer Reference Time"; case AV_PKT_DATA_ICC_PROFILE: return "ICC Profile"; case AV_PKT_DATA_DOVI_CONF: return "DOVI configuration record"; + case AV_PKT_DATA_S12M_TIMECODE: return "SMPTE ST 12-1:2014 timecode"; } return NULL; } diff --git a/libavcodec/decode.c b/libavcodec/decode.c index de9c079..f2244fc 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1699,6 +1699,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, + { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, }; if (pkt) { diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 96f237f..d84aaaa 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -283,6 +283,12 @@ enum AVPacketSideDataType { AV_PKT_DATA_DOVI_CONF, /** + * Timecode which conforms to SMPTE ST 12-1:2014. The data is an array of 4 uint32_t + * where the first uint32_t describes how many (1-3) of the other timecodes are used. + */ + AV_PKT_DATA_S12M_TIMECODE, + + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may * change when new side data types are added. diff --git a/libavcodec/version.h b/libavcodec/version.h index 0359302..482cc6d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 93 +#define LIBAVCODEC_VERSION_MINOR 94 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavformat/dump.c b/libavformat/dump.c index 117c681..0f64c4f 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -34,6 +34,7 @@ #include "libavutil/replaygain.h" #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" +#include "libavutil/timecode.h" #include "avformat.h" @@ -402,6 +403,22 @@ static void dump_dovi_conf(void *ctx, AVPacketSideData* sd) dovi->dv_bl_signal_compatibility_id); } +static void dump_s12m_timecode(void *ctx, AVPacketSideData* sd) +{ + uint32_t *tc = (uint32_t*)sd->data; + + if ((sd->size != sizeof(uint32_t) * 4) || (tc[0] > 3)) { + av_log(ctx, AV_LOG_ERROR, "invalid data\n"); + return; + } + + for (int j = 1; j <= tc[0]; j++) { + char tcbuf[AV_TIMECODE_STR_SIZE]; + av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0); + av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != tc[0] ? ", " : ""); + } +} + static void dump_sidedata(void *ctx, AVStream *st, const char *indent) { int i; @@ -468,6 +485,10 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent) av_log(ctx, AV_LOG_INFO, "DOVI configuration record: "); dump_dovi_conf(ctx, &sd); break; + case AV_PKT_DATA_S12M_TIMECODE: + av_log(ctx, AV_LOG_INFO, "SMPTE ST 12-1:2014: "); + dump_s12m_timecode(ctx, &sd); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d (%d bytes)", sd.type, sd.size);