Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
2f3015c2
Commit
2f3015c2
authored
Oct 13, 2016
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavd/decklink_dec: add option to disable drawing bars on signal loss
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
fecb3e82
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
2 deletions
+10
-2
indevs.texi
doc/indevs.texi
+4
-0
decklink_common.h
libavdevice/decklink_common.h
+1
-0
decklink_common_c.h
libavdevice/decklink_common_c.h
+1
-0
decklink_dec.cpp
libavdevice/decklink_dec.cpp
+2
-1
decklink_dec_c.c
libavdevice/decklink_dec_c.c
+1
-0
version.h
libavdevice/version.h
+1
-1
No files found.
doc/indevs.texi
View file @
2f3015c2
...
...
@@ -273,6 +273,10 @@ Sets the video 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}.
@item draw_bars
If set to @samp{true}, color bars are drawn in the event of a signal loss.
Defaults to @samp{true}.
@end table
@subsection Examples
...
...
libavdevice/decklink_common.h
View file @
2f3015c2
...
...
@@ -84,6 +84,7 @@ struct decklink_ctx {
int
duplex_mode
;
DecklinkPtsSource
audio_pts_source
;
DecklinkPtsSource
video_pts_source
;
int
draw_bars
;
int
frames_preroll
;
int
frames_buffer
;
...
...
libavdevice/decklink_common_c.h
View file @
2f3015c2
...
...
@@ -46,6 +46,7 @@ struct decklink_cctx {
DecklinkPtsSource
video_pts_source
;
int
audio_input
;
int
video_input
;
int
draw_bars
;
};
#endif
/* AVDEVICE_DECKLINK_COMMON_C_H */
libavdevice/decklink_dec.cpp
View file @
2f3015c2
...
...
@@ -309,7 +309,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
ctx
->
video_st
->
time_base
.
den
);
if
(
videoFrame
->
GetFlags
()
&
bmdFrameHasNoInputSource
)
{
if
(
videoFrame
->
GetPixelFormat
()
==
bmdFormat8BitYUV
)
{
if
(
ctx
->
draw_bars
&&
videoFrame
->
GetPixelFormat
()
==
bmdFormat8BitYUV
)
{
unsigned
bars
[
8
]
=
{
0xEA80EA80
,
0xD292D210
,
0xA910A9A5
,
0x90229035
,
0x6ADD6ACA
,
0x51EF515A
,
0x286D28EF
,
0x10801080
};
...
...
@@ -485,6 +485,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
ctx
->
audio_input
=
decklink_audio_connection_map
[
cctx
->
audio_input
];
ctx
->
audio_pts_source
=
cctx
->
audio_pts_source
;
ctx
->
video_pts_source
=
cctx
->
video_pts_source
;
ctx
->
draw_bars
=
cctx
->
draw_bars
;
cctx
->
ctx
=
ctx
;
#if !CONFIG_LIBZVBI
...
...
libavdevice/decklink_dec_c.c
View file @
2f3015c2
...
...
@@ -62,6 +62,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"
},
{
"draw_bars"
,
"draw bars on signal loss"
,
OFFSET
(
draw_bars
),
AV_OPT_TYPE_BOOL
,
{
.
i64
=
1
},
0
,
1
,
DEC
},
{
NULL
},
};
...
...
libavdevice/version.h
View file @
2f3015c2
...
...
@@ -29,7 +29,7 @@
#define LIBAVDEVICE_VERSION_MAJOR 57
#define LIBAVDEVICE_VERSION_MINOR 0
#define LIBAVDEVICE_VERSION_MICRO 10
2
#define LIBAVDEVICE_VERSION_MICRO 10
3
#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