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
01de23db
Commit
01de23db
authored
Nov 07, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: remove write-only resampling start date
parent
87762e62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+0
-1
src/audio_output/input.c
src/audio_output/input.c
+1
-4
No files found.
src/audio_output/aout_internal.h
View file @
01de23db
...
...
@@ -52,7 +52,6 @@ struct aout_input_t
unsigned
samplerate
;
/**< Input sample rate */
int
i_resampling_type
;
mtime_t
i_resamp_start_date
;
int
i_resamp_start_drift
;
/* last rate from input */
...
...
src/audio_output/input.c
View file @
01de23db
...
...
@@ -178,7 +178,6 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input,
* synchronization
* Solution : resample the buffer to avoid a scratch.
*/
p_input
->
i_resamp_start_date
=
now
;
p_input
->
i_resamp_start_drift
=
(
int
)
-
drift
;
p_input
->
i_resampling_type
=
(
drift
<
0
)
?
AOUT_RESAMPLING_DOWN
:
AOUT_RESAMPLING_UP
;
...
...
@@ -207,9 +206,7 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input,
if
(
owner
->
resampler
->
fmt_in
.
audio
.
i_rate
==
i_nominal_rate
)
{
p_input
->
i_resampling_type
=
AOUT_RESAMPLING_NONE
;
msg_Warn
(
p_aout
,
"resampling stopped after %"
PRIi64
" usec "
"(drift: %"
PRIi64
")"
,
now
-
p_input
->
i_resamp_start_date
,
msg_Warn
(
p_aout
,
"resampling stopped (drift: %"
PRIi64
")"
,
p_buffer
->
i_pts
-
start_date
);
}
else
if
(
abs
(
(
int
)(
p_buffer
->
i_pts
-
start_date
)
)
<
...
...
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