Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
b25b4229
Commit
b25b4229
authored
Jan 30, 2000
by
Stéphane Borel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Am�lioration de la synchro.
--Meuuh
parent
a2972b3c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
12 deletions
+20
-12
include/config.h
include/config.h
+5
-1
src/input/input.c
src/input/input.c
+1
-1
src/video_parser/vpar_headers.c
src/video_parser/vpar_headers.c
+7
-7
src/video_parser/vpar_synchro.c
src/video_parser/vpar_synchro.c
+7
-3
No files found.
include/config.h
View file @
b25b4229
...
@@ -194,6 +194,10 @@
...
@@ -194,6 +194,10 @@
* server */
* server */
#define INPUT_VLAN_CHANGE_DELAY 5000000
#define INPUT_VLAN_CHANGE_DELAY 5000000
/* Duration between the time we receive the TS packet, and the time we will
* mark it to be presented */
#define INPUT_PTS_DELAY 2000000
/*******************************************************************************
/*******************************************************************************
* Audio configuration
* Audio configuration
*******************************************************************************/
*******************************************************************************/
...
@@ -288,7 +292,7 @@
...
@@ -288,7 +292,7 @@
#define VPAR_IDLE_SLEEP 100000
#define VPAR_IDLE_SLEEP 100000
/* Time to sleep when waiting for a buffer (from vout or the video fifo). */
/* Time to sleep when waiting for a buffer (from vout or the video fifo). */
#define VPAR_OUTMEM_SLEEP 10000
#define VPAR_OUTMEM_SLEEP 10000
0
/* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
/* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
* that raising this level dramatically lengthens the compilation time. */
* that raising this level dramatically lengthens the compilation time. */
...
...
src/input/input.c
View file @
b25b4229
...
@@ -1000,7 +1000,7 @@ static __inline__ void input_DemuxPES( input_thread_t *p_input,
...
@@ -1000,7 +1000,7 @@ static __inline__ void input_DemuxPES( input_thread_t *p_input,
case
SYNCHRO_START
:
case
SYNCHRO_START
:
p_pes
->
i_pts
+=
p_pcr
->
delta_pcr
;
p_pes
->
i_pts
+=
p_pcr
->
delta_pcr
;
p_pcr
->
delta_absolute
=
mdate
()
-
p_pes
->
i_pts
+
500000
;
p_pcr
->
delta_absolute
=
mdate
()
-
p_pes
->
i_pts
+
INPUT_PTS_DELAY
;
p_pes
->
i_pts
+=
p_pcr
->
delta_absolute
;
p_pes
->
i_pts
+=
p_pcr
->
delta_absolute
;
p_pcr
->
i_synchro_state
=
0
;
p_pcr
->
i_synchro_state
=
0
;
break
;
break
;
...
...
src/video_parser/vpar_headers.c
View file @
b25b4229
...
@@ -164,6 +164,12 @@ static void __inline__ ReferenceUpdate( vpar_thread_t * p_vpar,
...
@@ -164,6 +164,12 @@ static void __inline__ ReferenceUpdate( vpar_thread_t * p_vpar,
if
(
p_newref
!=
NULL
)
if
(
p_newref
!=
NULL
)
vout_LinkPicture
(
p_vpar
->
p_vout
,
p_newref
);
vout_LinkPicture
(
p_vpar
->
p_vout
,
p_newref
);
}
}
else
if
(
p_newref
!=
NULL
)
{
/* Put date immediately. */
vout_DatePicture
(
p_vpar
->
p_vout
,
p_newref
,
vpar_SynchroDate
(
p_vpar
)
);
}
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -669,12 +675,6 @@ static void PictureHeader( vpar_thread_t * p_vpar )
...
@@ -669,12 +675,6 @@ static void PictureHeader( vpar_thread_t * p_vpar )
/* Initialize values. */
/* Initialize values. */
vpar_SynchroDecode
(
p_vpar
,
p_vpar
->
picture
.
i_coding_type
,
i_structure
);
vpar_SynchroDecode
(
p_vpar
,
p_vpar
->
picture
.
i_coding_type
,
i_structure
);
if
(
p_vpar
->
picture
.
i_coding_type
==
B_CODING_TYPE
)
{
/* Put date immediately. */
vout_DatePicture
(
p_vpar
->
p_vout
,
P_picture
,
vpar_SynchroDate
(
p_vpar
)
);
}
P_picture
->
i_aspect_ratio
=
p_vpar
->
sequence
.
i_aspect_ratio
;
P_picture
->
i_aspect_ratio
=
p_vpar
->
sequence
.
i_aspect_ratio
;
P_picture
->
i_matrix_coefficients
=
p_vpar
->
sequence
.
i_matrix_coefficients
;
P_picture
->
i_matrix_coefficients
=
p_vpar
->
sequence
.
i_matrix_coefficients
;
p_vpar
->
picture
.
i_l_stride
=
(
p_vpar
->
sequence
.
i_width
p_vpar
->
picture
.
i_l_stride
=
(
p_vpar
->
sequence
.
i_width
...
...
src/video_parser/vpar_synchro.c
View file @
b25b4229
...
@@ -71,7 +71,9 @@ void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar,
...
@@ -71,7 +71,9 @@ void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar,
decoder_fifo_t
*
decoder_fifo
=
p_vpar
->
bit_stream
.
p_decoder_fifo
;
decoder_fifo_t
*
decoder_fifo
=
p_vpar
->
bit_stream
.
p_decoder_fifo
;
/* interpolate the current _decode_ PTS */
/* interpolate the current _decode_ PTS */
i_current_pts
=
decoder_fifo
->
buffer
[
decoder_fifo
->
i_start
]
->
i_pts
;
i_current_pts
=
decoder_fifo
->
buffer
[
decoder_fifo
->
i_start
]
->
b_has_pts
?
decoder_fifo
->
buffer
[
decoder_fifo
->
i_start
]
->
i_pts
:
0
;
if
(
!
i_current_pts
)
if
(
!
i_current_pts
)
{
{
i_current_pts
=
p_vpar
->
synchro
.
i_last_decode_pts
i_current_pts
=
p_vpar
->
synchro
.
i_last_decode_pts
...
@@ -84,8 +86,10 @@ void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar,
...
@@ -84,8 +86,10 @@ void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar,
=
i_current_pts
;
=
i_current_pts
;
/* update display time */
/* update display time */
i_displaydate
=
decoder_fifo
->
buffer
[
decoder_fifo
->
i_start
]
->
i_pts
;
i_displaydate
=
decoder_fifo
->
buffer
[
decoder_fifo
->
i_start
]
->
b_has_pts
?
if
(
!
i_displaydate
||
i_coding_type
!=
I_CODING_TYPE
)
decoder_fifo
->
buffer
[
decoder_fifo
->
i_start
]
->
i_pts
:
0
;
if
(
!
i_displaydate
/* || i_coding_type != I_CODING_TYPE */
)
{
{
if
(
!
p_vpar
->
synchro
.
i_images_since_pts
)
if
(
!
p_vpar
->
synchro
.
i_images_since_pts
)
p_vpar
->
synchro
.
i_images_since_pts
=
10
;
p_vpar
->
synchro
.
i_images_since_pts
=
10
;
...
...
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