From patchwork Sat Jun 20 14:25:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20526 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 8A69644A7F4 for ; Sat, 20 Jun 2020 17:26:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6755368B7BE; Sat, 20 Jun 2020 17:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE46168B61B for ; Sat, 20 Jun 2020 17:26:08 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id g12so5289926pll.10 for ; Sat, 20 Jun 2020 07:26:08 -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=SZShsfC3EuMZLDv/vlC6EQFZHRMMK4PNr0OqAj7eECEiXxmPguOvVx6E2kxuEh3XXQ hp1FdPYsxTqj9ty5RVKbpNIwie/fk2aFTwdBMRzSgHEAQeomnhhygffeRP/w4msvGi50 rhtcnNAXUEJiacWl2hcMsziGYbJB9xY1pkGxVACu6KjZUg6TCmPuK1/WmLL9EEvpijl2 5KY8ryXhjaziSWmaUMjPL5lTnqlAvbogWz/q08yY4qCpCCDWA2dJLK0lyWL+F//ak0k0 3bFp9+GfxwdzIJpFZVsogy2TbKKy/i/94zeduI52UcL/7zMAA78S2eQE6xV3T6SKi/G0 sXRg== 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=li0qduxdut3nTbPNSg6nVzwcU+9ySgS77JqgVjaFhBHoEznJDIHHFwvw5YpX4+mr/G qUsRL435kxBFfiV9xhEvV09ARGmJRljZ7cBSswDyZE0lN4QdBop43ZNR/wHmkrEQsmWL i2SSnwlogauF+VkRN5G/i0C2PhnodYU3Nlu1m60mADjFltM4/TBodrxj3LbNo+6nEBcF eIfvhO5HPX+rmCaVX9nD3RkseknfzqD25BLH+ElN1/boKaO30WpxpVR0wRQNUoO6mhLu yGfuxoc3+6gYCteFFazU1i+vzr1dKRFoFILK0TmbxF6p9u7u38fm2yhyyR6Z1e4K3uRK v0xQ== X-Gm-Message-State: AOAM531Bf33B2TSF3dMdTmJjiCBmVixuQZfbYrQ3BVEHN2NEmSLzkB00 5yswcuj2Fvu1wv7eYD4jlUHmH4JX X-Google-Smtp-Source: ABdhPJxVk24h1Kd9EZHOUAWYWFzSjtADHUTbkPcamjeOozz/tD74YnbivK1Cb5qlATMlllzHfEY8tg== X-Received: by 2002:a17:90a:69c3:: with SMTP id s61mr8955691pjj.212.1592663166559; Sat, 20 Jun 2020 07:26:06 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id e128sm8807685pfe.196.2020.06.20.07.26.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Jun 2020 07:26:05 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Jun 2020 22:25:50 +0800 Message-Id: <1592663151-24180-1-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 v2 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" 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); From patchwork Sat Jun 20 14:25:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20527 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 A988944A7F4 for ; Sat, 20 Jun 2020 17:26:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9798E68B7CB; Sat, 20 Jun 2020 17:26:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4425B68B7E2 for ; Sat, 20 Jun 2020 17:26:11 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id bh7so5286550plb.11 for ; Sat, 20 Jun 2020 07:26:11 -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=1iUA8jnl5bkVg+UMnNRQmT/1WV/b5FJg+TA/z961jNA=; b=Lo4NWz03sk19uWfTIAe2debupckTR6NNduXxaQxd4ft40mAQloUGh8usRB2Sxg2Zoe t+653+tkRC8Uvojcd26ByzKGjOPmu5lrQl2tWcjIDvWkdML2QLAhfVlEqcSJF4eO0fPe 42TzalQwWls1OH61LLSLF2ljwMjiS6/4l2biZlHJ4nZliE5yUx1HnWIKtcO6TCZ3Jmef uI28+3NyKngRAtP5aO8Zu7cILO+SW9vsDS6BrB7EDj5lTxS8yAveZcyVJuQuwLxtr/D/ MdV8lEqZTCzBJdQLYH+yCHxJlSJ6LfD/UFcXiqPPWn1nYoWSJR+qOBxfH0MhBKGfU5fN JGJw== 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=1iUA8jnl5bkVg+UMnNRQmT/1WV/b5FJg+TA/z961jNA=; b=dhw+InABscgYpFM5cHhTak7bdLxUNIVXwx3MUa2JGTYnnCLlIZqxNVMcauqEffwQ8q xN9W+al4ENJAg85e3dgcvmCH8L9dgWNjcJ6JzPNaZparXIaA7ZG/7GD8e7zKzIPVi8An lLyJbWgZzkcO8XNkTEJBSeKQXpSemTepRDMMfY26y8iSP1mtJVSKRkKTYZny4e+9mpW2 Ud8tw5oz18wPsRlKlvCJQ4BPD9S+ZPBdhia+IifYpXq3kXMxPwT0UGOVvPG9wVe2r9Nn SjnLp6G6dLHYWW7Gryu9eMAGbkSiSxGN7KtchMplMg5cLc89Z9ok+w/vT0E3l/7bGnkO SWhw== X-Gm-Message-State: AOAM533EFRsWTHlOIHrVdUqIYOuNozkWQ5vc1UvM63dxLCK5N5oAzuLY WVhU/fWOwZi39XB9PY+u3r8FEdpk X-Google-Smtp-Source: ABdhPJxJFgQLo+vsYEMzsNnMLr+qJJT0F3ocDE1Hu3QCxQ2EFIKgk21vtxupIiqaZCBXJUiCyHRfWg== X-Received: by 2002:a17:90a:ea05:: with SMTP id w5mr9226214pjy.37.1592663169354; Sat, 20 Jun 2020 07:26:09 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id e128sm8807685pfe.196.2020.06.20.07.26.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Jun 2020 07:26:08 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Jun 2020 22:25:51 +0800 Message-Id: <1592663151-24180-2-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: <1592577334-19049-1-git-send-email-lance.lmwang@gmail.com> <1592663151-24180-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] 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 82106aa..c8064ae 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -41,6 +41,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" @@ -778,6 +779,21 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( AVDictionary* metadata_dict = NULL; int metadata_len; uint8_t* packed_metadata; + AVTimecode tcr; + uint32_t tc_data; + uint8_t *sd; + int size = sizeof(uint32_t) * 4; + + if (av_timecode_init_from_string(&tcr, ctx->video_st->r_frame_rate, tc, ctx) >= 0) { + if ((tc_data = av_timecode_get_smpte_from_framenum(&tcr, 0)) > 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);