avdevice/decklink: addition of copyts option

Vishwanath Dixit committed 8 years ago

Commit 7c27bbd1 parent e3acba04 files · +18 −7Browse files

Unified · Split

4 files

doc/indevs.texi +5 −0
libavdevice/decklink_common_c.h +1 −0
libavdevice/decklink_dec.cpp +11 −7
libavdevice/decklink_dec_c.c +1 −0

@@ -317,6 +317,11 @@ Defaults to @samp{1073741824}. · 316 unmodified lines
317	317	Sets the audio sample bit depth. Must be @samp{16} or @samp{32}.
318	318	Defaults to @samp{16}.
319	319
	320	+@item decklink_copyts
	321	+If set to @option{true}, timestamps are forwarded as they are without removing
	322	+the initial offset.
	323	+Defaults to @option{false}.
	324	+
320	325	@end table
321	326
322	327	@subsection Examples

libavdevice/decklink_common_c.h+1−0

@@ -52,6 +52,7 @@ struct decklink_cctx { · 51 unmodified lines
52	52	char *format_code;
53	53	int raw_format;
54	54	int64_t queue_size;
	55	+ int copyts;
55	56	};
56	57
57	58	#endif /* AVDEVICE_DECKLINK_COMMON_C_H */

libavdevice/decklink_dec.cpp+11−7

@@ -586,7 +586,8 @@ static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, · 585 unmodified lines
586	586	IDeckLinkAudioInputPacket *audioFrame,
587	587	int64_t wallclock,
588	588	DecklinkPtsSource pts_src,
589		− AVRational time_base, int64_t *initial_pts)
	589	+ AVRational time_base, int64_t *initial_pts,
	590	+ int copyts)
590	591	{
591	592	int64_t pts = AV_NOPTS_VALUE;
592	593	BMDTimeValue bmd_pts;
@@ -619,10 +620,12 @@ static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, · 26 unmodified lines
619	620	if (res == S_OK)
620	621	pts = bmd_pts / time_base.num;
621	622
622		− if (pts != AV_NOPTS_VALUE && *initial_pts == AV_NOPTS_VALUE)
623		− *initial_pts = pts;
624		− if (*initial_pts != AV_NOPTS_VALUE)
625		− pts -= *initial_pts;
	623	+ if (!copyts) {
	624	+ if (pts != AV_NOPTS_VALUE && *initial_pts == AV_NOPTS_VALUE)
	625	+ *initial_pts = pts;
	626	+ if (*initial_pts != AV_NOPTS_VALUE)
	627	+ pts -= *initial_pts;
	628	+ }
626	629
627	630	return pts;
628	631	}
@@ -635,6 +638,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( · 6 unmodified lines
635	638	BMDTimeValue frameTime;
636	639	BMDTimeValue frameDuration;
637	640	int64_t wallclock = 0;
	641	+ struct decklink_cctx cctx = (struct decklink_cctx ) avctx->priv_data;
638	642
639	643	if (ctx->autodetect) {
640	644	if (videoFrame && !(videoFrame->GetFlags() & bmdFrameHasNoInputSource) &&
@@ -694,7 +698,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( · 53 unmodified lines
694	698	no_video = 0;
695	699	}
696	700
697		− pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, ctx->video_pts_source, ctx->video_st->time_base, &initial_video_pts);
	701	+ pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, ctx->video_pts_source, ctx->video_st->time_base, &initial_video_pts, cctx->copyts);
698	702	pkt.dts = pkt.pts;
699	703
700	704	pkt.duration = frameDuration;
@@ -785,7 +789,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( · 84 unmodified lines
785	789	pkt.size = audioFrame->GetSampleFrameCount() * ctx->audio_st->codecpar->channels * (ctx->audio_depth / 8);
786	790	audioFrame->GetBytes(&audioFrameBytes);
787	791	audioFrame->GetPacketTime(&audio_pts, ctx->audio_st->time_base.den);
788		− pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, ctx->audio_pts_source, ctx->audio_st->time_base, &initial_audio_pts);
	792	+ pkt.pts = get_pkt_pts(videoFrame, audioFrame, wallclock, ctx->audio_pts_source, ctx->audio_st->time_base, &initial_audio_pts, cctx->copyts);
789	793	pkt.dts = pkt.pts;
790	794
791	795	//fprintf(stderr,"Audio Frame size %d ts %d\n", pkt.size, pkt.pts);

libavdevice/decklink_dec_c.c+1−0

@@ -73,6 +73,7 @@ static const AVOption options[] = { · 72 unmodified lines
73	73	{ "draw_bars", "draw bars on signal loss" , OFFSET(draw_bars), AV_OPT_TYPE_BOOL, { .i64 = 1}, 0, 1, DEC },
74	74	{ "queue_size", "input queue buffer size", OFFSET(queue_size), AV_OPT_TYPE_INT64, { .i64 = (1024 * 1024 * 1024)}, 0, INT64_MAX, DEC },
75	75	{ "audio_depth", "audio bitdepth (16 or 32)", OFFSET(audio_depth), AV_OPT_TYPE_INT, { .i64 = 16}, 16, 32, DEC },
	76	+ { "decklink_copyts", "copy timestamps, do not remove the initial offset", OFFSET(copyts), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC },
76	77	{ NULL },
77	78	};
78	79

avdevice/decklink: addition of copyts option

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code