From: <bu...@ke...> - 2006-05-19 17:58:10
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: burger Date: Fri May 19 2006 17:58:08 UTC Log message: * gst-libs/gst/rtp/gstbasertpaudiopayload.c: 80 line columns Removed redundant floor() Modified files: . : ChangeLog gst-libs/gst/rtp: gstbasertpaudiopayload.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2655&r2=1.2656 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstbasertpaudiopayload.c.diff?r1=1.3&r2=1.4 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.2655 retrieving revision 1.2656 diff -u -d -r1.2655 -r1.2656 --- ChangeLog 19 May 2006 15:00:43 -0000 1.2655 +++ ChangeLog 19 May 2006 17:57:56 -0000 1.2656 @@ -1,3 +1,9 @@ +2006-05-19 Philippe Kalaf <phi...@co...> + + * gst-libs/gst/rtp/gstbasertpaudiopayload.c: + 80 line columns + Removed redundant floor() + 2006-05-19 Tim-Philipp Müller <tim at centricular dot net> * gst-libs/gst/riff/riff-read.c: (gst_riff_read_chunk): Index: gstbasertpaudiopayload.c RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstbasertpaudiopayload.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gstbasertpaudiopayload.c 18 May 2006 23:00:02 -0000 1.3 +++ gstbasertpaudiopayload.c 19 May 2006 17:57:56 -0000 1.4 @@ -24,7 +24,6 @@ #include <stdlib.h> #include <string.h> #include <gst/rtp/gstrtpbuffer.h> -#include <math.h> #include "gstbasertpaudiopayload.h" @@ -118,10 +117,8 @@ { g_return_if_fail (basertpaudiopayload != NULL); - if (basertpaudiopayload->type != AUDIO_CODEC_TYPE_NONE) { - GST_ERROR_OBJECT (basertpaudiopayload, - "Codec type already set! You should only set this once!"); - } + g_return_if_fail (basertpaudiopayload->type == AUDIO_CODEC_TYPE_NONE); basertpaudiopayload->type = AUDIO_CODEC_TYPE_FRAME_BASED; } @@ -139,10 +136,8 @@ basertpaudiopayload->type = AUDIO_CODEC_TYPE_SAMPLE_BASED; @@ -252,9 +247,8 @@ maxptime_octets = frame_size * (int) (ptime_ms / frame_duration); if (maxptime_octets == 0) { - GST_WARNING_OBJECT (basertpaudiopayload, - "Given ptime %d is smaller than minimum %d ms, overwriting to minimum", - ptime_ms, frame_duration); + GST_WARNING_OBJECT (basertpaudiopayload, "Given ptime %d is smaller than" + " minimum %d ms, overwriting to minimum", ptime_ms, frame_duration); maxptime_octets = frame_size; } } @@ -277,7 +271,7 @@ /* ptime max */ maxptime_octets), /* currently available */ - floor (available / frame_size) * frame_size); + (available / frame_size) * frame_size); ret = gst_basertpaudiopayload_push (basepayload, data, payload_len, basertpaudiopayload->base_ts); @@ -293,8 +287,8 @@ /* none should be available by now */ if (available != 0) { - "The buffer size is not a multiple of the frame_size"); + GST_ERROR_OBJECT (basertpaudiopayload, "The buffer size is not a multiple" + " of the frame_size"); return GST_FLOW_ERROR; |