From patchwork Tue Jun 30 15:26:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20749 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 2CF4644BCCF for ; Tue, 30 Jun 2020 18:26:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3AEA68A295; Tue, 30 Jun 2020 18:26:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E50068A0C3 for ; Tue, 30 Jun 2020 18:26:47 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id u5so9573356pfn.7 for ; Tue, 30 Jun 2020 08:26: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=HHHJZUQTikmcxeELq5JMHGJB40QEqnYI++VlC4rFdso=; b=cIqe3KaShUIAVq5ddZDZgnUZlb6cK1jnHK1PUT/qEJxeCozuS56Hy8DZOUzaa8GP0L zKTIhPsktbvNe1U4Ph6LHFWnJbciC1/7e9+vYlzUOXDiNb7e4C0FJh0LDcmLZspkujli Vuv5+NzK9UEDneHU1z6poFDVPWiu46rR3ufD+j531WSWiARv1B2tKloc1rxoEkLdm413 v0hgIlKmnU0amK4xKkpAwJBl9uHAcF5CkVWeT2/C8SM0ImFnEsDgIDSXr2yEqBI827ZF Fkbq2BV8UVNlpI+o0yU/Xsw119uypVDvF1QH38+EX73BV5I4D/sazQkPO7sfSYvN6XmP 7X/A== 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=HHHJZUQTikmcxeELq5JMHGJB40QEqnYI++VlC4rFdso=; b=A89qZ3zVGid18+Fl6msE+rx1ROlH9A7HVMQdo69zBUbuvJGqqXkgvTOTLt1SjBnsD0 8Vsm418/Hdu2xVbAyqMwIGSw6PyrvyFpqxLlU3OZyl+hlkIN0GAWyOjeOTkpa+wkDRKq dM+9ezR0IViLzggewwR6XG+t/aOS2iEVCNF6trN2eKHHQwU36dCZ9ytPOWmmZfXvAxiU dQNr5O1PSa/Xv0uIozOLqdxicKpoMRrjxzx9YyOB1ZQ9NLFxf2OL13/2kIpmP0zHgDZB YQq2JCqjwCokCYTlMazjUFGb2EEIdlBxkWSkCacY5PMpyX1qa5Ky12CcEBFCp3kZcuKN ZM2Q== X-Gm-Message-State: AOAM53156wE6gqPA5WtgURVY/3D0C8EWN5UERTiVYsLiTERwrSppcdkV Rv6Dx8TI/iByvhXVF78yZvtQJRqw X-Google-Smtp-Source: ABdhPJx7J/97ZoDqqGObjxOrbTjFFeWvpA3Y/wOLpTcacDA2Dn8yt+IPYp/c4dA8uFu3hlYOow8Qyg== X-Received: by 2002:a62:5e83:: with SMTP id s125mr18326805pfb.315.1593530805373; Tue, 30 Jun 2020 08:26:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s23sm3187420pfs.157.2020.06.30.08.26.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jun 2020 08:26:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jun 2020 23:26:40 +0800 Message-Id: <1593530800-4167-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593491358-20064-1-git-send-email-lance.lmwang@gmail.com> References: <1593491358-20064-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 1/2] avutil/timecode: add description for SMPTE binary format 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 --- libavutil/frame.h | 4 ++-- libavutil/timecode.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libavutil/frame.h b/libavutil/frame.h index 3fb8c56..c694b12 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -162,8 +162,8 @@ enum AVFrameSideDataType { /** * 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. + * The timecode format is described in the comments of av_timecode_get_smpte_from_framenum() + * function in libavutil/timecode.h. */ AV_FRAME_DATA_S12M_TIMECODE, diff --git a/libavutil/timecode.h b/libavutil/timecode.h index ab38e66..65c5e91 100644 --- a/libavutil/timecode.h +++ b/libavutil/timecode.h @@ -62,6 +62,18 @@ int av_timecode_adjust_ntsc_framenum2(int framenum, int fps); * @param framenum frame number * @return the SMPTE binary representation * + * the format description as follows: + * bits 0-5: hours, in BCD + * bits 6: BGF1 + * bits 7: BGF2 (NTSC) or PC (PAL) + * bits 8-13: minutes, in BCD + * bits 15: BGF0 (NTSC) or BGF2 (PAL) + * bits 16-21: seconds, in BCD + * bits 23: PC (NTSC) or BGF0 (PAL) + * bits 24-29: frames, in BCD + * bits 30: drop frame flag (0: non drop, 1: drop) + * bits 31: color frame flag (0: unsync mode, 1: sync mode) + * @note BCD numbers (6 bits): 4 lower bits for units, 2 higher bits for tens. * @note Frame number adjustment is automatically done in case of drop timecode, * you do NOT have to call av_timecode_adjust_ntsc_framenum2(). * @note The frame number is relative to tc->start. From patchwork Tue Jun 30 15:31:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20750 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 6F90D44B73A for ; Tue, 30 Jun 2020 18:31:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4AE5D68A212; Tue, 30 Jun 2020 18:31:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99B62689E2F for ; Tue, 30 Jun 2020 18:31:31 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id j1so9574888pfe.4 for ; Tue, 30 Jun 2020 08:31:31 -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=YzmMzVelP4u7Jeo3PtwGHmjhE+TqTW7hYWfNuS+Q1Nk=; b=Im+bBaYTNWe9QnWVIuykv6A0bsbpwug7cY0BGWUKcK6sjLlSyNolWwEaDynVNwPGO2 FdhA2JD0zb0HXKxncxxAEXJ2pxmp36q+TwQX6gTKdihv8k6VhRKt6loW5Lpuco4QG0G7 hFc0KnTAuYr0MG+GrMhAAXOBy5qLeeKNkpxeH4wdAGJMFHThyV4ugSdgSbqVz3tLsaSf WZZyJ9vjyAzByc0GkPGwWxVhEDhpsFrZZOdlogypZQ8RpRb8xyAz316RhviGYL7/Xkyv 83bsLxfssJOPOBcw4f2nr5zgz58eOwFDMntfrylq1ywYMYfDeOt0lDR5l7a8kJvcYOP3 PYOg== 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=YzmMzVelP4u7Jeo3PtwGHmjhE+TqTW7hYWfNuS+Q1Nk=; b=MDu021ZJzWPHenC6i9dKRN07dgizGiVbQ3WUljDqr6sDKvo3t/i4o9SAkPe0m/rUwH 7jhX6VVO0daHXKItiMmLnctZHSmehxf0v4vuhMETU2ZvCf5lJhlJeHArCdc2NI3QsMPw qX2G0B6uH2dwhOiuSAXaQgJconIX4ZG2iXv3/f3HapoveWqc1H9vurglYiP87JnfIRoN uGLJL9VwsFUO1ae535qYlCculQwmN93uGYeugNCGYIm01L7VroYJ6RzRZhsefFP9gYxH zGmwegijEu9Tq2R33sRFBRCWRaebhDEv71XF9xO3GqSR5BE+1bo6XynN6Z1tmkepBVzx RcPg== X-Gm-Message-State: AOAM532fJn8aOdF5/CCy0nz0IoIGhOm3BYVHs6Pfw/GNg8H0qpzRU9yS 62nVHc8AUwjHQ4dPzpD/c7Ra7OqT X-Google-Smtp-Source: ABdhPJzrfzY88LvDD86yP0esOWfZEko8S64lP6Bh2HYpYwHaRG3PSv7Lr5iBUqIIi4AmMU5xnurOGQ== X-Received: by 2002:a63:34c3:: with SMTP id b186mr15440795pga.173.1593531089661; Tue, 30 Jun 2020 08:31:29 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s22sm3043847pgv.43.2020.06.30.08.31.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jun 2020 08:31:29 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jun 2020 23:31:25 +0800 Message-Id: <1593531085-4532-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593491358-20064-2-git-send-email-lance.lmwang@gmail.com> References: <1593491358-20064-2-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 2/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" 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 | 21 +++++++++++++++++++++ 6 files changed, 35 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..4801163 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..232af69 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: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. + * The timecode format is described in the commenets of av_timecode_get_smpte_from_framenum() + * function in libavutil/timecode.h. + */ + 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 1083d7d..46db039 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" @@ -407,6 +408,22 @@ static void dump_dovi_conf(void *ctx, const AVPacketSideData *sd) dovi->dv_bl_signal_compatibility_id); } +static void dump_s12m_timecode(void *ctx, const AVPacketSideData *sd) +{ + const uint32_t *tc = (const 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, const AVStream *st, const char *indent) { int i; @@ -473,6 +490,10 @@ static void dump_sidedata(void *ctx, const 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);