From ab13a103100c2d204d7cfc8a703d9646df4804a4 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 3 May 2004 14:31:47 +0000 Subject: ext/divx/gstdivxenc.c: fix range since -1 is the default Original commit message from CVS: * ext/divx/gstdivxenc.c: (gst_divxenc_get_type), (gst_divxenc_class_init): fix range since -1 is the default * gst/mpeg1sys/gstmpeg1systemencode.c: (gst_mpeg1_system_encode_get_type), (gst_system_encode_multiplex): * gst/rtjpeg/gstrtjpegdec.c: (gst_rtjpegdec_get_type), (gst_rtjpegdec_chain): * gst/rtjpeg/gstrtjpegenc.c: (gst_rtjpegenc_get_type), (gst_rtjpegenc_chain): * sys/qcam/gstqcamsrc.c: (gst_autoexp_mode_get_type), (gst_qcamsrc_get_type), (gst_qcamsrc_change_state): * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_get_type): * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get_type): * sys/v4l/gstv4lsrc.c: * sys/v4l/v4l_calls.c: (gst_v4l_open): * sys/v4l/v4lmjpegsink_calls.c: (gst_v4lmjpegsink_playback_init): * sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_capture_init): * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_capture_init): * sys/vcd/vcdsrc.c: (vcdsrc_get_type), (vcdsrc_get): remove gst_info calls --- ChangeLog | 23 +++++++++++++++++++++++ common | 2 +- ext/divx/gstdivxenc.c | 2 +- gst/mpeg1sys/gstmpeg1systemencode.c | 4 ++-- gst/rtjpeg/gstrtjpegdec.c | 2 +- gst/rtjpeg/gstrtjpegenc.c | 2 +- sys/qcam/gstqcamsrc.c | 4 ++-- sys/vcd/vcdsrc.c | 2 +- 8 files changed, 32 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd980702..741e21bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2004-05-03 Thomas Vander Stichele + + * ext/divx/gstdivxenc.c: (gst_divxenc_get_type), + (gst_divxenc_class_init): + fix range since -1 is the default + * gst/mpeg1sys/gstmpeg1systemencode.c: + (gst_mpeg1_system_encode_get_type), (gst_system_encode_multiplex): + * gst/rtjpeg/gstrtjpegdec.c: (gst_rtjpegdec_get_type), + (gst_rtjpegdec_chain): + * gst/rtjpeg/gstrtjpegenc.c: (gst_rtjpegenc_get_type), + (gst_rtjpegenc_chain): + * sys/qcam/gstqcamsrc.c: (gst_autoexp_mode_get_type), + (gst_qcamsrc_get_type), (gst_qcamsrc_change_state): + * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_get_type): + * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get_type): + * sys/v4l/gstv4lsrc.c: + * sys/v4l/v4l_calls.c: (gst_v4l_open): + * sys/v4l/v4lmjpegsink_calls.c: (gst_v4lmjpegsink_playback_init): + * sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_capture_init): + * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_capture_init): + * sys/vcd/vcdsrc.c: (vcdsrc_get_type), (vcdsrc_get): + remove gst_info calls + 2004-05-03 Thomas Vander Stichele * Makefile.am: diff --git a/common b/common index 9e639817..95ba8839 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 9e639817a831102ab82a3f95207cdc24852d6025 +Subproject commit 95ba8839c03a7f8939a2ae4b0586b012e929fc84 diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c index 3def13d1..4c7751d7 100644 --- a/ext/divx/gstdivxenc.c +++ b/ext/divx/gstdivxenc.c @@ -177,7 +177,7 @@ gst_divxenc_class_init (GstDivxEncClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MAXKEYINTERVAL, g_param_spec_int ("max_key_interval", "Max. Key Interval", "Maximum number of frames between two keyframes", - 0, G_MAXINT, 0, G_PARAM_READWRITE)); + -1, G_MAXINT, -1, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFSIZE, g_param_spec_ulong ("buffer_size", "Buffer Size", diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c index c8698430..d925676d 100644 --- a/gst/mpeg1sys/gstmpeg1systemencode.c +++ b/gst/mpeg1sys/gstmpeg1systemencode.c @@ -503,9 +503,9 @@ gst_system_encode_multiplex (GstMPEG1SystemEncode * system_encode) GST_DEBUG ("system_encode::multiplex: writing %02x", mb->stream_id); } - gst_info ("system_encode::multiplex: data left in video buffer %lu\n", + GST_INFO ("system_encode::multiplex: data left in video buffer %lu\n", MPEG1MUX_BUFFER_SPACE (system_encode->video_buffer)); - gst_info ("system_encode::multiplex: data left in audio buffer %lu\n", + GST_INFO ("system_encode::multiplex: data left in audio buffer %lu\n", MPEG1MUX_BUFFER_SPACE (system_encode->audio_buffer)); g_mutex_unlock (system_encode->lock); diff --git a/gst/rtjpeg/gstrtjpegdec.c b/gst/rtjpeg/gstrtjpegdec.c index e96d4a09..bc140515 100644 --- a/gst/rtjpeg/gstrtjpegdec.c +++ b/gst/rtjpeg/gstrtjpegdec.c @@ -126,7 +126,7 @@ gst_rtjpegdec_chain (GstPad * pad, GstData * _data) data = GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); - gst_info ("would be encoding frame here\n"); + g_warning ("would be encoding frame here\n"); gst_pad_push (rtjpegdec->srcpad, GST_DATA (buf)); } diff --git a/gst/rtjpeg/gstrtjpegenc.c b/gst/rtjpeg/gstrtjpegenc.c index dbb364ac..71b8b74c 100644 --- a/gst/rtjpeg/gstrtjpegenc.c +++ b/gst/rtjpeg/gstrtjpegenc.c @@ -124,7 +124,7 @@ gst_rtjpegenc_chain (GstPad * pad, GstData * _data) data = GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); - gst_info ("would be encoding frame here\n"); + g_warning ("would be encoding frame here\n"); gst_pad_push (rtjpegenc->srcpad, GST_DATA (buf)); } diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c index ea6a2c1a..689647bd 100644 --- a/sys/qcam/gstqcamsrc.c +++ b/sys/qcam/gstqcamsrc.c @@ -395,9 +395,9 @@ gst_qcamsrc_change_state (GstElement * element) /* otherwise (READY or higher) we need to open the sound card */ } else { if (!GST_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) { - gst_info ("qcamsrc: opening\n"); + GST_DEBUG ("opening"); if (!gst_qcamsrc_open (GST_QCAMSRC (element))) { - gst_info ("qcamsrc: open failed\n"); + GST_DEBUG ("open failed"); return GST_STATE_FAILURE; } } diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c index cb6389b2..6dd3dad8 100644 --- a/sys/vcd/vcdsrc.c +++ b/sys/vcd/vcdsrc.c @@ -267,7 +267,7 @@ read_sector: msf->cdmsf_sec0 = (offset / 75) % 60; msf->cdmsf_min0 = (offset / (75 * 60)); - /*gst_info("msf is %d:%d:%d\n",msf->cdmsf_min0,msf->cdmsf_sec0, */ + /*GST_INFO("msf is %d:%d:%d\n",msf->cdmsf_min0,msf->cdmsf_sec0, */ /* msf->cdmsf_frame0); */ if (ioctl (vcdsrc->fd, CDROMREADRAW, msf)) { -- cgit v1.2.1