mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 01:30:38 +00:00
fixed rest of warning for gcc 3 in /sys
Original commit message from CVS: fixed rest of warning for gcc 3 in /sys
This commit is contained in:
parent
492d658c44
commit
6d7191f9f0
4 changed files with 12 additions and 5 deletions
|
@ -570,6 +570,7 @@ gst_v4lelement_change_state (GstElement *element)
|
||||||
case V4L_AUDIO_MUTE: temp = v4lelement->mute; break;
|
case V4L_AUDIO_MUTE: temp = v4lelement->mute; break;
|
||||||
case V4L_AUDIO_VOLUME: temp = v4lelement->volume; break;
|
case V4L_AUDIO_VOLUME: temp = v4lelement->volume; break;
|
||||||
case V4L_AUDIO_MODE: temp = v4lelement->mode; break;
|
case V4L_AUDIO_MODE: temp = v4lelement->mode; break;
|
||||||
|
default: temp = 0; g_assert_not_reached ();
|
||||||
}
|
}
|
||||||
if (temp >= 0 && gst_v4l_has_audio(v4lelement))
|
if (temp >= 0 && gst_v4l_has_audio(v4lelement))
|
||||||
{
|
{
|
||||||
|
@ -585,6 +586,7 @@ gst_v4lelement_change_state (GstElement *element)
|
||||||
case V4L_PICTURE_BRIGHTNESS: temp = v4lelement->brightness; break;
|
case V4L_PICTURE_BRIGHTNESS: temp = v4lelement->brightness; break;
|
||||||
case V4L_PICTURE_SATURATION: temp = v4lelement->saturation; break;
|
case V4L_PICTURE_SATURATION: temp = v4lelement->saturation; break;
|
||||||
case V4L_PICTURE_CONTRAST: temp = v4lelement->contrast; break;
|
case V4L_PICTURE_CONTRAST: temp = v4lelement->contrast; break;
|
||||||
|
default: temp = 0; g_assert_not_reached ();
|
||||||
}
|
}
|
||||||
if (temp >= 0)
|
if (temp >= 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -66,7 +66,6 @@ static void gst_v4lmjpegsink_get_property (GObject
|
||||||
guint prop_id,
|
guint prop_id,
|
||||||
GValue *value,
|
GValue *value,
|
||||||
GParamSpec *pspec);
|
GParamSpec *pspec);
|
||||||
static void gst_v4lmjpegsink_close (GstV4lMjpegSink *v4lmjpegsink);
|
|
||||||
static GstElementStateReturn gst_v4lmjpegsink_change_state (GstElement *element);
|
static GstElementStateReturn gst_v4lmjpegsink_change_state (GstElement *element);
|
||||||
static void gst_v4lmjpegsink_set_clock (GstElement *element, GstClock *clock);
|
static void gst_v4lmjpegsink_set_clock (GstElement *element, GstClock *clock);
|
||||||
|
|
||||||
|
@ -237,7 +236,7 @@ gst_v4lmjpegsink_chain (GstPad *pad,
|
||||||
if (v4lmjpegsink->clock) {
|
if (v4lmjpegsink->clock) {
|
||||||
GST_DEBUG (0,"videosink: clock wait: %llu", GST_BUFFER_TIMESTAMP(buf));
|
GST_DEBUG (0,"videosink: clock wait: %llu", GST_BUFFER_TIMESTAMP(buf));
|
||||||
|
|
||||||
jitter = gst_clock_current_diff(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf));
|
jitter = 0; /* FIXME: jitter = gst_clock_current_diff(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf)); */
|
||||||
|
|
||||||
if (jitter > 500000 || jitter < -500000)
|
if (jitter > 500000 || jitter < -500000)
|
||||||
GST_DEBUG (0, "jitter: %lld", jitter);
|
GST_DEBUG (0, "jitter: %lld", jitter);
|
||||||
|
@ -367,8 +366,11 @@ gst_v4lmjpegsink_change_state (GstElement *element)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GST_ELEMENT_CLASS (parent_class)->change_state)
|
if (GST_ELEMENT_CLASS (parent_class)->change_state) {
|
||||||
parent_value = GST_ELEMENT_CLASS (parent_class)->change_state (element);
|
parent_value = GST_ELEMENT_CLASS (parent_class)->change_state (element);
|
||||||
|
} else {
|
||||||
|
parent_value = GST_STATE_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
if (GST_STATE_TRANSITION(element) == GST_STATE_NULL_TO_READY)
|
if (GST_STATE_TRANSITION(element) == GST_STATE_NULL_TO_READY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -414,8 +414,11 @@ gst_v4lmjpegsrc_change_state (GstElement *element)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GST_ELEMENT_CLASS (parent_class)->change_state)
|
if (GST_ELEMENT_CLASS (parent_class)->change_state) {
|
||||||
parent_value = GST_ELEMENT_CLASS (parent_class)->change_state (element);
|
parent_value = GST_ELEMENT_CLASS (parent_class)->change_state (element);
|
||||||
|
} else {
|
||||||
|
parent_value = GST_STATE_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
if (GST_STATE_TRANSITION(element) == GST_STATE_NULL_TO_READY)
|
if (GST_STATE_TRANSITION(element) == GST_STATE_NULL_TO_READY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -484,7 +484,7 @@ gst_v4lsrc_requeue_frame (GstV4lSrc *v4lsrc, gint num)
|
||||||
gboolean
|
gboolean
|
||||||
gst_v4lsrc_capture_stop (GstV4lSrc *v4lsrc)
|
gst_v4lsrc_capture_stop (GstV4lSrc *v4lsrc)
|
||||||
{
|
{
|
||||||
int n, num;
|
int n;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
fprintf(stderr, "V4LSRC: gst_v4lsrc_capture_stop()\n");
|
fprintf(stderr, "V4LSRC: gst_v4lsrc_capture_stop()\n");
|
||||||
|
|
Loading…
Reference in a new issue