Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
a75bc764
Commit
a75bc764
authored
Feb 07, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: for audio encoding, set packet dts to packet pts.
There are no audio encoders which do frame reordering.
parent
d483bb58
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
avconv.c
avconv.c
+2
-0
utils.c
libavcodec/utils.c
+9
-7
No files found.
avconv.c
View file @
a75bc764
...
...
@@ -991,6 +991,8 @@ static int encode_audio_frame(AVFormatContext *s, OutputStream *ost,
if
(
got_packet
)
{
if
(
pkt
.
pts
!=
AV_NOPTS_VALUE
)
pkt
.
pts
=
av_rescale_q
(
pkt
.
pts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
if
(
pkt
.
dts
!=
AV_NOPTS_VALUE
)
pkt
.
dts
=
av_rescale_q
(
pkt
.
dts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
if
(
pkt
.
duration
>
0
)
pkt
.
duration
=
av_rescale_q
(
pkt
.
duration
,
enc
->
time_base
,
ost
->
st
->
time_base
);
...
...
libavcodec/utils.c
View file @
a75bc764
...
...
@@ -873,12 +873,14 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
if
(
avctx
->
codec
->
encode2
)
{
*
got_packet_ptr
=
0
;
ret
=
avctx
->
codec
->
encode2
(
avctx
,
avpkt
,
frame
,
got_packet_ptr
);
if
(
!
ret
&&
*
got_packet_ptr
&&
!
(
avctx
->
codec
->
capabilities
&
CODEC_CAP_DELAY
))
{
avpkt
->
pts
=
frame
->
pts
;
avpkt
->
duration
=
av_rescale_q
(
frame
->
nb_samples
,
(
AVRational
){
1
,
avctx
->
sample_rate
},
avctx
->
time_base
);
if
(
!
ret
&&
*
got_packet_ptr
)
{
if
(
!
(
avctx
->
codec
->
capabilities
&
CODEC_CAP_DELAY
))
{
avpkt
->
pts
=
frame
->
pts
;
avpkt
->
duration
=
av_rescale_q
(
frame
->
nb_samples
,
(
AVRational
){
1
,
avctx
->
sample_rate
},
avctx
->
time_base
);
}
avpkt
->
dts
=
avpkt
->
pts
;
}
}
else
{
/* for compatibility with encoders not supporting encode2(), we need to
...
...
@@ -925,7 +927,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
av_freep
(
&
avpkt
->
data
);
}
else
{
if
(
avctx
->
coded_frame
)
avpkt
->
pts
=
avctx
->
coded_frame
->
pts
;
avpkt
->
pts
=
av
pkt
->
dts
=
av
ctx
->
coded_frame
->
pts
;
/* Set duration for final small packet. This can be removed
once all encoders supporting CODEC_CAP_SMALL_LAST_FRAME use
encode2() */
...
...
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