mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

schroedinger: Fix compilation and set-but-not-used compiler warnings

Browse source
This commit is contained in:
Sebastian Dröge 2011-07-13 10:42:36 +02:00
parent 1f50564962
commit 62224e66f9
2 changed files with 7 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ext/schroedinger/gstschrodec.c
View file

@ -78,10 +78,6 @@ enum
}; };
static void gst_schro_dec_finalize (GObject * object); static void gst_schro_dec_finalize (GObject * object);
static void gst_schro_dec_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_schro_dec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static gboolean gst_schro_dec_sink_query (GstPad * pad, GstQuery * query); static gboolean gst_schro_dec_sink_query (GstPad * pad, GstQuery * query);
@ -137,8 +133,6 @@ gst_schro_dec_class_init (GstSchroDecClass * klass)
gobject_class = G_OBJECT_CLASS (klass); gobject_class = G_OBJECT_CLASS (klass);
base_video_decoder_class = GST_BASE_VIDEO_DECODER_CLASS (klass); base_video_decoder_class = GST_BASE_VIDEO_DECODER_CLASS (klass);
gobject_class->set_property = gst_schro_dec_set_property;
gobject_class->get_property = gst_schro_dec_get_property;
gobject_class->finalize = gst_schro_dec_finalize; gobject_class->finalize = gst_schro_dec_finalize;
base_video_decoder_class->start = GST_DEBUG_FUNCPTR (gst_schro_dec_start); base_video_decoder_class->start = GST_DEBUG_FUNCPTR (gst_schro_dec_start);
@ -172,21 +166,16 @@ static gint64
granulepos_to_frame (gint64 granulepos) granulepos_to_frame (gint64 granulepos)
{ {
guint64 pt; guint64 pt;
int dist_h;
int dist_l;
int dist;
int delay;
guint64 dt;
if (granulepos == -1) if (granulepos == -1)
return -1; return -1;
pt = ((granulepos >> 22) + (granulepos & OGG_DIRAC_GRANULE_LOW_MASK)) >> 9; pt = ((granulepos >> 22) + (granulepos & OGG_DIRAC_GRANULE_LOW_MASK)) >> 9;
dist_h = (granulepos >> 22) & 0xff; /* dist_h = (granulepos >> 22) & 0xff;
dist_l = granulepos & 0xff; * dist_l = granulepos & 0xff;
dist = (dist_h << 8) | dist_l; * dist = (dist_h << 8) | dist_l;
delay = (granulepos >> 9) & 0x1fff; * delay = (granulepos >> 9) & 0x1fff;
dt = pt - delay; * dt = pt - delay; */
return pt >> 1; return pt >> 1;
} }
@ -308,38 +297,6 @@ gst_schro_dec_finalize (GObject * object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static void
gst_schro_dec_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstSchroDec *src;
g_return_if_fail (GST_IS_SCHRO_DEC (object));
src = GST_SCHRO_DEC (object);
GST_DEBUG ("gst_schro_dec_set_property");
switch (prop_id) {
default:
break;
}
}
static void
gst_schro_dec_get_property (GObject * object, guint prop_id, GValue * value,
GParamSpec * pspec)
{
GstSchroDec *src;
g_return_if_fail (GST_IS_SCHRO_DEC (object));
src = GST_SCHRO_DEC (object);
switch (prop_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void static void
parse_sequence_header (GstSchroDec * schro_dec, guint8 * data, int size) parse_sequence_header (GstSchroDec * schro_dec, guint8 * data, int size)
{ {
@ -642,7 +599,6 @@ gst_schro_dec_handle_frame (GstBaseVideoDecoder * base_video_decoder,
GstVideoFrame * frame) GstVideoFrame * frame)
{ {
GstSchroDec *schro_dec; GstSchroDec *schro_dec;
int schro_ret;
SchroBuffer *input_buffer; SchroBuffer *input_buffer;
schro_dec = GST_SCHRO_DEC (base_video_decoder); schro_dec = GST_SCHRO_DEC (base_video_decoder);
@ -654,7 +610,7 @@ gst_schro_dec_handle_frame (GstBaseVideoDecoder * base_video_decoder,
input_buffer->tag = schro_tag_new (frame, NULL); input_buffer->tag = schro_tag_new (frame, NULL);
schro_ret = schro_decoder_autoparse_push (schro_dec->decoder, input_buffer); schro_decoder_autoparse_push (schro_dec->decoder, input_buffer);
return gst_schro_dec_process (schro_dec, FALSE); return gst_schro_dec_process (schro_dec, FALSE);
} }

4
ext/schroedinger/gstschroenc.c
View file

@ -24,6 +24,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/video/gstbasevideoencoder.h> #include <gst/video/gstbasevideoencoder.h>
#include <gst/video/gstbasevideoutils.h>
#include <string.h> #include <string.h>
#include <schroedinger/schro.h> #include <schroedinger/schro.h>
@ -612,7 +613,6 @@ gst_schro_enc_shape_output_ogg (GstBaseVideoEncoder * base_video_encoder,
GstVideoFrame * frame) GstVideoFrame * frame)
{ {
GstSchroEnc *schro_enc; GstSchroEnc *schro_enc;
int dpn;
int delay; int delay;
int dist; int dist;
int pt; int pt;
@ -623,8 +623,6 @@ gst_schro_enc_shape_output_ogg (GstBaseVideoEncoder * base_video_encoder,
schro_enc = GST_SCHRO_ENC (base_video_encoder); schro_enc = GST_SCHRO_ENC (base_video_encoder);
dpn = frame->decode_frame_number;
pt = frame->presentation_frame_number * 2 + schro_enc->granule_offset; pt = frame->presentation_frame_number * 2 + schro_enc->granule_offset;
dt = frame->decode_frame_number * 2 + schro_enc->granule_offset; dt = frame->decode_frame_number * 2 + schro_enc->granule_offset;
delay = pt - dt; delay = pt - dt;