diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2012-11-14 12:41:27 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2012-11-14 12:41:27 +0000 |
| commit | 9f7e7d305d11a47c527a1eb40774f61b34a46193 (patch) | |
| tree | defb68306a6b4bc0cf0ac8d790d4acbcec9b8a61 /gst/mpegtsmux/mpegtsmux.c | |
| parent | 3abce95e61c84201bd2a0cc38b10773b3b8491bf (diff) | |
gst_adapter_prev_timestamp -> gst_adapter_prev_pts
Diffstat (limited to 'gst/mpegtsmux/mpegtsmux.c')
| -rw-r--r-- | gst/mpegtsmux/mpegtsmux.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c index 643967d34a..1d61f93264 100644 --- a/gst/mpegtsmux/mpegtsmux.c +++ b/gst/mpegtsmux/mpegtsmux.c @@ -1329,13 +1329,14 @@ mpegtsmux_push_packets (MpegTsMux * mux, gboolean force) else align *= packet_size; + /* FIXME: what about DTS here? */ GST_LOG_OBJECT (mux, "aligning to %d bytes", align); if (G_LIKELY ((align <= av) && av)) { GST_LOG_OBJECT (mux, "pushing %d aligned bytes", av - (av % align)); - ts = gst_adapter_prev_timestamp (mux->out_adapter, NULL); + ts = gst_adapter_prev_pts (mux->out_adapter, NULL); buf = gst_adapter_take_buffer (mux->out_adapter, av - (av % align)); g_assert (buf); - GST_BUFFER_TIMESTAMP (buf) = ts; + GST_BUFFER_PTS (buf) = ts; ret = gst_pad_push (mux->srcpad, buf); av = av % align; @@ -1351,11 +1352,11 @@ mpegtsmux_push_packets (MpegTsMux * mux, gboolean force) buf = gst_buffer_new_and_alloc (align); gst_buffer_map (buf, &map, GST_MAP_READ); data = map.data; - ts = gst_adapter_prev_timestamp (mux->out_adapter, NULL); + ts = gst_adapter_prev_pts (mux->out_adapter, NULL); gst_adapter_copy (mux->out_adapter, data, 0, av); gst_adapter_clear (mux->out_adapter); - GST_BUFFER_TIMESTAMP (buf) = ts; + GST_BUFFER_PTS (buf) = ts; data += av; header = GST_READ_UINT32_BE (data - packet_size); @@ -1469,12 +1470,13 @@ new_packet_m2ts (MpegTsMux * mux, GstBuffer * buf, gint64 new_pcr) gst_util_uint64_scale (mux->previous_offset - offset, mux->pcr_rate_num, mux->pcr_rate_den); - ts = gst_adapter_prev_timestamp (mux->adapter, NULL); + /* FIXME: what about DTS here? */ + ts = gst_adapter_prev_pts (mux->adapter, NULL); out_buf = gst_adapter_take_buffer (mux->adapter, M2TS_PACKET_LENGTH); g_assert (out_buf); offset += M2TS_PACKET_LENGTH; - GST_BUFFER_TIMESTAMP (out_buf) = ts; + GST_BUFFER_PTS (out_buf) = ts; gst_buffer_map (out_buf, &map, GST_MAP_WRITE); |