Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
c0479010
Commit
c0479010
authored
Nov 25, 2018
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice/decklink_enc: add support for setting genlock timing offset
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
418c90fa
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
1 deletion
+13
-1
outdevs.texi
doc/outdevs.texi
+4
-0
decklink_common.cpp
libavdevice/decklink_common.cpp
+5
-0
decklink_common_c.h
libavdevice/decklink_common_c.h
+1
-0
decklink_enc_c.c
libavdevice/decklink_enc_c.c
+2
-0
version.h
libavdevice/version.h
+1
-1
No files found.
doc/outdevs.texi
View file @
c0479010
...
...
@@ -155,6 +155,10 @@ Defaults to @option{0.5}.
Sets the decklink device duplex mode. Must be @samp{unset}, @samp{half} or @samp{full}.
Defaults to @samp{unset}.
@item timing_offset
Sets the genlock timing pixel offset on the used output.
Defaults to @samp{unset}.
@end table
@subsection Examples
...
...
libavdevice/decklink_common.cpp
View file @
c0479010
...
...
@@ -171,6 +171,11 @@ int ff_decklink_set_configs(AVFormatContext *avctx,
if
(
ret
<
0
)
return
ret
;
}
if
(
direction
==
DIRECTION_OUT
&&
cctx
->
timing_offset
!=
INT_MIN
)
{
res
=
ctx
->
cfg
->
SetInt
(
bmdDeckLinkConfigReferenceInputTimingOffset
,
cctx
->
timing_offset
);
if
(
res
!=
S_OK
)
av_log
(
avctx
,
AV_LOG_WARNING
,
"Setting timing offset failed.
\n
"
);
}
return
0
;
}
...
...
libavdevice/decklink_common_c.h
View file @
c0479010
...
...
@@ -57,6 +57,7 @@ struct decklink_cctx {
int64_t
queue_size
;
int
copyts
;
int64_t
timestamp_align
;
int
timing_offset
;
};
#endif
/* AVDEVICE_DECKLINK_COMMON_C_H */
libavdevice/decklink_enc_c.c
View file @
c0479010
...
...
@@ -35,6 +35,8 @@ static const AVOption options[] = {
{
"unset"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
0
},
0
,
0
,
ENC
,
"duplex_mode"
},
{
"half"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
1
},
0
,
0
,
ENC
,
"duplex_mode"
},
{
"full"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
2
},
0
,
0
,
ENC
,
"duplex_mode"
},
{
"timing_offset"
,
"genlock timing pixel offset"
,
OFFSET
(
timing_offset
),
AV_OPT_TYPE_INT
,
{
.
i64
=
INT_MIN
},
INT_MIN
,
INT_MAX
,
ENC
,
"timing_offset"
},
{
"unset"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
INT_MIN
},
0
,
0
,
ENC
,
"timing_offset"
},
{
NULL
},
};
...
...
libavdevice/version.h
View file @
c0479010
...
...
@@ -29,7 +29,7 @@
#define LIBAVDEVICE_VERSION_MAJOR 58
#define LIBAVDEVICE_VERSION_MINOR 6
#define LIBAVDEVICE_VERSION_MICRO 10
0
#define LIBAVDEVICE_VERSION_MICRO 10
1
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment