Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gst-plugins-good
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
George Kiagiadakis
gst-plugins-good
Commits
9e9d2ce0
Commit
9e9d2ce0
authored
Jul 09, 2013
by
Sebastian Dröge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
videomixer: Fix negotiation with 0/1 framerates
https://bugzilla.gnome.org/show_bug.cgi?id=703743
parent
beebe2b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
gst/videomixer/videomixer2.c
gst/videomixer/videomixer2.c
+3
-3
No files found.
gst/videomixer/videomixer2.c
View file @
9e9d2ce0
...
...
@@ -194,7 +194,7 @@ gst_videomixer2_update_src_caps (GstVideoMixer2 * mix)
width
=
GST_VIDEO_INFO_WIDTH
(
&
mpad
->
info
);
height
=
GST_VIDEO_INFO_HEIGHT
(
&
mpad
->
info
);
if
(
fps_n
==
0
||
fps_d
==
0
||
width
==
0
||
height
==
0
)
if
(
width
==
0
||
height
==
0
)
continue
;
this_width
=
width
+
MAX
(
mpad
->
xpos
,
0
);
...
...
@@ -217,7 +217,7 @@ gst_videomixer2_update_src_caps (GstVideoMixer2 * mix)
}
}
if
(
best_fps_n
<=
0
&&
best_fps_d
<=
0
)
{
if
(
best_fps_n
<=
0
||
best_fps_d
<=
0
||
best_fps
==
0
.
0
)
{
best_fps_n
=
25
;
best_fps_d
=
1
;
best_fps
=
25
.
0
;
...
...
@@ -1660,7 +1660,7 @@ gst_videomixer2_sink_clip (GstCollectPads * pads,
}
end_time
=
GST_BUFFER_DURATION
(
buf
);
if
(
end_time
==
-
1
)
if
(
end_time
==
-
1
&&
GST_VIDEO_INFO_FPS_N
(
&
pad
->
info
)
!=
0
)
end_time
=
gst_util_uint64_scale_int
(
GST_SECOND
,
GST_VIDEO_INFO_FPS_D
(
&
pad
->
info
),
GST_VIDEO_INFO_FPS_N
(
&
pad
->
info
));
...
...
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