Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
451
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
c8040150
Commit
c8040150
authored
5 years ago
by
Steve Lhomme
Browse files
Options
Downloads
Patches
Plain Diff
video output: rename the filters input format with a less generic name
Similar to the input video context variable.
parent
6c741745
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/video_output/video_output.c
+7
-7
7 additions, 7 deletions
src/video_output/video_output.c
src/video_output/vout_internal.h
+1
-1
1 addition, 1 deletion
src/video_output/vout_internal.h
with
8 additions
and
8 deletions
src/video_output/video_output.c
+
7
−
7
View file @
c8040150
...
...
@@ -813,7 +813,7 @@ static void ThreadChangeFilters(vout_thread_t *vout,
vlc_mutex_lock
(
&
vout
->
p
->
filter
.
lock
);
es_format_t
fmt_target
;
es_format_InitFromVideo
(
&
fmt_target
,
source
?
source
:
&
vout
->
p
->
filter
.
forma
t
);
es_format_InitFromVideo
(
&
fmt_target
,
source
?
source
:
&
vout
->
p
->
filter
.
src_fm
t
);
const
es_format_t
*
p_fmt_current
=
&
fmt_target
;
...
...
@@ -865,8 +865,8 @@ static void ThreadChangeFilters(vout_thread_t *vout,
vout
->
p
->
filter
.
configuration
=
filters
?
strdup
(
filters
)
:
NULL
;
}
if
(
source
)
{
video_format_Clean
(
&
vout
->
p
->
filter
.
forma
t
);
video_format_Copy
(
&
vout
->
p
->
filter
.
forma
t
,
source
);
video_format_Clean
(
&
vout
->
p
->
filter
.
src_fm
t
);
video_format_Copy
(
&
vout
->
p
->
filter
.
src_fm
t
,
source
);
}
if
(
!
is_locked
)
...
...
@@ -926,7 +926,7 @@ static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse,
msg_Dbg
(
vout
,
"picture might be displayed late (missing %"
PRId64
" ms)"
,
MS_FROM_VLC_TICK
(
late
));
}
}
if
(
!
VideoFormatIsCropArEqual
(
&
decoded
->
format
,
&
vout
->
p
->
filter
.
forma
t
))
if
(
!
VideoFormatIsCropArEqual
(
&
decoded
->
format
,
&
vout
->
p
->
filter
.
src_fm
t
))
ThreadChangeFilters
(
vout
,
&
decoded
->
format
,
NULL
,
NULL
,
true
);
}
}
...
...
@@ -1517,7 +1517,7 @@ static int vout_Start(vout_thread_t *vout, vlc_video_context *vctx, const vout_c
sys
->
private_pool
=
NULL
;
sys
->
filter
.
configuration
=
NULL
;
video_format_Copy
(
&
sys
->
filter
.
forma
t
,
&
sys
->
original
);
video_format_Copy
(
&
sys
->
filter
.
src_fm
t
,
&
sys
->
original
);
static
const
struct
filter_video_callbacks
static_cbs
=
{
VoutVideoFilterStaticNewPicture
,
...
...
@@ -1617,7 +1617,7 @@ error:
}
if
(
sys
->
filter
.
chain_static
!=
NULL
)
filter_chain_Delete
(
sys
->
filter
.
chain_static
);
video_format_Clean
(
&
sys
->
filter
.
forma
t
);
video_format_Clean
(
&
sys
->
filter
.
src_fm
t
);
if
(
sys
->
decoder_fifo
!=
NULL
)
{
picture_fifo_Delete
(
sys
->
decoder_fifo
);
...
...
@@ -1713,7 +1713,7 @@ static void vout_ReleaseDisplay(vout_thread_t *vout)
ThreadDelAllFilterCallbacks
(
vout
);
filter_chain_Delete
(
sys
->
filter
.
chain_interactive
);
filter_chain_Delete
(
sys
->
filter
.
chain_static
);
video_format_Clean
(
&
sys
->
filter
.
forma
t
);
video_format_Clean
(
&
sys
->
filter
.
src_fm
t
);
free
(
sys
->
filter
.
configuration
);
if
(
sys
->
decoder_fifo
!=
NULL
)
...
...
This diff is collapsed.
Click to expand it.
src/video_output/vout_internal.h
+
1
−
1
View file @
c8040150
...
...
@@ -162,7 +162,7 @@ struct vout_thread_sys_t
struct
{
vlc_mutex_t
lock
;
char
*
configuration
;
video_format_t
forma
t
;
video_format_t
src_fm
t
;
struct
filter_chain_t
*
chain_static
;
struct
filter_chain_t
*
chain_interactive
;
bool
has_deint
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment