mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

structure: fix for api upate

Browse source
This commit is contained in:
Wim Taymans 2011-10-29 09:11:53 +02:00
parent 02250601cf
commit 431bbdcbf5
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/ffmpeg/gstffmpegdemux.c
View file

@ -621,8 +621,8 @@ gst_ffmpegdemux_perform_seek (GstFFMpegDemux * demux, GstEvent * event)
} }
/* now send the newsegment, FIXME, do this from the streaming thread */ /* now send the newsegment, FIXME, do this from the streaming thread */
GST_DEBUG_OBJECT (demux, "Sending newsegment from %" G_GINT64_FORMAT GST_DEBUG_OBJECT (demux, "Sending newsegment %" GST_SEGMENT_FORMAT,
" to %" G_GINT64_FORMAT, demux->segment.position, demux->segment.stop); &demux->segment);
gst_ffmpegdemux_push_event (demux, gst_event_new_segment (&demux->segment)); gst_ffmpegdemux_push_event (demux, gst_event_new_segment (&demux->segment));
} }
@ -1204,6 +1204,8 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
gst_ffmpegdemux_perform_seek (demux, event); gst_ffmpegdemux_perform_seek (demux, event);
gst_event_unref (event); gst_event_unref (event);
} else { } else {
GST_DEBUG_OBJECT (demux, "Sending segment %" GST_SEGMENT_FORMAT,
&demux->segment);
gst_ffmpegdemux_push_event (demux, gst_event_new_segment (&demux->segment)); gst_ffmpegdemux_push_event (demux, gst_event_new_segment (&demux->segment));
} }
@ -1371,8 +1373,10 @@ gst_ffmpegdemux_loop (GstFFMpegDemux * demux)
pkt.stream_index, pkt.flags, GST_TIME_ARGS (duration), (gint64) pkt.pos); pkt.stream_index, pkt.flags, GST_TIME_ARGS (duration), (gint64) pkt.pos);
/* check start_time */ /* check start_time */
#if 0
if (demux->start_time != -1 && demux->start_time > timestamp) if (demux->start_time != -1 && demux->start_time > timestamp)
goto drop; goto drop;
#endif
if (GST_CLOCK_TIME_IS_VALID (timestamp)) if (GST_CLOCK_TIME_IS_VALID (timestamp))
timestamp -= demux->start_time; timestamp -= demux->start_time;
@ -1974,7 +1978,8 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
rank = GST_RANK_MARGINAL; rank = GST_RANK_MARGINAL;
else { else {
GST_DEBUG ("ignoring %s", in_plugin->name); GST_DEBUG ("ignoring %s", in_plugin->name);
goto next; rank = GST_RANK_MARGINAL;
//goto next;
} }
p = name = g_strdup (in_plugin->name); p = name = g_strdup (in_plugin->name);

2
ext/ffmpeg/gstffmpegenc.c
View file

@ -346,7 +346,7 @@ gst_ffmpegenc_get_possible_sizes (GstFFMpegEnc * ffmpegenc, GstPad * pad,
width = gst_structure_get_value (s, "width"); width = gst_structure_get_value (s, "width");
framerate = gst_structure_get_value (s, "framerate"); framerate = gst_structure_get_value (s, "framerate");
tmps = gst_structure_empty_new ("video/x-raw"); tmps = gst_structure_new_empty ("video/x-raw");
if (width) if (width)
gst_structure_set_value (tmps, "width", width); gst_structure_set_value (tmps, "width", width);
if (height) if (height)