Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
3584f174
Commit
3584f174
authored
Nov 25, 2002
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed my fix :p.
parent
f9c65dc8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
src/audio_output/input.c
src/audio_output/input.c
+4
-4
No files found.
src/audio_output/input.c
View file @
3584f174
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* input.c : internal management of input streams for the audio output
* input.c : internal management of input streams for the audio output
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* Copyright (C) 2002 VideoLAN
* $Id: input.c,v 1.2
3 2002/11/25 16:00:26
massiot Exp $
* $Id: input.c,v 1.2
4 2002/11/25 16:16:12
massiot Exp $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
...
@@ -176,7 +176,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
...
@@ -176,7 +176,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
p_input
->
i_resampling_type
=
AOUT_RESAMPLING_NONE
;
p_input
->
i_resampling_type
=
AOUT_RESAMPLING_NONE
;
if
(
i_nb_resamplers
!=
0
)
if
(
p_input
->
i_nb_resamplers
!=
0
)
{
{
p_input
->
pp_resamplers
[
0
]
->
input
.
i_rate
=
p_input
->
input
.
i_rate
;
p_input
->
pp_resamplers
[
0
]
->
input
.
i_rate
=
p_input
->
input
.
i_rate
;
p_input
->
pp_resamplers
[
0
]
->
b_reinit
=
VLC_TRUE
;
p_input
->
pp_resamplers
[
0
]
->
b_reinit
=
VLC_TRUE
;
...
@@ -206,7 +206,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
...
@@ -206,7 +206,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
if
(
(
p_input
->
i_resampling_type
==
AOUT_RESAMPLING_NONE
)
&&
if
(
(
p_input
->
i_resampling_type
==
AOUT_RESAMPLING_NONE
)
&&
(
start_date
<
p_buffer
->
start_date
-
AOUT_PTS_TOLERANCE
(
start_date
<
p_buffer
->
start_date
-
AOUT_PTS_TOLERANCE
||
start_date
>
p_buffer
->
start_date
+
AOUT_PTS_TOLERANCE
)
&&
||
start_date
>
p_buffer
->
start_date
+
AOUT_PTS_TOLERANCE
)
&&
i_nb_resamplers
>
0
)
p_input
->
i_nb_resamplers
>
0
)
{
{
/* Can happen in several circumstances :
/* Can happen in several circumstances :
* 1. A problem at the input (clock drift)
* 1. A problem at the input (clock drift)
...
@@ -285,7 +285,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
...
@@ -285,7 +285,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
(
p_buffer
->
end_date
-
p_buffer
->
start_date
);
(
p_buffer
->
end_date
-
p_buffer
->
start_date
);
/* Actually run the resampler now. */
/* Actually run the resampler now. */
if
(
i_nb_resamplers
>
0
&&
p_aout
->
mixer
.
mixer
.
i_rate
!=
if
(
p_input
->
i_nb_resamplers
>
0
&&
p_aout
->
mixer
.
mixer
.
i_rate
!=
p_input
->
pp_resamplers
[
0
]
->
input
.
i_rate
)
p_input
->
pp_resamplers
[
0
]
->
input
.
i_rate
)
{
{
aout_FiltersPlay
(
p_aout
,
p_input
->
pp_resamplers
,
aout_FiltersPlay
(
p_aout
,
p_input
->
pp_resamplers
,
...
...
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