Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
39868b92
Commit
39868b92
authored
Dec 02, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved i_cr_average from input_source_t to input_thread_private_t.
parent
dd3a0dd1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
src/input/es_out.c
src/input/es_out.c
+1
-1
src/input/input.c
src/input/input.c
+6
-6
src/input/input_internal.h
src/input/input_internal.h
+6
-5
No files found.
src/input/es_out.c
View file @
39868b92
...
...
@@ -1004,7 +1004,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
p_pgrm
->
psz_now_playing
=
NULL
;
p_pgrm
->
psz_publisher
=
NULL
;
p_pgrm
->
p_epg
=
NULL
;
p_pgrm
->
p_clock
=
input_clock_New
(
p_input
->
p
->
i
nput
.
i
_cr_average
,
p_sys
->
i_rate
);
p_pgrm
->
p_clock
=
input_clock_New
(
p_input
->
p
->
i_cr_average
,
p_sys
->
i_rate
);
if
(
!
p_pgrm
->
p_clock
)
{
free
(
p_pgrm
);
...
...
src/input/input.c
View file @
39868b92
...
...
@@ -188,6 +188,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
p_input
->
p
->
p_sout
=
NULL
;
p_input
->
p
->
b_out_pace_control
=
false
;
p_input
->
i_pts_delay
=
0
;
p_input
->
p
->
i_cr_average
=
0
;
vlc_gc_incref
(
p_item
);
/* Released in Destructor() */
p_input
->
p
->
p_item
=
p_item
;
...
...
@@ -204,7 +205,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
p_input
->
p
->
input
.
b_can_rate_control
=
true
;
p_input
->
p
->
input
.
b_rescale_ts
=
true
;
p_input
->
p
->
input
.
b_eof
=
false
;
p_input
->
p
->
input
.
i_cr_average
=
0
;
vlc_mutex_lock
(
&
p_item
->
lock
);
...
...
@@ -236,7 +236,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
input_ControlVarInit
(
p_input
);
/* */
p_input
->
p
->
i
nput
.
i
_cr_average
=
var_GetInteger
(
p_input
,
"cr-average"
);
p_input
->
p
->
i_cr_average
=
var_GetInteger
(
p_input
,
"cr-average"
);
if
(
!
p_input
->
b_preparsing
)
{
...
...
@@ -938,10 +938,10 @@ static void InitTitle( input_thread_t * p_input )
p_input
->
i_pts_delay
-=
i_desynch
*
1000
;
/* Update cr_average depending on the caching */
p_
master
->
i_cr_average
*=
(
10
*
p_input
->
i_pts_delay
/
200000
);
p_
master
->
i_cr_average
/=
10
;
if
(
p_
master
->
i_cr_average
<
10
)
p_
master
->
i_cr_average
=
10
;
p_
input
->
p
->
i_cr_average
*=
(
10
*
p_input
->
i_pts_delay
/
200000
);
p_
input
->
p
->
i_cr_average
/=
10
;
if
(
p_
input
->
p
->
i_cr_average
<
10
)
p_
input
->
p
->
i_cr_average
=
10
;
}
static
void
StartTitle
(
input_thread_t
*
p_input
)
...
...
src/input/input_internal.h
View file @
39868b92
...
...
@@ -71,9 +71,6 @@ typedef struct
bool
b_eof
;
/* eof of demuxer */
double
f_fps
;
/* Clock average variation */
int
i_cr_average
;
}
input_source_t
;
/** Private input fields */
...
...
@@ -115,10 +112,14 @@ struct input_thread_private_t
bool
b_out_pace_control
;
/* idem ? */
/* Main input properties */
input_item_t
*
p_item
;
/* Input item */
input_item_t
*
p_item
;
/* Clock average variation */
int
i_cr_average
;
/* Main source */
input_source_t
input
;
/* Slave
demuxer
s (subs, and others) */
/* Slave
source
s (subs, and others) */
int
i_slave
;
input_source_t
**
slave
;
...
...
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