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
5a43b773
Commit
5a43b773
authored
Sep 29, 2013
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: check/update buffered_time earlier, so we shouldn't use 0 as time when encoding
Ref #9022
parent
af762f81
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
modules/codec/avcodec/encoder.c
modules/codec/avcodec/encoder.c
+8
-6
No files found.
modules/codec/avcodec/encoder.c
View file @
5a43b773
...
@@ -1157,12 +1157,17 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
...
@@ -1157,12 +1157,17 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
AVPacket
packet
=
{
0
};
AVPacket
packet
=
{
0
};
avcodec_get_frame_defaults
(
p_sys
->
frame
);
avcodec_get_frame_defaults
(
p_sys
->
frame
);
p_sys
->
frame
->
format
=
p_sys
->
p_context
->
sample_fmt
;
p_sys
->
frame
->
format
=
p_sys
->
p_context
->
sample_fmt
;
p_sys
->
frame
->
pts
=
date_Get
(
&
p_sys
->
buffer_date
);
p_sys
->
frame
->
nb_samples
=
leftover_samples
+
p_sys
->
i_samples_delay
;
p_sys
->
frame
->
nb_samples
=
leftover_samples
+
p_sys
->
i_samples_delay
;
date_Increment
(
&
p_sys
->
buffer_date
,
p_sys
->
i_frame_size
);
if
(
unlikely
(
p_aout_buf
&&
(
p_aout_buf
->
i_pts
>
VLC_TS_INVALID
)
&&
(
p_aout_buf
->
i_pts
!=
date_Get
(
&
p_sys
->
buffer_date
)
)
)
)
date_Set
(
&
p_sys
->
buffer_date
,
p_aout_buf
->
i_pts
);
p_sys
->
frame
->
pts
=
date_Get
(
&
p_sys
->
buffer_date
);
date_Increment
(
&
p_sys
->
buffer_date
,
p_sys
->
i_frame_size
);
if
(
likely
(
p_aout_buf
)
)
if
(
likely
(
p_aout_buf
)
)
{
{
p_aout_buf
->
i_nb_samples
-=
leftover_samples
;
p_aout_buf
->
i_nb_samples
-=
leftover_samples
;
memcpy
(
p_sys
->
p_buffer
+
buffer_delay
,
p_aout_buf
->
p_buffer
,
leftover
);
memcpy
(
p_sys
->
p_buffer
+
buffer_delay
,
p_aout_buf
->
p_buffer
,
leftover
);
...
@@ -1177,6 +1182,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
...
@@ -1177,6 +1182,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
p_aout_buf
->
i_buffer
-=
leftover
;
p_aout_buf
->
i_buffer
-=
leftover
;
p_aout_buf
->
i_pts
=
date_Get
(
&
p_sys
->
buffer_date
);
p_aout_buf
->
i_pts
=
date_Get
(
&
p_sys
->
buffer_date
);
}
}
if
(
unlikely
(
(
(
leftover
+
buffer_delay
)
<
p_sys
->
i_buffer_out
)
&&
if
(
unlikely
(
(
(
leftover
+
buffer_delay
)
<
p_sys
->
i_buffer_out
)
&&
!
(
p_sys
->
p_codec
->
capabilities
&
CODEC_CAP_SMALL_LAST_FRAME
))
!
(
p_sys
->
p_codec
->
capabilities
&
CODEC_CAP_SMALL_LAST_FRAME
))
)
)
...
@@ -1262,10 +1268,6 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
...
@@ -1262,10 +1268,6 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
const
int
align
=
1
;
const
int
align
=
1
;
#endif
#endif
if
(
unlikely
(
p_aout_buf
->
i_pts
>
VLC_TS_INVALID
&&
p_aout_buf
->
i_pts
!=
date_Get
(
&
p_sys
->
buffer_date
)
)
)
date_Set
(
&
p_sys
->
buffer_date
,
p_aout_buf
->
i_pts
);
avcodec_get_frame_defaults
(
p_sys
->
frame
);
avcodec_get_frame_defaults
(
p_sys
->
frame
);
if
(
p_sys
->
b_variable
)
if
(
p_sys
->
b_variable
)
p_sys
->
frame
->
nb_samples
=
p_aout_buf
->
i_nb_samples
;
p_sys
->
frame
->
nb_samples
=
p_aout_buf
->
i_nb_samples
;
...
...
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