mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fixing stuff as wingo pointed out.

Browse source 
Original commit message from CVS:
Fixing stuff as wingo pointed out.
This commit is contained in:
Zeeshan Ali 2005-10-26 15:45:11 +00:00
parent d6f4ad6163
commit 72818f871d
5 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-10-26 Zeeshan Ali <zeenix@gmail.com>
* ext/gsm/gstgsm.c:
* ext/gsm/gstgsmdec.c: (gst_gsmdec_init), (gst_gsmdec_chain):
* ext/gsm/gstgsmdec.h:
* ext/gsm/gstgsmenc.c: (gst_gsmenc_class_init), (gst_gsmenc_init),
(gst_gsmenc_chain):
Fixing stuff as wingo pointed out.
2005-10-25 Zeeshan Ali <zeenix@gmail.com> 2005-10-25 Zeeshan Ali <zeenix@gmail.com>
* ext/gsm/gstgsm.c: (plugin_init): * ext/gsm/gstgsm.c: (plugin_init):

3
ext/gsm/gstgsm.c
View file

@ -41,4 +41,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"gsm", "gsm",
"GSM encoder/decoder", "GSM encoder/decoder",
plugin_init, VERSION, "LGPL", "Farsight", "http://farsight.sf.net") plugin_init,
VERSION, "LGPL", "Gstreamer", "http://gstreamer.freedesktop.org")

13
ext/gsm/gstgsmdec.c
View file

@ -1,6 +1,6 @@
/* /*
* Farsight * Farsight
* GStreamer GSM decoder * GStreamer GSM encoder
* Copyright (C) 2005 Philippe Khalaf <burger@speedy.org> * Copyright (C) 2005 Philippe Khalaf <burger@speedy.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -157,13 +157,9 @@ gst_gsmdec_chain (GstPad * pad, GstBuffer * buf)
{ {
GstGSMDec *gsmdec; GstGSMDec *gsmdec;
gsm_byte *data; gsm_byte *data;
GstFlowReturn ret = GST_FLOW_OK;
g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR);
gsmdec = GST_GSMDEC (gst_pad_get_parent (pad)); gsmdec = GST_GSMDEC (gst_pad_get_parent (pad));
g_return_val_if_fail (GST_IS_GSMDEC (gsmdec), GST_FLOW_ERROR);
g_return_val_if_fail (GST_PAD_IS_LINKED (gsmdec->srcpad), GST_FLOW_ERROR);
// do we have enough bytes to read a header // do we have enough bytes to read a header
if (GST_BUFFER_SIZE (buf) >= 33) { if (GST_BUFFER_SIZE (buf) >= 33) {
@ -196,10 +192,11 @@ gst_gsmdec_chain (GstPad * pad, GstBuffer * buf)
GST_BUFFER_SIZE (outbuf), GST_BUFFER_SIZE (outbuf),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf))); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)));
//gst_util_dump_mem (GST_BUFFER_DATA(outbuf), GST_BUFFER_SIZE (outbuf)); //gst_util_dump_mem (GST_BUFFER_DATA(outbuf), GST_BUFFER_SIZE (outbuf));
gst_pad_push (gsmdec->srcpad, outbuf); ret = gst_pad_push (gsmdec->srcpad, outbuf);
} }
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_object_unref (gsmdec);
return GST_FLOW_OK; return ret;
} }

6
ext/gsm/gstgsmdec.h
View file

@ -1,7 +1,5 @@
/* /* GStreamer
* Farsight * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* GStreamer GSM decoder (uses WAV49 compiled libgsm)
* Copyright (C) 2005 Philippe Khalaf <burger@speedy.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

14
ext/gsm/gstgsmenc.c
View file

@ -158,18 +158,12 @@ gst_gsmenc_chain (GstPad * pad, GstBuffer * buf)
{ {
GstGSMEnc *gsmenc; GstGSMEnc *gsmenc;
gsm_signal *data; gsm_signal *data;
GstFlowReturn ret = GST_FLOW_OK;
g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR);
gsmenc = GST_GSMENC (gst_pad_get_parent (pad)); gsmenc = GST_GSMENC (gst_pad_get_parent (pad));
g_return_val_if_fail (GST_IS_GSMENC (gsmenc), GST_FLOW_ERROR);
g_return_val_if_fail (GST_PAD_IS_LINKED (gsmenc->srcpad), GST_FLOW_ERROR);
gst_adapter_push (gsmenc->adapter, buf); gst_adapter_push (gsmenc->adapter, buf);
while (gst_adapter_available (gsmenc->adapter) >= 320) { while (gst_adapter_available (gsmenc->adapter) >= 320) {
GstBuffer *outbuf; GstBuffer *outbuf;
outbuf = gst_buffer_new_and_alloc (33 * sizeof (gsm_byte)); outbuf = gst_buffer_new_and_alloc (33 * sizeof (gsm_byte));
@ -185,8 +179,10 @@ gst_gsmenc_chain (GstPad * pad, GstBuffer * buf)
gst_buffer_set_caps (outbuf, gst_pad_get_caps (gsmenc->srcpad)); gst_buffer_set_caps (outbuf, gst_pad_get_caps (gsmenc->srcpad));
GST_DEBUG ("Pushing buffer of size %d", GST_BUFFER_SIZE (outbuf)); GST_DEBUG ("Pushing buffer of size %d", GST_BUFFER_SIZE (outbuf));
//gst_util_dump_mem (GST_BUFFER_DATA(outbuf), GST_BUFFER_SIZE (outbuf)); //gst_util_dump_mem (GST_BUFFER_DATA(outbuf), GST_BUFFER_SIZE (outbuf));
gst_pad_push (gsmenc->srcpad, outbuf); ret = gst_pad_push (gsmenc->srcpad, outbuf);
} }
return GST_FLOW_OK; gst_object_unref (gsmenc);
return ret;
} }