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
33bc81e4
Commit
33bc81e4
authored
Nov 19, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: skip duration cliping for passthrough & drop modes
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
de8cd93a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
ffmpeg.c
ffmpeg.c
+11
-7
No files found.
ffmpeg.c
View file @
33bc81e4
...
...
@@ -904,13 +904,6 @@ static void do_video_out(AVFormatContext *s,
sync_ipts
=
next_picture
->
pts
;
delta0
=
sync_ipts
-
ost
->
sync_opts
;
delta
=
delta0
+
duration
;
if
(
delta0
<
0
&&
delta
>
0
)
{
double
cor
=
FFMIN
(
-
delta0
,
duration
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"Past duration %f too large
\n
"
,
-
delta0
);
sync_ipts
+=
cor
;
duration
-=
cor
;
delta0
+=
cor
;
}
/* by default, we output a single frame */
nb0_frames
=
0
;
...
...
@@ -933,6 +926,17 @@ static void do_video_out(AVFormatContext *s,
}
}
if
(
delta0
<
0
&&
delta
>
0
&&
format_video_sync
!=
VSYNC_PASSTHROUGH
&&
format_video_sync
!=
VSYNC_DROP
)
{
double
cor
=
FFMIN
(
-
delta0
,
duration
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"Past duration %f too large
\n
"
,
-
delta0
);
sync_ipts
+=
cor
;
duration
-=
cor
;
delta0
+=
cor
;
}
switch
(
format_video_sync
)
{
case
VSYNC_VSCFR
:
if
(
ost
->
frame_number
==
0
&&
delta
-
duration
>=
0
.
5
)
{
...
...
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