Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
2f0173a7
Commit
2f0173a7
authored
Dec 07, 2009
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vorbis: use VLC_TS_INVALID (refs #3135)
Also remove unneeded encoder_sys_t member
parent
4cf39c42
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
modules/codec/vorbis.c
modules/codec/vorbis.c
+4
-10
No files found.
modules/codec/vorbis.c
View file @
2f0173a7
...
...
@@ -475,7 +475,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
block_t
*
p_block
=
*
pp_block
;
/* Date management */
if
(
p_block
&&
p_block
->
i_pts
>
0
&&
if
(
p_block
&&
p_block
->
i_pts
>
VLC_TS_INVALID
&&
p_block
->
i_pts
!=
date_Get
(
&
p_sys
->
end_date
)
)
{
date_Set
(
&
p_sys
->
end_date
,
p_block
->
i_pts
);
...
...
@@ -764,11 +764,6 @@ struct encoder_sys_t
int
i_samples_delay
;
int
i_channels
;
/*
* Common properties
*/
mtime_t
i_pts
;
/*
** Channel reordering
*/
...
...
@@ -889,7 +884,6 @@ static int OpenEncoder( vlc_object_t *p_this )
p_sys
->
i_channels
=
p_enc
->
fmt_in
.
audio
.
i_channels
;
p_sys
->
i_last_block_size
=
0
;
p_sys
->
i_samples_delay
=
0
;
p_sys
->
i_pts
=
0
;
ConfigureChannelOrder
(
p_sys
->
pi_chan_table
,
p_sys
->
vi
.
channels
,
p_enc
->
fmt_in
.
audio
.
i_physical_channels
,
true
);
...
...
@@ -911,7 +905,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
int
i
;
unsigned
int
j
;
p_sys
->
i_pts
=
p_aout_buf
->
i_pts
-
mtime_t
i_pts
=
p_aout_buf
->
i_pts
-
(
mtime_t
)
1000000
*
(
mtime_t
)
p_sys
->
i_samples_delay
/
(
mtime_t
)
p_enc
->
fmt_in
.
audio
.
i_rate
;
...
...
@@ -953,12 +947,12 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
p_block
->
i_length
=
(
mtime_t
)
1000000
*
(
mtime_t
)
i_samples
/
(
mtime_t
)
p_enc
->
fmt_in
.
audio
.
i_rate
;
p_block
->
i_dts
=
p_block
->
i_pts
=
p_sys
->
i_pts
;
p_block
->
i_dts
=
p_block
->
i_pts
=
i_pts
;
p_sys
->
i_samples_delay
-=
i_samples
;
/* Update pts */
p_sys
->
i_pts
+=
p_block
->
i_length
;
i_pts
+=
p_block
->
i_length
;
block_ChainAppend
(
&
p_chain
,
p_block
);
}
}
...
...
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