From patchwork Fri Jun 19 14:35:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20516 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp553445ybm; Fri, 19 Jun 2020 07:36:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrCvPXN6wy8m6rW+hA1YEhAM2XG5iCoQV5CUQjNbCWoVO/wgoAmJQsj7hzBxpACBMFL+Vd X-Received: by 2002:adf:8287:: with SMTP id 7mr4747680wrc.124.1592577368145; Fri, 19 Jun 2020 07:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592577368; cv=none; d=google.com; s=arc-20160816; b=AYYf7RZ/5aa8IMNudielMG3mQDRZN6rw8rr+13yRt3jYLMerJuZYR4OvxOM6IML2Ld E6bZ1/NHjfZ4xM1h1PFqywiaf5aLndkP6rFaQMnTwjM8BrU1qanUBW+bArhgNKZaJTaz ZfJXxuTFqJblA9K3ddUIHYN26AEiAhqoq5Rmy77ww7RkM+faKcx6jg499BWKjhPWm1AK oKUGOAmJthDUsRk1Iv0ObAAGR19yo2S/cSaKIO2ZuczCW2fLUNdDE37jcubAJSPx6SPO +7y/iN/UmwSoFP0DRWVwurFlR7BpWuwQIHpBpGzS9Ju5Twz/2IFvHEQzczdcu3nHKYdz SS8g== 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=GyLjTNbMH1sTUiWgBrfvY6qynbWCtKcMYQfOkkvqmEQ=; b=B91bcgHCYIw74t5bdpIvh5X45mL9Xu7v7Du9h7u5QvpIPFOnLUIdxASPMJYopmKzWc hZjIx669v6npXm5B+cQd1olLy5ChzS/yHxLXPbbM5wCaNIE6BTZT3Qm0vS5CzUDMn5KA AC22Y/EyXm6jPzw0uGBq+k0qoUESf0UE8hUUa8mweZO7BaXfnFTRUBaz/BNKVTCFppWO ptKZipTRZr+fjQbj4vaaSKIzL+35YcVy9equc+cO6FRNtoCZ4rrDbY6rrwK9SfkM9nvW oTJhasBiLcppTNwE5NP69yfJI9lEYVp96rnC/dzuD+cc10+JTX42iuFyPlwsXX18gKHL 1c4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sjjVNb37; 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 b11si6194149wrv.514.2020.06.19.07.36.07; Fri, 19 Jun 2020 07:36:08 -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=sjjVNb37; 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 8559668B705; Fri, 19 Jun 2020 17:36:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE93D68B6EF for ; Fri, 19 Jun 2020 17:35:55 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id l24so4575610pgb.5 for ; Fri, 19 Jun 2020 07:35:55 -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=4x72NcPvSX6wYG6I8eYvx+JeeVgZc9TteA0IAqcO890=; b=sjjVNb373vbuUz0IzP0TKouDAMJtAJt3YYXot11Y7F1EKD9a6GDffWuuQtUYLG9HRq GZncYqkJDggP/BCNk3exxEAdP+Zy0BU+UVaals3p2fulPI5Edm0OMsHJHCfQqW7jtcDc Ln2ZoKwiS84FiEZhcniRiwaC6Mb5j8toqYRnvyJciTJ2LWqCwyebTxR8aNnEWRbHEOSw Utw5WbihMiYRgKDBVnXsdM/dZNBRm714GenDoatDX+Ir+scLJ6wrbVk5t6jsxZwnfwdI o3hA0CyDDG4HXThI/EvXmGiU/YAhCtz6kQoSaEbNRAdMOl4f3r/dZu0o1U4x7CV480Dl KfWA== 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=4x72NcPvSX6wYG6I8eYvx+JeeVgZc9TteA0IAqcO890=; b=Ab44N2gY1dNAsqip+NI5EVk/nfV4otYjiWLWhqXLZC+FQTdfykRQgQosxXKFvcfsWI njw2USXtQXyw2bNNdV2NW0RTITuw9QPRXG5+6UxAUtM/j/Ss1MmvdRZF68ac5cGl6eGH X8Wc7sOXiiyA3ILx9HWM27FE2V9maBV2m9SNkbPKVca16osPgf9eQO4KqPdBXsxYL0MD GV8V/W6ufz7DVs9OcoDXC9nXWUXpuCMeEnq4YpoYchGUrJKAQbdsPukvHnGzAAjhzr9J 286K6F0v+LUOWmwZ+/FClE0wT8p8b63rsn9lt6Xk0JnNNeOVZIKub4zEBcOfR9iZn/NE /pFg== X-Gm-Message-State: AOAM533qEfxAanTLAt+/B12zXAEkFxBeiXsb6n/AT0WCMEkoEFQ4BJdE xnBKvQhTY8VUgdIAp+YvL+lgIwar X-Received: by 2002:a62:2942:: with SMTP id p63mr8853695pfp.56.1592577353837; Fri, 19 Jun 2020 07:35:53 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s23sm5286912pju.35.2020.06.19.07.35.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jun 2020 07:35:53 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jun 2020 22:35:32 +0800 Message-Id: <1592577334-19049-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592577334-19049-1-git-send-email-lance.lmwang@gmail.com> References: <1592577334-19049-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/4] 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: tL/P2sF0P6On Content-Length: 6570 From: Limin Wang Signed-off-by: Limin Wang --- doc/APIchanges | 3 +++ libavcodec/avpacket.c | 1 + libavcodec/decode.c | 1 + libavcodec/packet.h | 8 ++++++++ libavcodec/version.h | 2 +- libavformat/dump.c | 22 ++++++++++++++++++++++ 6 files changed, 36 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..a4316a7 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 12-1 timecode"; } return NULL; } diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a4e50c0..a2bf0cc 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 41485f4..72cb4f7 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -283,6 +283,14 @@ enum AVPacketSideDataType { AV_PKT_DATA_DOVI_CONF, /** + * Timecode which conforms to SMPTE ST 12-1. 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. + * The timecode format is described in the av_timecode_get_smpte_from_framenum() + * function in libavutil/timecode.c. + */ + 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..c5f0bd6 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,23 @@ 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; + int m = tc[0] & 3; + + if (sd->size != sizeof(uint32_t) * 4) { + av_log(ctx, AV_LOG_ERROR, "invalid data"); + return; + } + + for (int j = 1; j <= m; 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 != m ? ", " : ""); + } +} + static void dump_sidedata(void *ctx, AVStream *st, const char *indent) { int i; @@ -468,6 +486,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, "S12M timecode: "); + dump_s12m_timecode(ctx, &sd); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d (%d bytes)", sd.type, sd.size);