projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
41e1bea
)
collectpads: Use GST_BUFFER_DTS_OR_PTS
author
Edward Hervey
<bilboed@bilboed.com>
Tue, 27 Oct 2015 07:33:41 +0000
(08:33 +0100)
committer
Edward Hervey
<bilboed@bilboed.com>
Tue, 27 Oct 2015 07:33:41 +0000
(08:33 +0100)
Simplifies code a bit
libs/gst/base/gstcollectpads.c
patch
|
blob
|
history
diff --git
a/libs/gst/base/gstcollectpads.c
b/libs/gst/base/gstcollectpads.c
index
30c565f
..
9732f03
100644
(file)
--- a/
libs/gst/base/gstcollectpads.c
+++ b/
libs/gst/base/gstcollectpads.c
@@
-1474,10
+1474,7
@@
gst_collect_pads_find_best_pad (GstCollectPads * pads,
buffer = gst_collect_pads_peek (pads, data);
/* if we have a buffer check if it is better then the current best one */
if (buffer != NULL) {
buffer = gst_collect_pads_peek (pads, data);
/* if we have a buffer check if it is better then the current best one */
if (buffer != NULL) {
- timestamp = GST_BUFFER_DTS (buffer);
- if (!GST_CLOCK_TIME_IS_VALID (timestamp)) {
- timestamp = GST_BUFFER_PTS (buffer);
- }
+ timestamp = GST_BUFFER_DTS_OR_PTS (buffer);
gst_buffer_unref (buffer);
if (best == NULL || pads->priv->compare_func (pads, data, timestamp,
best, best_time, pads->priv->compare_user_data) < 0) {
gst_buffer_unref (buffer);
if (best == NULL || pads->priv->compare_func (pads, data, timestamp,
best, best_time, pads->priv->compare_user_data) < 0) {
@@
-2202,9
+2199,7
@@
gst_collect_pads_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
if (G_LIKELY (data->segment.format == GST_FORMAT_TIME)) {
GstClockTime timestamp;
if (G_LIKELY (data->segment.format == GST_FORMAT_TIME)) {
GstClockTime timestamp;
- timestamp = GST_BUFFER_DTS (buffer);
- if (!GST_CLOCK_TIME_IS_VALID (timestamp))
- timestamp = GST_BUFFER_PTS (buffer);
+ timestamp = GST_BUFFER_DTS_OR_PTS (buffer);
if (GST_CLOCK_TIME_IS_VALID (timestamp))
data->segment.position = timestamp;
if (GST_CLOCK_TIME_IS_VALID (timestamp))
data->segment.position = timestamp;