virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avdevice/decklink: addition of absolute wallclock option for pts source

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Vishwanath Dixit 2018-01-15 13:52:26 +05:30 committed by Marton Balint
parent dfa2523bdd
commit fc93eca126
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/indevs.texi
View File

@ -298,11 +298,13 @@ Sets the audio input source. Must be @samp{unset}, @samp{embedded},
@item video_pts @item video_pts
Sets the video packet timestamp source. Must be @samp{video}, @samp{audio}, 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 @item audio_pts
Sets the audio packet timestamp source. Must be @samp{video}, @samp{audio}, 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 @item draw_bars
If set to @samp{true}, color bars are drawn in the event of a signal loss. If set to @samp{true}, color bars are drawn in the event of a signal loss.

1
libavdevice/decklink_common_c.h
View File

@ -28,6 +28,7 @@ typedef enum DecklinkPtsSource {
PTS_SRC_VIDEO = 2, PTS_SRC_VIDEO = 2,
PTS_SRC_REFERENCE = 3, PTS_SRC_REFERENCE = 3,
PTS_SRC_WALLCLOCK = 4, PTS_SRC_WALLCLOCK = 4,
PTS_SRC_ABS_WALLCLOCK = 5,
PTS_SRC_NB PTS_SRC_NB
} DecklinkPtsSource; } DecklinkPtsSource;

16
libavdevice/decklink_dec.cpp
View File

@ -585,6 +585,7 @@ ULONG decklink_input_callback::Release(void)
static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame,
IDeckLinkAudioInputPacket *audioFrame, IDeckLinkAudioInputPacket *audioFrame,
int64_t wallclock, int64_t wallclock,
int64_t abs_wallclock,
DecklinkPtsSource pts_src, DecklinkPtsSource pts_src,
AVRational time_base, int64_t *initial_pts, AVRational time_base, int64_t *initial_pts,
int copyts) int copyts)
@ -607,13 +608,18 @@ static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame,
res = videoFrame->GetHardwareReferenceTimestamp(time_base.den, &bmd_pts, &bmd_duration); res = videoFrame->GetHardwareReferenceTimestamp(time_base.den, &bmd_pts, &bmd_duration);
break; break;
case PTS_SRC_WALLCLOCK: case PTS_SRC_WALLCLOCK:
/* fall through */
case PTS_SRC_ABS_WALLCLOCK:
{ {
/* MSVC does not support compound literals like AV_TIME_BASE_Q /* MSVC does not support compound literals like AV_TIME_BASE_Q
* in C++ code (compiler error C4576) */ * in C++ code (compiler error C4576) */
AVRational timebase; AVRational timebase;
timebase.num = 1; timebase.num = 1;
timebase.den = AV_TIME_BASE; 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; break;
} }
} }
@ -637,7 +643,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
void *audioFrameBytes; void *audioFrameBytes;
BMDTimeValue frameTime; BMDTimeValue frameTime;
BMDTimeValue frameDuration; BMDTimeValue frameDuration;
int64_t wallclock = 0; int64_t wallclock = 0, abs_wallclock = 0;
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
if (ctx->autodetect) { if (ctx->autodetect) {
@ -652,6 +658,8 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
ctx->frameCount++; ctx->frameCount++;
if (ctx->audio_pts_source == PTS_SRC_WALLCLOCK || ctx->video_pts_source == PTS_SRC_WALLCLOCK) if (ctx->audio_pts_source == PTS_SRC_WALLCLOCK || ctx->video_pts_source == PTS_SRC_WALLCLOCK)
wallclock = av_gettime_relative(); 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 // Handle Video Frame
if (videoFrame) { if (videoFrame) {
@ -698,7 +706,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
no_video = 0; 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.dts = pkt.pts;
pkt.duration = frameDuration; 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); pkt.size = audioFrame->GetSampleFrameCount() * ctx->audio_st->codecpar->channels * (ctx->audio_depth / 8);
audioFrame->GetBytes(&audioFrameBytes); audioFrame->GetBytes(&audioFrameBytes);
audioFrame->GetPacketTime(&audio_pts, ctx->audio_st->time_base.den); 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; pkt.dts = pkt.pts;
//fprintf(stderr,"Audio Frame size %d ts %d\n", pkt.size, pkt.pts); //fprintf(stderr,"Audio Frame size %d ts %d\n", pkt.size, pkt.pts);

1
libavdevice/decklink_dec_c.c
View File

@ -70,6 +70,7 @@ static const AVOption options[] = {
{ "video", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PTS_SRC_VIDEO }, 0, 0, DEC, "pts_source"}, { "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"}, { "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"}, { "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 }, { "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 }, { "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 }, { "audio_depth", "audio bitdepth (16 or 32)", OFFSET(audio_depth), AV_OPT_TYPE_INT, { .i64 = 16}, 16, 32, DEC },

2
libavdevice/version.h
View File

@ -29,7 +29,7 @@
#define LIBAVDEVICE_VERSION_MAJOR 58 #define LIBAVDEVICE_VERSION_MAJOR 58
#define LIBAVDEVICE_VERSION_MINOR 0 #define LIBAVDEVICE_VERSION_MINOR 0
#define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_MICRO 101
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \ LIBAVDEVICE_VERSION_MINOR, \