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
a78bc6f7
Commit
a78bc6f7
authored
Jun 06, 2012
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffplay: fix frame_delay calculation in new avfilter code
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
e85df18d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
ffplay.c
ffplay.c
+6
-7
No files found.
ffplay.c
View file @
a78bc6f7
...
...
@@ -1540,9 +1540,6 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
SDL_UnlockMutex
(
is
->
pictq_mutex
);
}
if
(
ret
)
is
->
frame_last_returned_time
=
av_gettime
()
/
1000000
.
0
;
return
ret
;
}
return
0
;
...
...
@@ -1679,10 +1676,6 @@ static int video_thread(void *arg)
continue
;
}
is
->
frame_last_filter_delay
=
av_gettime
()
/
1000000
.
0
-
is
->
frame_last_returned_time
;
if
(
fabs
(
is
->
frame_last_filter_delay
)
>
AV_NOSYNC_THRESHOLD
/
10
.
0
)
is
->
frame_last_filter_delay
=
0
;
#if CONFIG_AVFILTER
if
(
last_w
!=
is
->
video_st
->
codec
->
width
||
last_h
!=
is
->
video_st
->
codec
->
height
...
...
@@ -1725,12 +1718,18 @@ static int video_thread(void *arg)
av_free_packet
(
&
pkt
);
while
(
ret
>=
0
)
{
is
->
frame_last_returned_time
=
av_gettime
()
/
1000000
.
0
;
ret
=
av_buffersink_get_buffer_ref
(
filt_out
,
&
picref
,
0
);
if
(
ret
<
0
)
{
ret
=
0
;
break
;
}
is
->
frame_last_filter_delay
=
av_gettime
()
/
1000000
.
0
-
is
->
frame_last_returned_time
;
if
(
fabs
(
is
->
frame_last_filter_delay
)
>
AV_NOSYNC_THRESHOLD
/
10
.
0
)
is
->
frame_last_filter_delay
=
0
;
avfilter_fill_frame_from_video_buffer_ref
(
frame
,
picref
);
pts_int
=
picref
->
pts
;
...
...
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