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
875bcdf1
Commit
875bcdf1
authored
Nov 29, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly reset date after a discontinuity in audio decoder.
parent
d5d6a32a
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
5 deletions
+8
-5
modules/codec/a52.c
modules/codec/a52.c
+1
-1
modules/codec/avcodec/audio.c
modules/codec/avcodec/audio.c
+2
-0
modules/codec/dts.c
modules/codec/dts.c
+1
-1
modules/codec/flac.c
modules/codec/flac.c
+1
-1
modules/codec/mpeg_audio.c
modules/codec/mpeg_audio.c
+1
-1
modules/packetizer/mlp.c
modules/packetizer/mlp.c
+1
-0
modules/packetizer/mpeg4audio.c
modules/packetizer/mpeg4audio.c
+1
-1
No files found.
modules/codec/a52.c
View file @
875bcdf1
...
@@ -191,7 +191,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -191,7 +191,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys
->
i_state
=
STATE_NOSYNC
;
p_sys
->
i_state
=
STATE_NOSYNC
;
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
}
}
//
aout_DateSet( &p_sys->end_date, 0 );
aout_DateSet
(
&
p_sys
->
end_date
,
0
);
block_Release
(
*
pp_block
);
block_Release
(
*
pp_block
);
return
NULL
;
return
NULL
;
}
}
...
...
modules/codec/avcodec/audio.c
View file @
875bcdf1
...
@@ -261,6 +261,8 @@ aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
...
@@ -261,6 +261,8 @@ aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
{
{
block_Release
(
p_block
);
block_Release
(
p_block
);
avcodec_flush_buffers
(
p_sys
->
p_context
);
avcodec_flush_buffers
(
p_sys
->
p_context
);
p_sys
->
i_samples
=
0
;
aout_DateSet
(
&
p_sys
->
end_date
,
0
);
if
(
p_sys
->
i_codec_id
==
CODEC_ID_MP2
||
p_sys
->
i_codec_id
==
CODEC_ID_MP3
)
if
(
p_sys
->
i_codec_id
==
CODEC_ID_MP2
||
p_sys
->
i_codec_id
==
CODEC_ID_MP3
)
p_sys
->
i_reject_count
=
3
;
p_sys
->
i_reject_count
=
3
;
...
...
modules/codec/dts.c
View file @
875bcdf1
...
@@ -179,7 +179,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -179,7 +179,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys
->
i_state
=
STATE_NOSYNC
;
p_sys
->
i_state
=
STATE_NOSYNC
;
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
}
}
//
aout_DateSet( &p_sys->end_date, 0 );
aout_DateSet
(
&
p_sys
->
end_date
,
0
);
block_Release
(
*
pp_block
);
block_Release
(
*
pp_block
);
return
NULL
;
return
NULL
;
}
}
...
...
modules/codec/flac.c
View file @
875bcdf1
...
@@ -388,7 +388,7 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -388,7 +388,7 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys
->
i_state
=
STATE_NOSYNC
;
p_sys
->
i_state
=
STATE_NOSYNC
;
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
}
}
//
aout_DateSet( &p_sys->end_date, 0 );
aout_DateSet
(
&
p_sys
->
end_date
,
0
);
block_Release
(
*
pp_block
);
block_Release
(
*
pp_block
);
return
NULL
;
return
NULL
;
}
}
...
...
modules/codec/mpeg_audio.c
View file @
875bcdf1
...
@@ -208,7 +208,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -208,7 +208,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys
->
i_state
=
STATE_NOSYNC
;
p_sys
->
i_state
=
STATE_NOSYNC
;
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
}
}
//
aout_DateSet( &p_sys->end_date, 0 );
aout_DateSet
(
&
p_sys
->
end_date
,
0
);
block_Release
(
*
pp_block
);
block_Release
(
*
pp_block
);
p_sys
->
b_discontinuity
=
true
;
p_sys
->
b_discontinuity
=
true
;
return
NULL
;
return
NULL
;
...
...
modules/packetizer/mlp.c
View file @
875bcdf1
...
@@ -166,6 +166,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
...
@@ -166,6 +166,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
p_sys
->
i_state
=
STATE_NOSYNC
;
p_sys
->
i_state
=
STATE_NOSYNC
;
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
block_BytestreamFlush
(
&
p_sys
->
bytestream
);
}
}
aout_DateSet
(
&
p_sys
->
end_date
,
0
);
block_Release
(
*
pp_block
);
block_Release
(
*
pp_block
);
return
NULL
;
return
NULL
;
}
}
...
...
modules/packetizer/mpeg4audio.c
View file @
875bcdf1
...
@@ -290,7 +290,7 @@ static block_t *PacketizeRawBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -290,7 +290,7 @@ static block_t *PacketizeRawBlock( decoder_t *p_dec, block_t **pp_block )
if
(
(
*
pp_block
)
->
i_flags
&
(
BLOCK_FLAG_DISCONTINUITY
|
BLOCK_FLAG_CORRUPTED
)
)
if
(
(
*
pp_block
)
->
i_flags
&
(
BLOCK_FLAG_DISCONTINUITY
|
BLOCK_FLAG_CORRUPTED
)
)
{
{
//
aout_DateSet( &p_sys->end_date, 0 );
aout_DateSet
(
&
p_sys
->
end_date
,
0
);
block_Release
(
*
pp_block
);
block_Release
(
*
pp_block
);
return
NULL
;
return
NULL
;
}
}
...
...
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