Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
039cdf37
Commit
039cdf37
authored
Jul 17, 2002
by
Stéphane Borel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The loop in lpcm decoder DecodeFrame() could not exit after b_die
in some case
parent
7076def3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
5 deletions
+19
-5
plugins/lpcm_adec/lpcm_adec.c
plugins/lpcm_adec/lpcm_adec.c
+19
-5
No files found.
plugins/lpcm_adec/lpcm_adec.c
View file @
039cdf37
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* lpcm_adec.c: lpcm decoder thread
* lpcm_adec.c: lpcm decoder thread
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* Copyright (C) 1999-2001 VideoLAN
* $Id: lpcm_adec.c,v 1.1
7 2002/06/01 18:04:49 sam
Exp $
* $Id: lpcm_adec.c,v 1.1
8 2002/07/17 21:24:06 stef
Exp $
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.org>
* Henri Fallon <henri@videolan.org>
...
@@ -156,8 +156,8 @@ static int InitThread (lpcmdec_thread_t * p_lpcmdec)
...
@@ -156,8 +156,8 @@ static int InitThread (lpcmdec_thread_t * p_lpcmdec)
void
DecodeFrame
(
lpcmdec_thread_t
*
p_lpcmdec
)
void
DecodeFrame
(
lpcmdec_thread_t
*
p_lpcmdec
)
{
{
byte_t
*
buffer
,
p_temp
[
LPCMDEC_FRAME_SIZE
];
byte_t
*
buffer
,
p_temp
[
LPCMDEC_FRAME_SIZE
];
vlc_bool_t
b_sync
;
int
i_loop
;
int
i_loop
;
byte_t
byte1
,
byte2
;
CurrentPTS
(
&
p_lpcmdec
->
bit_stream
,
CurrentPTS
(
&
p_lpcmdec
->
bit_stream
,
&
p_lpcmdec
->
p_aout_fifo
->
date
[
p_lpcmdec
->
p_aout_fifo
->
i_end_frame
],
&
p_lpcmdec
->
p_aout_fifo
->
date
[
p_lpcmdec
->
p_aout_fifo
->
i_end_frame
],
...
@@ -172,6 +172,7 @@ void DecodeFrame( lpcmdec_thread_t * p_lpcmdec )
...
@@ -172,6 +172,7 @@ void DecodeFrame( lpcmdec_thread_t * p_lpcmdec )
(
p_lpcmdec
->
p_aout_fifo
->
i_end_frame
*
LPCMDEC_FRAME_SIZE
);
(
p_lpcmdec
->
p_aout_fifo
->
i_end_frame
*
LPCMDEC_FRAME_SIZE
);
RemoveBits32
(
&
p_lpcmdec
->
bit_stream
);
RemoveBits32
(
&
p_lpcmdec
->
bit_stream
);
#if 0
byte1 = GetBits(&p_lpcmdec->bit_stream, 8) ;
byte1 = GetBits(&p_lpcmdec->bit_stream, 8) ;
byte2 = GetBits(&p_lpcmdec->bit_stream, 8) ;
byte2 = GetBits(&p_lpcmdec->bit_stream, 8) ;
...
@@ -185,9 +186,22 @@ void DecodeFrame( lpcmdec_thread_t * p_lpcmdec )
...
@@ -185,9 +186,22 @@ void DecodeFrame( lpcmdec_thread_t * p_lpcmdec )
byte1 = byte2;
byte1 = byte2;
byte2 = GetBits(&p_lpcmdec->bit_stream, 8);
byte2 = GetBits(&p_lpcmdec->bit_stream, 8);
}
}
#else
b_sync
=
0
;
while
(
(
!
p_lpcmdec
->
p_fifo
->
b_die
)
&&
(
!
p_lpcmdec
->
p_fifo
->
b_error
)
&&
(
!
b_sync
)
)
{
while
(
(
!
p_lpcmdec
->
p_fifo
->
b_die
)
&&
(
!
p_lpcmdec
->
p_fifo
->
b_error
)
&&
(
GetBits
(
&
p_lpcmdec
->
bit_stream
,
8
)
!=
0x01
)
);
b_sync
=
(
ShowBits
(
&
p_lpcmdec
->
bit_stream
,
8
)
==
0x80
);
}
RemoveBits
(
&
p_lpcmdec
->
bit_stream
,
8
);
#endif
GetChunk
(
&
p_lpcmdec
->
bit_stream
,
p_temp
,
LPCMDEC_FRAME_SIZE
);
GetChunk
(
&
p_lpcmdec
->
bit_stream
,
p_temp
,
LPCMDEC_FRAME_SIZE
);
if
(
p_lpcmdec
->
p_fifo
->
b_die
)
return
;
if
(
p_lpcmdec
->
p_fifo
->
b_die
||
p_lpcmdec
->
p_fifo
->
b_error
)
return
;
for
(
i_loop
=
0
;
i_loop
<
LPCMDEC_FRAME_SIZE
/
2
;
i_loop
++
)
for
(
i_loop
=
0
;
i_loop
<
LPCMDEC_FRAME_SIZE
/
2
;
i_loop
++
)
{
{
...
...
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