Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
f53c4b6a
Commit
f53c4b6a
authored
Oct 22, 2015
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/vf_framepack: fix scheduling.
parent
d0b82d79
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
vf_framepack.c
libavfilter/vf_framepack.c
+15
-3
No files found.
libavfilter/vf_framepack.c
View file @
f53c4b6a
...
@@ -268,25 +268,26 @@ static av_always_inline void spatial_frame_pack(AVFilterLink *outlink,
...
@@ -268,25 +268,26 @@ static av_always_inline void spatial_frame_pack(AVFilterLink *outlink,
}
}
}
}
static
int
try_push_frame
(
AVFilterContext
*
ctx
);
static
int
filter_frame_left
(
AVFilterLink
*
inlink
,
AVFrame
*
frame
)
static
int
filter_frame_left
(
AVFilterLink
*
inlink
,
AVFrame
*
frame
)
{
{
FramepackContext
*
s
=
inlink
->
dst
->
priv
;
FramepackContext
*
s
=
inlink
->
dst
->
priv
;
s
->
input_views
[
LEFT
]
=
frame
;
s
->
input_views
[
LEFT
]
=
frame
;
return
0
;
return
try_push_frame
(
inlink
->
dst
)
;
}
}
static
int
filter_frame_right
(
AVFilterLink
*
inlink
,
AVFrame
*
frame
)
static
int
filter_frame_right
(
AVFilterLink
*
inlink
,
AVFrame
*
frame
)
{
{
FramepackContext
*
s
=
inlink
->
dst
->
priv
;
FramepackContext
*
s
=
inlink
->
dst
->
priv
;
s
->
input_views
[
RIGHT
]
=
frame
;
s
->
input_views
[
RIGHT
]
=
frame
;
return
0
;
return
try_push_frame
(
inlink
->
dst
)
;
}
}
static
int
request_frame
(
AVFilterLink
*
outlink
)
static
int
request_frame
(
AVFilterLink
*
outlink
)
{
{
AVFilterContext
*
ctx
=
outlink
->
src
;
AVFilterContext
*
ctx
=
outlink
->
src
;
FramepackContext
*
s
=
ctx
->
priv
;
FramepackContext
*
s
=
ctx
->
priv
;
AVStereo3D
*
stereo
;
int
ret
,
i
;
int
ret
,
i
;
/* get a frame on the either input, stop as soon as a video ends */
/* get a frame on the either input, stop as soon as a video ends */
...
@@ -297,7 +298,18 @@ static int request_frame(AVFilterLink *outlink)
...
@@ -297,7 +298,18 @@ static int request_frame(AVFilterLink *outlink)
return
ret
;
return
ret
;
}
}
}
}
return
0
;
}
static
int
try_push_frame
(
AVFilterContext
*
ctx
)
{
FramepackContext
*
s
=
ctx
->
priv
;
AVFilterLink
*
outlink
=
ctx
->
outputs
[
0
];
AVStereo3D
*
stereo
;
int
ret
,
i
;
if
(
!
(
s
->
input_views
[
0
]
&&
s
->
input_views
[
1
]))
return
0
;
if
(
s
->
format
==
AV_STEREO3D_FRAMESEQUENCE
)
{
if
(
s
->
format
==
AV_STEREO3D_FRAMESEQUENCE
)
{
if
(
s
->
double_pts
==
AV_NOPTS_VALUE
)
if
(
s
->
double_pts
==
AV_NOPTS_VALUE
)
s
->
double_pts
=
s
->
input_views
[
LEFT
]
->
pts
;
s
->
double_pts
=
s
->
input_views
[
LEFT
]
->
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