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
e97f189c
Commit
e97f189c
authored
Jan 24, 2000
by
Michel Kaempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* GoldenEye rewlz :
- explications du commit au prochain commit :-)
parent
07f2392f
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
114 additions
and
66 deletions
+114
-66
include/audio_output.h
include/audio_output.h
+3
-4
src/ac3_decoder/ac3_decoder.c
src/ac3_decoder/ac3_decoder.c
+6
-0
src/audio_output/audio_output.c
src/audio_output/audio_output.c
+105
-62
No files found.
include/audio_output.h
View file @
e97f189c
...
...
@@ -176,12 +176,11 @@ typedef struct aout_thread_s
/* The size of the audio output buffer is kept in audio units, as this is
* the only unit that is common with every audio decoder and audio fifo */
long
l_units
;
long
l_msleep
;
mtime_t
date
;
/* date is the moment where the first audio unit of the output buffer
* should be played and is kept up-to-date with the following incremental
* structure */
aout_increment_t
date_increment
;
* will be played */
mtime_t
date
;
}
aout_thread_t
;
...
...
src/ac3_decoder/ac3_decoder.c
View file @
e97f189c
...
...
@@ -277,6 +277,7 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
downmix
(
p_ac3dec
,
((
ac3dec_frame_t
*
)
p_ac3dec
->
p_aout_fifo
->
buffer
)[
p_ac3dec
->
p_aout_fifo
->
l_end_frame
]
);
vlc_mutex_lock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
p_ac3dec
->
p_aout_fifo
->
l_end_frame
=
(
p_ac3dec
->
p_aout_fifo
->
l_end_frame
+
1
)
&
AOUT_FIFO_SIZE
;
vlc_cond_signal
(
&
p_ac3dec
->
p_aout_fifo
->
data_wait
);
vlc_mutex_unlock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
/* frame 2 */
...
...
@@ -297,6 +298,7 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
p_ac3dec
->
p_aout_fifo
->
date
[
p_ac3dec
->
p_aout_fifo
->
l_end_frame
]
=
LAST_MDATE
;
vlc_mutex_lock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
p_ac3dec
->
p_aout_fifo
->
l_end_frame
=
(
p_ac3dec
->
p_aout_fifo
->
l_end_frame
+
1
)
&
AOUT_FIFO_SIZE
;
vlc_cond_signal
(
&
p_ac3dec
->
p_aout_fifo
->
data_wait
);
vlc_mutex_unlock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
/* frame 3 */
...
...
@@ -317,6 +319,7 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
p_ac3dec
->
p_aout_fifo
->
date
[
p_ac3dec
->
p_aout_fifo
->
l_end_frame
]
=
LAST_MDATE
;
vlc_mutex_lock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
p_ac3dec
->
p_aout_fifo
->
l_end_frame
=
(
p_ac3dec
->
p_aout_fifo
->
l_end_frame
+
1
)
&
AOUT_FIFO_SIZE
;
vlc_cond_signal
(
&
p_ac3dec
->
p_aout_fifo
->
data_wait
);
vlc_mutex_unlock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
/* frame 4 */
...
...
@@ -337,6 +340,7 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
p_ac3dec
->
p_aout_fifo
->
date
[
p_ac3dec
->
p_aout_fifo
->
l_end_frame
]
=
LAST_MDATE
;
vlc_mutex_lock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
p_ac3dec
->
p_aout_fifo
->
l_end_frame
=
(
p_ac3dec
->
p_aout_fifo
->
l_end_frame
+
1
)
&
AOUT_FIFO_SIZE
;
vlc_cond_signal
(
&
p_ac3dec
->
p_aout_fifo
->
data_wait
);
vlc_mutex_unlock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
/* frame 5 */
...
...
@@ -357,6 +361,7 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
p_ac3dec
->
p_aout_fifo
->
date
[
p_ac3dec
->
p_aout_fifo
->
l_end_frame
]
=
LAST_MDATE
;
vlc_mutex_lock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
p_ac3dec
->
p_aout_fifo
->
l_end_frame
=
(
p_ac3dec
->
p_aout_fifo
->
l_end_frame
+
1
)
&
AOUT_FIFO_SIZE
;
vlc_cond_signal
(
&
p_ac3dec
->
p_aout_fifo
->
data_wait
);
vlc_mutex_unlock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
/* frame 6 */
...
...
@@ -377,6 +382,7 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
p_ac3dec
->
p_aout_fifo
->
date
[
p_ac3dec
->
p_aout_fifo
->
l_end_frame
]
=
LAST_MDATE
;
vlc_mutex_lock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
p_ac3dec
->
p_aout_fifo
->
l_end_frame
=
(
p_ac3dec
->
p_aout_fifo
->
l_end_frame
+
1
)
&
AOUT_FIFO_SIZE
;
vlc_cond_signal
(
&
p_ac3dec
->
p_aout_fifo
->
data_wait
);
vlc_mutex_unlock
(
&
p_ac3dec
->
p_aout_fifo
->
data_lock
);
parse_auxdata
(
p_ac3dec
);
...
...
src/audio_output/audio_output.c
View file @
e97f189c
This diff is collapsed.
Click to expand it.
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