From patchwork Mon Jan 15 08:22:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 7288 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2628059jaa; Mon, 15 Jan 2018 00:22:43 -0800 (PST) X-Google-Smtp-Source: ACJfBosnEYbavEtKACY26bo7x3KisFuVRmeET+PcVeaRQYimbPAfXDSdpVBtcCbDIksF0ZQ0AFbS X-Received: by 10.28.1.87 with SMTP id 84mr10885774wmb.154.1516004563628; Mon, 15 Jan 2018 00:22:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516004563; cv=none; d=google.com; s=arc-20160816; b=o2jgoHDRmAKr+P952pMOl+Bs/ZpcfF1T/tTwmEeErlraYKC7wZ79VhhM1/oAyhBbjx X2ajVnYynj3trYLswtSrFSRade3lTonP1Ba/GxvungxA5WZE6Mzb2UcDrSBy3Cl2/OwY dNjayX4TYkGXiB4D3V9kk3ppaMNAvVaxkTUOR1mzF8Uhyfrw9xf+BcjNkq7rX9VWwlbP rdNSwLTxHY8Si8g+5QXVRCumfuYgjcVHuAiv0mT0Eh+MW47sDTj1VXJsf0w/5sq+s9Ch AhbpFssEIu+pemcWwbna9mg83fMeZG4ci3leMnSRSVfX54L44FLu/b+lhNazF7hBAmLB GqMA== 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:feedback-id:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=t1Iiugo4LkQXKkU7SeK+llgVZVv+cNGGXmdZ8dD0Em4=; b=ZjQXnORfO9/t4KMDtWf+GSrYGMwAIbWhn/ob9/0zzWlVOQjyo/FL+YNnVTiH6GP4MU 6hR9uXRAmdpuL7Tnbg5S3YmTI/ISmWfG3suVb3bYzK2zgedUINsXpjyjBOmiutP3roRj m0WNj846+f0v9eOdJjeDQxKZxwVFs+kmNrWbalvF2FVMcwl4+HxEa/twy3eIOu4uGI9/ /zOJJ5Cbgj1V7j1qMIKzOp6OirmhrRHVw7wbDzLHvUNDy19nuh5F3do4SMGNX+jNIC29 hOYCh7P9hm3y2N01aEdXfHcjDsISk2pyIW2DBPkRunNl2EQO4Cgdg6CulU9IiSNZbpPd gvzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=DctHghYU; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q5si8297961wrf.515.2018.01.15.00.22.43; Mon, 15 Jan 2018 00:22:43 -0800 (PST) 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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=DctHghYU; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85EF468A046; Mon, 15 Jan 2018 10:22:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (unknown [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 191C0689FF2 for ; Mon, 15 Jan 2018 10:22:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1516005460; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=UTP9NklE6YGPvrHA+OIVpbqdfbZPpCTve+yRK02Q5KQ=; b=DctHghYU YVKDVaOFTqkccUlRuVnQAtFVXjM8DuBXp7pPb4A/2GKatmdd+Fhyz0gjE4toMbUPLzcyHc5JxDj4o Scktca6N+t+tnwUA/ZLkFzi3TONEymSjymR5JX+9eQe/qto4eNzoyEVVqGNzHRAvH8BTh1O8lxUEC cTDlR+cl3tp2Ticn0pbPgqGZqRIfrIvG5e57/G0uOdysqVx/1qWUwtv4pctrMppDe8qapNqtl05Ha ieiv3j8t2U0+36aLidjXj0pyF37Kv4XCqL0QfRAqjbK0keWtXZM4HPC1Qa/ceIiJVfEfTPMZ9s2LU 6HnPWgixwqiagZQnMv1i/UroVA==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jan 2018 13:52:26 +0530 Message-Id: <1516004546-12817-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-Smtpcorp-Track: 1-P02mNmF7-uOY.bCTHtJ1tZ Feedback-ID: 337386m:337386asVRLGB:337386s0-W41oQvC:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v3 3/3] avdevice/decklink: addition of absolute wallclock option for pts source 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit --- doc/indevs.texi | 6 ++++-- libavdevice/decklink_common_c.h | 1 + libavdevice/decklink_dec.cpp | 16 ++++++++++++---- libavdevice/decklink_dec_c.c | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 36aef49..0bc8e6a 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -298,11 +298,13 @@ Sets the audio input source. Must be @samp{unset}, @samp{embedded}, @item video_pts Sets the video packet timestamp source. Must be @samp{video}, @samp{audio}, -@samp{reference} or @samp{wallclock}. Defaults to @samp{video}. +@samp{reference}, @samp{wallclock} or @samp{abs_wallclock}. +Defaults to @samp{video}. @item audio_pts Sets the audio packet timestamp source. Must be @samp{video}, @samp{audio}, -@samp{reference} or @samp{wallclock}. Defaults to @samp{audio}. +@samp{reference}, @samp{wallclock} or @samp{abs_wallclock}. +Defaults to @samp{audio}. @item draw_bars If set to @samp{true}, color bars are drawn in the event of a signal loss. diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index 18097e2..08e9f9b 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -28,6 +28,7 @@ typedef enum DecklinkPtsSource { PTS_SRC_VIDEO = 2, PTS_SRC_REFERENCE = 3, PTS_SRC_WALLCLOCK = 4, + PTS_SRC_ABS_WALLCLOCK = 5, PTS_SRC_NB } DecklinkPtsSource; diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 1fd40ca..a69e286 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -585,6 +585,7 @@ ULONG decklink_input_callback::Release(void) static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, IDeckLinkAudioInputPacket *audioFrame, int64_t wallclock, + int64_t abs_wallclock, DecklinkPtsSource pts_src, AVRational time_base, int64_t *initial_pts, int copyts) @@ -607,13 +608,18 @@ static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, res = videoFrame->GetHardwareReferenceTimestamp(time_base.den, &bmd_pts, &bmd_duration); break; case PTS_SRC_WALLCLOCK: + /* fall through */ + case PTS_SRC_ABS_WALLCLOCK: { /* MSVC does not support compound literals like AV_TIME_BASE_Q * in C++ code (compiler error C4576) */ AVRational timebase; timebase.num = 1; timebase.den = AV_TIME_BASE; - pts = av_rescale_q(wallclock, timebase, time_base); + if (pts_src == PTS_SRC_WALLCLOCK) + pts = av_rescale_q(wallclock, timebase, time_base); + else + pts = av_rescale_q(abs_wallclock, timebase, time_base); break; } } @@ -637,7 +643,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( void *audioFrameBytes; BMDTimeValue frameTime; BMDTimeValue frameDuration; - int64_t wallclock = 0; + int64_t wallclock = 0, abs_wallclock = 0; struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; if (ctx->autodetect) { @@ -652,6 +658,8 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( ctx->frameCount++; if (ctx->audio_pts_source == PTS_SRC_WALLCLOCK || ctx->video_pts_source == PTS_SRC_WALLCLOCK) wallclock = av_gettime_relative(); + if (ctx->audio_pts_source == PTS_SRC_ABS_WALLCLOCK || ctx->video_pts_source == PTS_SRC_ABS_WALLCLOCK) + abs_wallclock = av_gettime(); // Handle Video Frame if (videoFrame) { @@ -698,7 +706,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( no_video = 0; } - pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, ctx->video_pts_source, ctx->video_st->time_base, &initial_video_pts, cctx->copyts); + pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, abs_wallclock, ctx->video_pts_source, ctx->video_st->time_base, &initial_video_pts, cctx->copyts); pkt.dts = pkt.pts; pkt.duration = frameDuration; @@ -789,7 +797,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( pkt.size = audioFrame->GetSampleFrameCount() * ctx->audio_st->codecpar->channels * (ctx->audio_depth / 8); audioFrame->GetBytes(&audioFrameBytes); audioFrame->GetPacketTime(&audio_pts, ctx->audio_st->time_base.den); - pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, ctx->audio_pts_source, ctx->audio_st->time_base, &initial_audio_pts, cctx->copyts); + pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, abs_wallclock, ctx->audio_pts_source, ctx->audio_st->time_base, &initial_audio_pts, cctx->copyts); pkt.dts = pkt.pts; //fprintf(stderr,"Audio Frame size %d ts %d\n", pkt.size, pkt.pts); diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index accae53..47018dc 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -70,6 +70,7 @@ static const AVOption options[] = { { "video", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PTS_SRC_VIDEO }, 0, 0, DEC, "pts_source"}, { "reference", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PTS_SRC_REFERENCE}, 0, 0, DEC, "pts_source"}, { "wallclock", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PTS_SRC_WALLCLOCK}, 0, 0, DEC, "pts_source"}, + { "abs_wallclock", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PTS_SRC_ABS_WALLCLOCK}, 0, 0, DEC, "pts_source"}, { "draw_bars", "draw bars on signal loss" , OFFSET(draw_bars), AV_OPT_TYPE_BOOL, { .i64 = 1}, 0, 1, DEC }, { "queue_size", "input queue buffer size", OFFSET(queue_size), AV_OPT_TYPE_INT64, { .i64 = (1024 * 1024 * 1024)}, 0, INT64_MAX, DEC }, { "audio_depth", "audio bitdepth (16 or 32)", OFFSET(audio_depth), AV_OPT_TYPE_INT, { .i64 = 16}, 16, 32, DEC },