From f56adf75ca01d45ef310a7a069d3e26996768d81 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 18 Jul 2007 07:35:32 +0000 Subject: Add stdlib include (free, atoi, exit). Original commit message from CVS: * examples/app/appsrc_ex.c: * examples/switch/switcher.c: * ext/neon/gstneonhttpsrc.c: * ext/timidity/gstwildmidi.c: * ext/x264/gstx264enc.c: * gst/mve/mveaudioenc.c: (mve_compress_audio): * gst/rtpmanager/gstrtpclient.c: * gst/rtpmanager/gstrtpjitterbuffer.c: * gst/spectrum/demo-audiotest.c: * gst/spectrum/demo-osssrc.c: * sys/dvb/gstdvbsrc.c: Add stdlib include (free, atoi, exit). --- ChangeLog | 15 +++++ common | 2 +- examples/app/appsrc_ex.c | 1 + examples/switch/switcher.c | 2 + ext/neon/gstneonhttpsrc.c | 1 + ext/timidity/gstwildmidi.c | 1 + ext/x264/gstx264enc.c | 2 + gst/mve/mveaudioenc.c | 121 +++++++++++++++++++++++------------- gst/rtpmanager/gstrtpclient.c | 2 + gst/rtpmanager/gstrtpjitterbuffer.c | 1 + gst/spectrum/demo-audiotest.c | 1 + gst/spectrum/demo-osssrc.c | 2 + sys/dvb/gstdvbsrc.c | 1 + 13 files changed, 107 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3680536..87a6c1ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2007-07-18 Stefan Kost + + * examples/app/appsrc_ex.c: + * examples/switch/switcher.c: + * ext/neon/gstneonhttpsrc.c: + * ext/timidity/gstwildmidi.c: + * ext/x264/gstx264enc.c: + * gst/mve/mveaudioenc.c: (mve_compress_audio): + * gst/rtpmanager/gstrtpclient.c: + * gst/rtpmanager/gstrtpjitterbuffer.c: + * gst/spectrum/demo-audiotest.c: + * gst/spectrum/demo-osssrc.c: + * sys/dvb/gstdvbsrc.c: + Add stdlib include (free, atoi, exit). + 2007-07-16 Sebastian Dröge * ext/faad/gstfaad.c: (clip_outgoing_buffer): diff --git a/common b/common index fb4b30eb..b3fe2a25 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit fb4b30ebbec59a8944cacae5fb5cf40bff5dfcaa +Subproject commit b3fe2a25c1cd0f4b021795d0db7330aeb338da7c diff --git a/examples/app/appsrc_ex.c b/examples/app/appsrc_ex.c index 170001d2..5773aabe 100644 --- a/examples/app/appsrc_ex.c +++ b/examples/app/appsrc_ex.c @@ -11,6 +11,7 @@ #include #include +#include typedef struct _App App; diff --git a/examples/switch/switcher.c b/examples/switch/switcher.c index 2faa26c7..42c6d585 100644 --- a/examples/switch/switcher.c +++ b/examples/switch/switcher.c @@ -21,6 +21,8 @@ #include "config.h" #endif #include +#include + #include diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c index abcbd0f2..c29cd1c2 100644 --- a/ext/neon/gstneonhttpsrc.c +++ b/ext/neon/gstneonhttpsrc.c @@ -19,6 +19,7 @@ #endif #include "gstneonhttpsrc.h" +#include #include #include diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c index 7aaca0d7..ae7cba95 100644 --- a/ext/timidity/gstwildmidi.c +++ b/ext/timidity/gstwildmidi.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include "gstwildmidi.h" diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 4b8cea66..4841755a 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -25,6 +25,8 @@ #include "gstx264enc.h" #include +#include + enum { diff --git a/gst/mve/mveaudioenc.c b/gst/mve/mveaudioenc.c index 47c0a3bd..e3cf9377 100644 --- a/gst/mve/mveaudioenc.c +++ b/gst/mve/mveaudioenc.c @@ -20,37 +20,55 @@ */ #include +#include #include -static const gint32 dec_table[256] = - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 47, 51, 56, 61, 66, 72, 79, 86, 94, 102, 112, - 122, 133, 145, 158, 173, 189, 206, 225, 245, 267, 292, 318, 348, 379, - 414, 452, 493, 538, 587, 640, 699, 763, 832, 908, 991, 1081, 1180, 1288, +static const gint32 dec_table[256] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 47, 51, 56, 61, + 66, 72, 79, 86, 94, 102, 112, + 122, 133, 145, 158, 173, 189, 206, 225, 245, + 267, 292, 318, 348, 379, + 414, 452, 493, 538, 587, 640, 699, 763, 832, 908, 991, + 1081, 1180, 1288, 1405, 1534, 1673, 1826, 1993, 2175, 2373, 2590, 2826, 3084, 3365, 3672, - 4008, 4373, 4772, 5208, 5683, 6202, 6767, 7385, 8059, 8794, 9597, 10472, - 11428, 12471, 13609, 14851, 16206, 17685, 19298, 21060, 22981, 25078, + 4008, + 4373, 4772, 5208, 5683, 6202, 6767, 7385, 8059, 8794, 9597, 10472, + 11428, 12471, 13609, 14851, 16206, + 17685, 19298, 21060, 22981, 25078, 27367, 29864, 32589, 35563, 38808, 42350, 46214, 50431, 55033, 60055, - 65535, 1, -65535, -60055, -55033, -50431, -46214, -42350, -38808, -35563, - -32589, -29864, -27367, -25078, -22981, -21060, -19298, -17685, -16206, + 65535, + 1, -65535, -60055, -55033, -50431, -46214, -42350, -38808, -35563, + -32589, -29864, -27367, -25078, -22981, -21060, -19298, + -17685, -16206, -14851, -13609, -12471, -11428, -10472, -9597, -8794, -8059, -7385, -6767, - -6202, -5683, -5208, -4772, -4373, -4008, -3672, -3365, -3084, -2826, + -6202, -5683, -5208, -4772, + -4373, -4008, -3672, -3365, -3084, -2826, -2590, -2373, -2175, -1993, -1826, -1673, -1534, -1405, -1288, -1180, - -1081, -991, -908, -832, -763, -699, -640, -587, -538, -493, -452, -414, - -379, -348, -318, -292, -267, -245, -225, -206, -189, -173, -158, -145, - -133, -122, -112, -102, -94, -86, -79, -72, -66, -61, -56, -51, -47, -43, - -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -32, -31, -30, -29, - -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, - -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1 + + -1081, -991, -908, -832, -763, -699, -640, -587, -538, -493, -452, -414, + -379, -348, -318, -292, + -267, -245, -225, -206, -189, -173, -158, -145, + -133, -122, -112, -102, -94, -86, -79, -72, + -66, -61, -56, -51, -47, -43, + -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, + -32, -31, -30, -29, + -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, + -16, -15, + -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1 }; - -/* This value could be non-optimal. Without knowledge of the value - distribution in the real signal, the actual optimum cannot be evaluated. - Should be somewhere between 11.458 and 11.542. */ + + +/* This value could be non-optimal. Without knowledge of the value + distribution in the real signal, the actual optimum cannot be evaluated. + Should be somewhere between 11.458 and 11.542. */ static const gdouble DPCM_SCALE = 11.5131; - static gint8 + +static gint8 mve_enc_delta (guint n) { if (n < 44) @@ -81,40 +99,55 @@ mve_compress_audio (guint8 * dest, const guint8 * src, guint16 len, src += 2; delta = s - prev[cur_chan]; - if (delta >= 0) - v = mve_enc_delta (delta); - + + if (delta >= 0) + + v = mve_enc_delta (delta); + else - v = 256 - mve_enc_delta (-delta); - real_res = dec_table[v] + prev[cur_chan]; - if (real_res < -32768 || real_res > 32767) { - - /* correct overflow */ - /* GST_DEBUG ("co:%d + %d = %d -> new v:%d, dec_table:%d will be %d", - prev[cur_chan], dec_table[v], real_res, - v, dec_table[v], prev[cur_chan]+dec_table[v]); */ - if (s > 0) { - if (real_res > 32767) + + v = 256 - mve_enc_delta (-delta); + + + real_res = dec_table[v] + prev[cur_chan]; + + if (real_res < -32768 || real_res > 32767) { + + /* correct overflow */ + /* GST_DEBUG ("co:%d + %d = %d -> new v:%d, dec_table:%d will be %d", + prev[cur_chan], dec_table[v], real_res, + v, dec_table[v], prev[cur_chan]+dec_table[v]); */ + if (s > 0) { + + if (real_res > 32767) --v; - } else { - if (real_res < -32768) + + } else { + + if (real_res < -32768) ++v; - } + + } real_res = dec_table[v] + prev[cur_chan]; - } + + } if (G_UNLIKELY (abs (real_res - s) > 32767)) { GST_ERROR ("sign loss left unfixed in audio stream, deviation:%d", real_res - s); return -1; } - *dest++ = v; - --len; - /* use previous output instead of input. That way output will not go too far from input. */ - prev[cur_chan] += dec_table[v]; + + + *dest++ = v; + + --len; + /* use previous output instead of input. That way output will not go too far from input. */ + prev[cur_chan] += dec_table[v]; cur_chan = channels - 1 - cur_chan; - } + + } return 0; } diff --git a/gst/rtpmanager/gstrtpclient.c b/gst/rtpmanager/gstrtpclient.c index ba18f953..c4b6ab24 100644 --- a/gst/rtpmanager/gstrtpclient.c +++ b/gst/rtpmanager/gstrtpclient.c @@ -44,6 +44,8 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + +#include #include #include "gstrtpclient.h" diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index d33d17ae..79d06788 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -65,6 +65,7 @@ #include "config.h" #endif +#include #include #include diff --git a/gst/spectrum/demo-audiotest.c b/gst/spectrum/demo-audiotest.c index ed47278f..edb1d1dc 100644 --- a/gst/spectrum/demo-audiotest.c +++ b/gst/spectrum/demo-audiotest.c @@ -21,6 +21,7 @@ #include "config.h" #endif +#include #include #include #include diff --git a/gst/spectrum/demo-osssrc.c b/gst/spectrum/demo-osssrc.c index 6419293a..b71843e6 100644 --- a/gst/spectrum/demo-osssrc.c +++ b/gst/spectrum/demo-osssrc.c @@ -20,6 +20,8 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + +#include #include #include #include diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c index d5fb8b69..f72ed704 100644 --- a/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include "_stdint.h" -- cgit v1.2.1