From 54ec8cf70e476e6de03ff99dc8edd0414feee7af Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Tue, 22 Nov 2005 23:46:31 +0000 Subject: [PATCH] ext/libvisual/visual.c: Fix the fps calculations. Original commit message from CVS: * ext/libvisual/visual.c: (gst_visual_chain): Fix the fps calculations. * gst/ffmpegcolorspace/avcodec.h: Move structure element for clarity * gst-libs/gst/interfaces/tunernorm.c: (gst_tuner_norm_init): * gst-libs/gst/interfaces/tunernorm.h: * sys/v4l/gstv4ljpegsrc.c: (gst_v4ljpegsrc_src_link): * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_base_init): * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_base_init), (gst_v4lmjpegsrc_get_fps), (gst_v4lmjpegsrc_src_convert), (gst_v4lmjpegsrc_src_query), (gst_v4lmjpegsrc_get), (gst_v4lmjpegsrc_getcaps): * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_fixate), (gst_v4lsrc_get_caps), (gst_v4lsrc_set_caps): * sys/v4l/gstv4lsrc.h: * sys/v4l/v4l_calls.c: (gst_v4l_open): * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_get_fps), (gst_v4lsrc_get_fps_list), (gst_v4lsrc_buffer_new): * sys/v4l/v4lsrc_calls.h: Fractional framerates... --- ChangeLog | 25 +++++++++++++++++++++++++ gst-libs/gst/interfaces/tunernorm.c | 2 +- gst-libs/gst/interfaces/tunernorm.h | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2463dcb0f..c114599c9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2005-11-23 Jan Schmidt + + * ext/libvisual/visual.c: (gst_visual_chain): + Fix the fps calculations. + + * gst/ffmpegcolorspace/avcodec.h: + Move structure element for clarity + + * gst-libs/gst/interfaces/tunernorm.c: (gst_tuner_norm_init): + * gst-libs/gst/interfaces/tunernorm.h: + * sys/v4l/gstv4ljpegsrc.c: (gst_v4ljpegsrc_src_link): + * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_base_init): + * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_base_init), + (gst_v4lmjpegsrc_get_fps), (gst_v4lmjpegsrc_src_convert), + (gst_v4lmjpegsrc_src_query), (gst_v4lmjpegsrc_get), + (gst_v4lmjpegsrc_getcaps): + * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_fixate), (gst_v4lsrc_get_caps), + (gst_v4lsrc_set_caps): + * sys/v4l/gstv4lsrc.h: + * sys/v4l/v4l_calls.c: (gst_v4l_open): + * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_get_fps), + (gst_v4lsrc_get_fps_list), (gst_v4lsrc_buffer_new): + * sys/v4l/v4lsrc_calls.h: + Fractional framerates... + 2005-11-22 Wim Taymans * gst-libs/gst/audio/gstbaseaudiosink.c: diff --git a/gst-libs/gst/interfaces/tunernorm.c b/gst-libs/gst/interfaces/tunernorm.c index 2eb973de8d..fd3535cba8 100644 --- a/gst-libs/gst/interfaces/tunernorm.c +++ b/gst-libs/gst/interfaces/tunernorm.c @@ -80,7 +80,7 @@ static void gst_tuner_norm_init (GstTunerNorm * norm) { norm->label = NULL; - norm->fps = 0.; + g_value_init (&norm->framerate, GST_TYPE_FRACTION); } static void diff --git a/gst-libs/gst/interfaces/tunernorm.h b/gst-libs/gst/interfaces/tunernorm.h index cd89e1ee88..598b38ec8c 100644 --- a/gst-libs/gst/interfaces/tunernorm.h +++ b/gst-libs/gst/interfaces/tunernorm.h @@ -41,7 +41,7 @@ typedef struct _GstTunerNorm { GObject parent; gchar *label; - gfloat fps; + GValue framerate; } GstTunerNorm; typedef struct _GstTunerNormClass {