From patchwork Mon Jan 8 05:26:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 7195 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2248107jaa; Sun, 7 Jan 2018 21:27:01 -0800 (PST) X-Google-Smtp-Source: ACJfBot+evjkYVbu44OV1i7d5t8bC6EVfefucrMOG/kg5cHYEtFAPOfCr3MPBc3vV+9zdLOwDJ2h X-Received: by 10.28.124.1 with SMTP id x1mr7858033wmc.20.1515389221162; Sun, 07 Jan 2018 21:27:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515389221; cv=none; d=google.com; s=arc-20160816; b=O/9iLBOqnKqm4nQMXoddf8ypfQs0PJwHWR8DQcHkH5rg+8/FM04lDN1xcap7hshWyb M9pbk5WqwkCX5wVf2CLzhfXJKUNW4u1n0hPkLFi5CDYWlDIU+NA+cVuFNTLGH7VCI1bp S2HncYe7WhSNijfU6r5l77FZqe77pISlQt5y+cqJO8DoeO+RErpf4pcL4J4ZlUIoAr/h vDUb2BS1dSpn3DJBFdiFzwV/Bk6mFHS0jCEgV79PpSi+BA0WneiikomOd62r0ErxWMDI IJzCHYshgwCEwq/d9JJ9VryrpEfUNs9KgfSm6pzZKVNrMG4eOxq9Y4UOsfAVdT61etcP esKQ== 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:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=c2xwRlaPEpfmnSxJ6lQi/1xVww52eXXVpl8QtKncq/M=; b=Nur4F+5d6qQr0+XCJT1pZsx5sX2RuISLtWKrdkIRnn+RaOryNgIj2sxdy62LixKXur kjP8/kU99uZpzzAqtgLOcNgWUGBQzI1XT76cajGmnkwdIZUBMJBiCc3V1nNpmQGVEKb1 om+QBqXueFvzp7rUWUNmiwSbRe9Jj6Uu1AsMmnZ8XHZWIPzSquLAQPBKY5JKqPzXCDex Z/VhG8egUZY07ird5OKPIb35iOqOrh3XxI/bCbUuAvswoLpzoS7b2iKrLC1Kc6gSWHYn EyHyBidzzO/XFlctyJBK6GLfMPBr+RAwKKz8JCw89qevrAQysLySMMrBLVvtPdpRzD+i 25kw== 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=3c9KnYtl; 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 e185si7253806wmg.105.2018.01.07.21.27.00; Sun, 07 Jan 2018 21:27:01 -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=3c9KnYtl; 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 EB82B689F79; Mon, 8 Jan 2018 07:26:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B25F468064A for ; Mon, 8 Jan 2018 07:26:51 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1515390118; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=Ryy4vGrriO/vs5StYcAq8sry8/fwSVibJEiSaKWKLFM=; b=3c9KnYtl LNjuEj+GhWddudhTcpzespgxZ98NMXiGYmfS7M+3h85tmGJClLsOgOf/l688Nllhe9gCC3wkeVlBh XZuXwqlirdiHxJsVICJVhr8ELJTtny8mwkntxwnJcyFPfjPOx54Ptq59OBBQUh3jSRCanHxWzyIKH qSTD1RRtZcuNQCEEnzlw+GirCh/cMC/7gHSeH4wDKPmCV/rDpdwRxB/pdQ8qnmTOzsguDHuC7dH6m i0IBKIHsW52IJBoXw8GDkCYBtXoPGyGc/J5qvL7+hY4METIurqIeFx0vVkW9m981pXO4OIerK5qyd vicLFBoXH3TboJkEJZUivlJmgg==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jan 2018 10:56:43 +0530 Message-Id: <1515389203-30954-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1-YexQ4ba6V61o.l0EZycIIz Feedback-ID: 337386m:337386asVRLGB:337386sy_RzeuuWy:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 1/2] avdevice/decklink: addition of copyts option 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 | 5 +++++ libavdevice/decklink_common_c.h | 1 + libavdevice/decklink_dec.cpp | 18 +++++++++++------- libavdevice/decklink_dec_c.c | 1 + 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 56066bf..36aef49 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -317,6 +317,11 @@ Defaults to @samp{1073741824}. Sets the audio sample bit depth. Must be @samp{16} or @samp{32}. Defaults to @samp{16}. +@item decklink_copyts +If set to @option{true}, timestamps are forwarded as they are without removing +the initial offset. +Defaults to @option{false}. + @end table @subsection Examples diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index 368ac25..ac6563a 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -52,6 +52,7 @@ struct decklink_cctx { char *format_code; int raw_format; int64_t queue_size; + int copyts; }; #endif /* AVDEVICE_DECKLINK_COMMON_C_H */ diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 94dae26..1fd40ca 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -586,7 +586,8 @@ static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, IDeckLinkAudioInputPacket *audioFrame, int64_t wallclock, DecklinkPtsSource pts_src, - AVRational time_base, int64_t *initial_pts) + AVRational time_base, int64_t *initial_pts, + int copyts) { int64_t pts = AV_NOPTS_VALUE; BMDTimeValue bmd_pts; @@ -619,10 +620,12 @@ static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, if (res == S_OK) pts = bmd_pts / time_base.num; - if (pts != AV_NOPTS_VALUE && *initial_pts == AV_NOPTS_VALUE) - *initial_pts = pts; - if (*initial_pts != AV_NOPTS_VALUE) - pts -= *initial_pts; + if (!copyts) { + if (pts != AV_NOPTS_VALUE && *initial_pts == AV_NOPTS_VALUE) + *initial_pts = pts; + if (*initial_pts != AV_NOPTS_VALUE) + pts -= *initial_pts; + } return pts; } @@ -635,6 +638,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( BMDTimeValue frameTime; BMDTimeValue frameDuration; int64_t wallclock = 0; + struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; if (ctx->autodetect) { if (videoFrame && !(videoFrame->GetFlags() & bmdFrameHasNoInputSource) && @@ -694,7 +698,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); + pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, ctx->video_pts_source, ctx->video_st->time_base, &initial_video_pts, cctx->copyts); pkt.dts = pkt.pts; pkt.duration = frameDuration; @@ -785,7 +789,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); + pkt.pts = get_pkt_pts(videoFrame, audioFrame, 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 1c6d826..6fb5ffe 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -73,6 +73,7 @@ static const AVOption options[] = { { "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 }, + { "decklink_copyts", "copy timestamps, do not remove the initial offset", OFFSET(copyts), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, DEC }, { NULL }, };