mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 07:16:55 +00:00
ext/ffmpeg/gstffmpegdec.c: Too bad we can't use gst_private.h..
Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_do_qos): Too bad we can't use gst_private.h..
This commit is contained in:
parent
236e5337b0
commit
d11f8704a2
2 changed files with 9 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2006-04-08 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
|
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_do_qos):
|
||||||
|
Too bad we can't use gst_private.h..
|
||||||
|
|
||||||
2006-04-08 Wim Taymans <wim@fluendo.com>
|
2006-04-08 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_avpicture_fill):
|
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_avpicture_fill):
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
#include <gst/gst_private.h>
|
|
||||||
|
|
||||||
#include "gstffmpeg.h"
|
#include "gstffmpeg.h"
|
||||||
#include "gstffmpegcodecmap.h"
|
#include "gstffmpegcodecmap.h"
|
||||||
|
@ -905,7 +904,7 @@ gst_ffmpegdec_do_qos (GstFFMpegDec *ffmpegdec, GstClockTime timestamp, gboolean
|
||||||
* values mean we are early, positive values mean we are too late. */
|
* values mean we are early, positive values mean we are too late. */
|
||||||
diff = GST_CLOCK_DIFF (qostime, earliest_time);
|
diff = GST_CLOCK_DIFF (qostime, earliest_time);
|
||||||
|
|
||||||
GST_CAT_DEBUG_OBJECT (GST_CAT_QOS, ffmpegdec, "qostime %"GST_TIME_FORMAT
|
GST_DEBUG_OBJECT (ffmpegdec, "QOS: qostime %"GST_TIME_FORMAT
|
||||||
", earliest %"GST_TIME_FORMAT, GST_TIME_ARGS (qostime),
|
", earliest %"GST_TIME_FORMAT, GST_TIME_ARGS (qostime),
|
||||||
GST_TIME_ARGS (earliest_time));
|
GST_TIME_ARGS (earliest_time));
|
||||||
|
|
||||||
|
@ -945,7 +944,7 @@ normal_mode:
|
||||||
if (ffmpegdec->context->hurry_up != 0) {
|
if (ffmpegdec->context->hurry_up != 0) {
|
||||||
ffmpegdec->context->hurry_up = 0;
|
ffmpegdec->context->hurry_up = 0;
|
||||||
*mode_switch = TRUE;
|
*mode_switch = TRUE;
|
||||||
GST_CAT_DEBUG_OBJECT (GST_CAT_QOS, ffmpegdec, "normal mode %g < 0.4", proportion);
|
GST_DEBUG_OBJECT (ffmpegdec, "QOS: normal mode %g < 0.4", proportion);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@ -954,7 +953,7 @@ skip_to_keyframe:
|
||||||
ffmpegdec->context->hurry_up = 1;
|
ffmpegdec->context->hurry_up = 1;
|
||||||
ffmpegdec->waiting_for_key = TRUE;
|
ffmpegdec->waiting_for_key = TRUE;
|
||||||
*mode_switch = TRUE;
|
*mode_switch = TRUE;
|
||||||
GST_CAT_DEBUG_OBJECT (GST_CAT_QOS, ffmpegdec, "keyframe, %"G_GINT64_FORMAT" > GST_SECOND/2", diff);
|
GST_DEBUG_OBJECT (ffmpegdec, "QOS: keyframe, %"G_GINT64_FORMAT" > GST_SECOND/2", diff);
|
||||||
/* we can skip the current frame */
|
/* we can skip the current frame */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -963,7 +962,7 @@ hurry_up:
|
||||||
if (ffmpegdec->context->hurry_up != 1) {
|
if (ffmpegdec->context->hurry_up != 1) {
|
||||||
ffmpegdec->context->hurry_up = 1;
|
ffmpegdec->context->hurry_up = 1;
|
||||||
*mode_switch = TRUE;
|
*mode_switch = TRUE;
|
||||||
GST_CAT_DEBUG_OBJECT (GST_CAT_QOS, ffmpegdec, "hurry up, diff %"G_GINT64_FORMAT" >= 0", diff);
|
GST_DEBUG_OBJECT (ffmpegdec, "QOS: hurry up, diff %"G_GINT64_FORMAT" >= 0", diff);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue