mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 16:52:42 +00:00
ext/ffmpeg/: Printf format fixes.
Original commit message from CVS: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_get_stream): * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_setcaps): Printf format fixes.
This commit is contained in:
parent
dd1339334d
commit
d4ca196fc9
3 changed files with 70 additions and 63 deletions
|
@ -1,3 +1,9 @@
|
|||
2006-10-05 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_get_stream):
|
||||
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_setcaps):
|
||||
Printf format fixes.
|
||||
|
||||
2006-10-05 Edward Hervey <edward@fluendo.com>
|
||||
|
||||
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_seek):
|
||||
|
|
|
@ -314,7 +314,8 @@ gst_ffmpegdemux_push_event (GstFFMpegDemux * demux, GstEvent * event)
|
|||
|
||||
/* set flags on all streams */
|
||||
static void
|
||||
gst_ffmpegdemux_set_flags (GstFFMpegDemux * demux, gboolean discont, gboolean eos)
|
||||
gst_ffmpegdemux_set_flags (GstFFMpegDemux * demux, gboolean discont,
|
||||
gboolean eos)
|
||||
{
|
||||
GstFFStream *s;
|
||||
gint n;
|
||||
|
@ -380,7 +381,8 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux * demux, GstSegment *segment)
|
|||
GST_TIME_FORMAT, GST_TIME_ARGS (target));
|
||||
|
||||
/* search in the index for the previous keyframe */
|
||||
keyframeidx = av_index_search_timestamp (stream, fftarget, AVSEEK_FLAG_BACKWARD);
|
||||
keyframeidx =
|
||||
av_index_search_timestamp (stream, fftarget, AVSEEK_FLAG_BACKWARD);
|
||||
|
||||
GST_LOG_OBJECT (demux, "keyframeidx: %d", keyframeidx);
|
||||
|
||||
|
@ -398,7 +400,9 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux * demux, GstSegment *segment)
|
|||
"About to call av_seek_frame (context, %d, %lld, 0) for time %"
|
||||
GST_TIME_FORMAT, index, fftarget, GST_TIME_ARGS (target));
|
||||
|
||||
if ((seekret = av_seek_frame (demux->context, index, fftarget, AVSEEK_FLAG_BACKWARD)) < 0)
|
||||
if ((seekret =
|
||||
av_seek_frame (demux->context, index, fftarget,
|
||||
AVSEEK_FLAG_BACKWARD)) < 0)
|
||||
goto seek_failed;
|
||||
|
||||
GST_DEBUG_OBJECT (demux, "seek success, returned %d", seekret);
|
||||
|
@ -467,8 +471,7 @@ gst_ffmpegdemux_perform_seek (GstFFMpegDemux * demux, GstEvent *event)
|
|||
GST_OBJECT_UNLOCK (demux);
|
||||
gst_pad_push_event (demux->sinkpad, gst_event_new_flush_start ());
|
||||
gst_ffmpegdemux_push_event (demux, gst_event_new_flush_start ());
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
gst_pad_pause_task (demux->sinkpad);
|
||||
}
|
||||
|
||||
|
@ -512,12 +515,14 @@ gst_ffmpegdemux_perform_seek (GstFFMpegDemux * demux, GstEvent *event)
|
|||
/* we are running the current segment and doing a non-flushing seek,
|
||||
* close the segment first based on the last_stop. */
|
||||
GST_DEBUG_OBJECT (demux, "closing running segment %" G_GINT64_FORMAT
|
||||
" to %" G_GINT64_FORMAT, demux->segment.start, demux->segment.last_stop);
|
||||
" to %" G_GINT64_FORMAT, demux->segment.start,
|
||||
demux->segment.last_stop);
|
||||
|
||||
gst_ffmpegdemux_push_event (demux,
|
||||
gst_event_new_new_segment (TRUE,
|
||||
demux->segment.rate, demux->segment.format,
|
||||
demux->segment.start, demux->segment.last_stop, demux->segment.time));
|
||||
demux->segment.start, demux->segment.last_stop,
|
||||
demux->segment.time));
|
||||
}
|
||||
/* if successfull seek, we update our real segment and push
|
||||
* out the new segment. */
|
||||
|
@ -615,14 +620,14 @@ gst_ffmpegdemux_send_event (GstElement * element, GstEvent *event)
|
|||
GST_OBJECT_LOCK (demux);
|
||||
if (!demux->opened) {
|
||||
GstEvent **event_p;
|
||||
|
||||
GST_DEBUG_OBJECT (demux, "caching seek event");
|
||||
event_p = &demux->seek_event;
|
||||
gst_event_replace (event_p, event);
|
||||
GST_OBJECT_UNLOCK (demux);
|
||||
|
||||
res = TRUE;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
GST_OBJECT_UNLOCK (demux);
|
||||
res = gst_ffmpegdemux_perform_seek (demux, event);
|
||||
gst_event_unref (event);
|
||||
|
@ -879,7 +884,7 @@ gst_ffmpegdemux_get_stream (GstFFMpegDemux * demux, AVStream * avstream)
|
|||
/* ERRORS */
|
||||
exists:
|
||||
{
|
||||
GST_DEBUG_OBJECT (demux, "Pad existed", avstream->index);
|
||||
GST_DEBUG_OBJECT (demux, "Pad existed (stream %d)", avstream->index);
|
||||
return demux->streams[avstream->index];
|
||||
}
|
||||
unknown_type:
|
||||
|
@ -1039,13 +1044,11 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
|
|||
if (event) {
|
||||
gst_ffmpegdemux_perform_seek (demux, event);
|
||||
gst_event_unref (event);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
gst_ffmpegdemux_push_event (demux,
|
||||
gst_event_new_new_segment (FALSE,
|
||||
demux->segment.rate, demux->segment.format,
|
||||
demux->segment.start, demux->segment.stop,
|
||||
demux->segment.time));
|
||||
demux->segment.start, demux->segment.stop, demux->segment.time));
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
@ -1119,7 +1122,9 @@ gst_ffmpegdemux_loop (GstPad * pad)
|
|||
goto read_failed;
|
||||
|
||||
/* get the stream */
|
||||
stream = gst_ffmpegdemux_get_stream (demux, demux->context->streams[pkt.stream_index]);
|
||||
stream =
|
||||
gst_ffmpegdemux_get_stream (demux,
|
||||
demux->context->streams[pkt.stream_index]);
|
||||
|
||||
/* check if we know the stream */
|
||||
if (stream->unknown)
|
||||
|
@ -1137,10 +1142,10 @@ gst_ffmpegdemux_loop (GstPad * pad)
|
|||
duration = gst_ffmpeg_time_ff_to_gst (pkt.duration, avstream->time_base);
|
||||
|
||||
GST_DEBUG_OBJECT (demux,
|
||||
"pkt pts:%"GST_TIME_FORMAT" / size:%d / stream_index:%d / flags:%d / duration:%"
|
||||
GST_TIME_FORMAT" / pos:%lld",
|
||||
GST_TIME_ARGS (timestamp), pkt.size, pkt.stream_index, pkt.flags,
|
||||
GST_TIME_ARGS (duration), pkt.pos);
|
||||
"pkt pts:%" GST_TIME_FORMAT
|
||||
" / size:%d / stream_index:%d / flags:%d / duration:%" GST_TIME_FORMAT
|
||||
" / pos:%lld", GST_TIME_ARGS (timestamp), pkt.size, pkt.stream_index,
|
||||
pkt.flags, GST_TIME_ARGS (duration), pkt.pos);
|
||||
|
||||
/* check start_time */
|
||||
if (demux->start_time != -1 && demux->start_time > timestamp)
|
||||
|
@ -1213,13 +1218,11 @@ pause:
|
|||
gst_element_post_message (GST_ELEMENT (demux),
|
||||
gst_message_new_segment_done (GST_OBJECT (demux),
|
||||
demux->segment.format, stop));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
GST_LOG_OBJECT (demux, "pushing eos");
|
||||
gst_ffmpegdemux_push_event (demux, gst_event_new_eos ());
|
||||
}
|
||||
}
|
||||
else if (GST_FLOW_IS_FATAL (ret)) {
|
||||
} else if (GST_FLOW_IS_FATAL (ret)) {
|
||||
GST_ELEMENT_ERROR (demux, STREAM, FAILED,
|
||||
("Internal data stream error."),
|
||||
("streaming stopped, reason %s", gst_flow_get_name (ret)));
|
||||
|
@ -1256,8 +1259,7 @@ drop:
|
|||
GST_DEBUG_OBJECT (demux, "we are eos");
|
||||
ret = GST_FLOW_UNEXPECTED;
|
||||
goto pause;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
GST_DEBUG_OBJECT (demux, "some streams are not yet eos");
|
||||
goto done;
|
||||
}
|
||||
|
@ -1404,8 +1406,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
|
|||
goto next;
|
||||
|
||||
/* no network demuxers */
|
||||
if (!strcmp (in_plugin->name, "sdp") ||
|
||||
!strcmp (in_plugin->name, "rtsp"))
|
||||
if (!strcmp (in_plugin->name, "sdp") || !strcmp (in_plugin->name, "rtsp"))
|
||||
goto next;
|
||||
|
||||
/* these don't do what one would expect or
|
||||
|
|
|
@ -375,7 +375,7 @@ gst_ffmpegenc_setcaps (GstPad * pad, GstCaps * caps)
|
|||
ffmpegenc->context->bit_rate_tolerance = ffmpegenc->bitrate;
|
||||
ffmpegenc->context->gop_size = ffmpegenc->gop_size;
|
||||
ffmpegenc->context->me_method = ffmpegenc->me_method;
|
||||
GST_DEBUG_OBJECT (ffmpegenc, "Setting avcontext with bitrate %d, gop_size %d",
|
||||
GST_DEBUG_OBJECT (ffmpegenc, "Setting avcontext to bitrate %lu, gop_size %d",
|
||||
ffmpegenc->bitrate, ffmpegenc->gop_size);
|
||||
|
||||
/* RTP payload used for GOB production (for Asterisk) */
|
||||
|
|
Loading…
Reference in a new issue