Make alaw / mulaw work again.

Original commit message from CVS:
Make alaw / mulaw work again.
- fixed link functions
- make alaw encode/decode use alsa code, so it works right now

diff --git a/gst/law/Makefile.am b/gst/law/Makefile.am
index 40d1b6b..a8a9d6d 100644 (file)
--- a/gst/law/Makefile.am
+++ b/gst/law/Makefile.am
@@ -2,7 +2,7 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstalaw.la libgstmulaw.la
 
-libgstalaw_la_SOURCES = alaw-encode.c mulaw-conversion.c alaw-conversion.c alaw-decode.c alaw.c
+libgstalaw_la_SOURCES = alaw-encode.c alaw-decode.c alaw.c
 libgstalaw_la_CFLAGS = $(GST_CFLAGS)
 libgstalaw_la_LIBADD =
 libgstalaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -12,4 +12,4 @@ libgstmulaw_la_CFLAGS = $(GST_CFLAGS)
 libgstmulaw_la_LIBADD =
 libgstmulaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = mulaw-conversion.h alaw-encode.h alaw-decode.h alaw-conversion.h mulaw-encode.h mulaw-decode.h
+noinst_HEADERS = mulaw-conversion.h alaw-encode.h alaw-decode.h mulaw-encode.h mulaw-decode.h

diff --git a/gst/law/alaw-conversion.c b/gst/law/alaw-conversion.c
deleted file mode 100644 (file)
index d2fa368..0000000
--- a/gst/law/alaw-conversion.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* $Id$
-
- * Linux ISDN subsystem, audio conversion and compression (linklevel).
- *
- * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de)
- * DTMF code (c) 1996 by Christian Mock (cm@kukuruz.ping.at)
- * Silence detection (c) 1998 by Armin Schindler (mac@gismo.telekom.de)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <glib.h>
-/*
- * Misc. lookup-tables.
- */
-
-/* ulaw -> signed 16-bit */
-/* defined but not used
-static gint16 isdn_audio_ulaw_to_s16[] =
-{
-       0x8284, 0x8684, 0x8a84, 0x8e84, 0x9284, 0x9684, 0x9a84, 0x9e84,
-       0xa284, 0xa684, 0xaa84, 0xae84, 0xb284, 0xb684, 0xba84, 0xbe84,
-       0xc184, 0xc384, 0xc584, 0xc784, 0xc984, 0xcb84, 0xcd84, 0xcf84,
-       0xd184, 0xd384, 0xd584, 0xd784, 0xd984, 0xdb84, 0xdd84, 0xdf84,
-       0xe104, 0xe204, 0xe304, 0xe404, 0xe504, 0xe604, 0xe704, 0xe804,
-       0xe904, 0xea04, 0xeb04, 0xec04, 0xed04, 0xee04, 0xef04, 0xf004,
-       0xf0c4, 0xf144, 0xf1c4, 0xf244, 0xf2c4, 0xf344, 0xf3c4, 0xf444,
-       0xf4c4, 0xf544, 0xf5c4, 0xf644, 0xf6c4, 0xf744, 0xf7c4, 0xf844,
-       0xf8a4, 0xf8e4, 0xf924, 0xf964, 0xf9a4, 0xf9e4, 0xfa24, 0xfa64,
-       0xfaa4, 0xfae4, 0xfb24, 0xfb64, 0xfba4, 0xfbe4, 0xfc24, 0xfc64,
-       0xfc94, 0xfcb4, 0xfcd4, 0xfcf4, 0xfd14, 0xfd34, 0xfd54, 0xfd74,
-       0xfd94, 0xfdb4, 0xfdd4, 0xfdf4, 0xfe14, 0xfe34, 0xfe54, 0xfe74,
-       0xfe8c, 0xfe9c, 0xfeac, 0xfebc, 0xfecc, 0xfedc, 0xfeec, 0xfefc,
-       0xff0c, 0xff1c, 0xff2c, 0xff3c, 0xff4c, 0xff5c, 0xff6c, 0xff7c,
-       0xff88, 0xff90, 0xff98, 0xffa0, 0xffa8, 0xffb0, 0xffb8, 0xffc0,
-       0xffc8, 0xffd0, 0xffd8, 0xffe0, 0xffe8, 0xfff0, 0xfff8, 0x0000,
-       0x7d7c, 0x797c, 0x757c, 0x717c, 0x6d7c, 0x697c, 0x657c, 0x617c,
-       0x5d7c, 0x597c, 0x557c, 0x517c, 0x4d7c, 0x497c, 0x457c, 0x417c,
-       0x3e7c, 0x3c7c, 0x3a7c, 0x387c, 0x367c, 0x347c, 0x327c, 0x307c,
-       0x2e7c, 0x2c7c, 0x2a7c, 0x287c, 0x267c, 0x247c, 0x227c, 0x207c,
-       0x1efc, 0x1dfc, 0x1cfc, 0x1bfc, 0x1afc, 0x19fc, 0x18fc, 0x17fc,
-       0x16fc, 0x15fc, 0x14fc, 0x13fc, 0x12fc, 0x11fc, 0x10fc, 0x0ffc,
-       0x0f3c, 0x0ebc, 0x0e3c, 0x0dbc, 0x0d3c, 0x0cbc, 0x0c3c, 0x0bbc,
-       0x0b3c, 0x0abc, 0x0a3c, 0x09bc, 0x093c, 0x08bc, 0x083c, 0x07bc,
-       0x075c, 0x071c, 0x06dc, 0x069c, 0x065c, 0x061c, 0x05dc, 0x059c,
-       0x055c, 0x051c, 0x04dc, 0x049c, 0x045c, 0x041c, 0x03dc, 0x039c,
-       0x036c, 0x034c, 0x032c, 0x030c, 0x02ec, 0x02cc, 0x02ac, 0x028c,
-       0x026c, 0x024c, 0x022c, 0x020c, 0x01ec, 0x01cc, 0x01ac, 0x018c,
-       0x0174, 0x0164, 0x0154, 0x0144, 0x0134, 0x0124, 0x0114, 0x0104,
-       0x00f4, 0x00e4, 0x00d4, 0x00c4, 0x00b4, 0x00a4, 0x0094, 0x0084,
-       0x0078, 0x0070, 0x0068, 0x0060, 0x0058, 0x0050, 0x0048, 0x0040,
-       0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0010, 0x0008, 0x0000
-};
-*/
-/* alaw -> signed 16-bit */
-/* defined but not used
-static gint16 isdn_audio_alaw_to_s16[] =
-{
-       0x13fc, 0xec04, 0x0144, 0xfebc, 0x517c, 0xae84, 0x051c, 0xfae4,
-       0x0a3c, 0xf5c4, 0x0048, 0xffb8, 0x287c, 0xd784, 0x028c, 0xfd74,
-       0x1bfc, 0xe404, 0x01cc, 0xfe34, 0x717c, 0x8e84, 0x071c, 0xf8e4,
-       0x0e3c, 0xf1c4, 0x00c4, 0xff3c, 0x387c, 0xc784, 0x039c, 0xfc64,
-       0x0ffc, 0xf004, 0x0104, 0xfefc, 0x417c, 0xbe84, 0x041c, 0xfbe4,
-       0x083c, 0xf7c4, 0x0008, 0xfff8, 0x207c, 0xdf84, 0x020c, 0xfdf4,
-       0x17fc, 0xe804, 0x018c, 0xfe74, 0x617c, 0x9e84, 0x061c, 0xf9e4,
-       0x0c3c, 0xf3c4, 0x0084, 0xff7c, 0x307c, 0xcf84, 0x030c, 0xfcf4,
-       0x15fc, 0xea04, 0x0164, 0xfe9c, 0x597c, 0xa684, 0x059c, 0xfa64,
-       0x0b3c, 0xf4c4, 0x0068, 0xff98, 0x2c7c, 0xd384, 0x02cc, 0xfd34,
-       0x1dfc, 0xe204, 0x01ec, 0xfe14, 0x797c, 0x8684, 0x07bc, 0xf844,
-       0x0f3c, 0xf0c4, 0x00e4, 0xff1c, 0x3c7c, 0xc384, 0x03dc, 0xfc24,
-       0x11fc, 0xee04, 0x0124, 0xfedc, 0x497c, 0xb684, 0x049c, 0xfb64,
-       0x093c, 0xf6c4, 0x0028, 0xffd8, 0x247c, 0xdb84, 0x024c, 0xfdb4,
-       0x19fc, 0xe604, 0x01ac, 0xfe54, 0x697c, 0x9684, 0x069c, 0xf964,
-       0x0d3c, 0xf2c4, 0x00a4, 0xff5c, 0x347c, 0xcb84, 0x034c, 0xfcb4,
-       0x12fc, 0xed04, 0x0134, 0xfecc, 0x4d7c, 0xb284, 0x04dc, 0xfb24,
-       0x09bc, 0xf644, 0x0038, 0xffc8, 0x267c, 0xd984, 0x026c, 0xfd94,
-       0x1afc, 0xe504, 0x01ac, 0xfe54, 0x6d7c, 0x9284, 0x06dc, 0xf924,
-       0x0dbc, 0xf244, 0x00b4, 0xff4c, 0x367c, 0xc984, 0x036c, 0xfc94,
-       0x0f3c, 0xf0c4, 0x00f4, 0xff0c, 0x3e7c, 0xc184, 0x03dc, 0xfc24,
-       0x07bc, 0xf844, 0x0008, 0xfff8, 0x1efc, 0xe104, 0x01ec, 0xfe14,
-       0x16fc, 0xe904, 0x0174, 0xfe8c, 0x5d7c, 0xa284, 0x05dc, 0xfa24,
-       0x0bbc, 0xf444, 0x0078, 0xff88, 0x2e7c, 0xd184, 0x02ec, 0xfd14,
-       0x14fc, 0xeb04, 0x0154, 0xfeac, 0x557c, 0xaa84, 0x055c, 0xfaa4,
-       0x0abc, 0xf544, 0x0058, 0xffa8, 0x2a7c, 0xd584, 0x02ac, 0xfd54,
-       0x1cfc, 0xe304, 0x01cc, 0xfe34, 0x757c, 0x8a84, 0x075c, 0xf8a4,
-       0x0ebc, 0xf144, 0x00d4, 0xff2c, 0x3a7c, 0xc584, 0x039c, 0xfc64,
-       0x10fc, 0xef04, 0x0114, 0xfeec, 0x457c, 0xba84, 0x045c, 0xfba4,
-       0x08bc, 0xf744, 0x0018, 0xffe8, 0x227c, 0xdd84, 0x022c, 0xfdd4,
-       0x18fc, 0xe704, 0x018c, 0xfe74, 0x657c, 0x9a84, 0x065c, 0xf9a4,
-       0x0cbc, 0xf344, 0x0094, 0xff6c, 0x327c, 0xcd84, 0x032c, 0xfcd4
-};
-*/
-/* alaw -> ulaw */
-static guint8 isdn_audio_alaw_to_ulaw[] =
-{
-       0xab, 0x2b, 0xe3, 0x63, 0x8b, 0x0b, 0xc9, 0x49,
-       0xba, 0x3a, 0xf6, 0x76, 0x9b, 0x1b, 0xd7, 0x57,
-       0xa3, 0x23, 0xdd, 0x5d, 0x83, 0x03, 0xc1, 0x41,
-       0xb2, 0x32, 0xeb, 0x6b, 0x93, 0x13, 0xcf, 0x4f,
-       0xaf, 0x2f, 0xe7, 0x67, 0x8f, 0x0f, 0xcd, 0x4d,
-       0xbe, 0x3e, 0xfe, 0x7e, 0x9f, 0x1f, 0xdb, 0x5b,
-       0xa7, 0x27, 0xdf, 0x5f, 0x87, 0x07, 0xc5, 0x45,
-       0xb6, 0x36, 0xef, 0x6f, 0x97, 0x17, 0xd3, 0x53,
-       0xa9, 0x29, 0xe1, 0x61, 0x89, 0x09, 0xc7, 0x47,
-       0xb8, 0x38, 0xf2, 0x72, 0x99, 0x19, 0xd5, 0x55,
-       0xa1, 0x21, 0xdc, 0x5c, 0x81, 0x01, 0xbf, 0x3f,
-       0xb0, 0x30, 0xe9, 0x69, 0x91, 0x11, 0xce, 0x4e,
-       0xad, 0x2d, 0xe5, 0x65, 0x8d, 0x0d, 0xcb, 0x4b,
-       0xbc, 0x3c, 0xfa, 0x7a, 0x9d, 0x1d, 0xd9, 0x59,
-       0xa5, 0x25, 0xde, 0x5e, 0x85, 0x05, 0xc3, 0x43,
-       0xb4, 0x34, 0xed, 0x6d, 0x95, 0x15, 0xd1, 0x51,
-       0xac, 0x2c, 0xe4, 0x64, 0x8c, 0x0c, 0xca, 0x4a,
-       0xbb, 0x3b, 0xf8, 0x78, 0x9c, 0x1c, 0xd8, 0x58,
-       0xa4, 0x24, 0xde, 0x5e, 0x84, 0x04, 0xc2, 0x42,
-       0xb3, 0x33, 0xec, 0x6c, 0x94, 0x14, 0xd0, 0x50,
-       0xb0, 0x30, 0xe8, 0x68, 0x90, 0x10, 0xce, 0x4e,
-       0xbf, 0x3f, 0xfe, 0x7e, 0xa0, 0x20, 0xdc, 0x5c,
-       0xa8, 0x28, 0xe0, 0x60, 0x88, 0x08, 0xc6, 0x46,
-       0xb7, 0x37, 0xf0, 0x70, 0x98, 0x18, 0xd4, 0x54,
-       0xaa, 0x2a, 0xe2, 0x62, 0x8a, 0x0a, 0xc8, 0x48,
-       0xb9, 0x39, 0xf4, 0x74, 0x9a, 0x1a, 0xd6, 0x56,
-       0xa2, 0x22, 0xdd, 0x5d, 0x82, 0x02, 0xc0, 0x40,
-       0xb1, 0x31, 0xea, 0x6a, 0x92, 0x12, 0xcf, 0x4f,
-       0xae, 0x2e, 0xe6, 0x66, 0x8e, 0x0e, 0xcc, 0x4c,
-       0xbd, 0x3d, 0xfc, 0x7c, 0x9e, 0x1e, 0xda, 0x5a,
-       0xa6, 0x26, 0xdf, 0x5f, 0x86, 0x06, 0xc4, 0x44,
-       0xb5, 0x35, 0xee, 0x6e, 0x96, 0x16, 0xd2, 0x52
-};
-
-/* ulaw -> alaw */
-static guint8 isdn_audio_ulaw_to_alaw[] =
-{
-       0xab, 0x55, 0xd5, 0x15, 0x95, 0x75, 0xf5, 0x35,
-       0xb5, 0x45, 0xc5, 0x05, 0x85, 0x65, 0xe5, 0x25,
-       0xa5, 0x5d, 0xdd, 0x1d, 0x9d, 0x7d, 0xfd, 0x3d,
-       0xbd, 0x4d, 0xcd, 0x0d, 0x8d, 0x6d, 0xed, 0x2d,
-       0xad, 0x51, 0xd1, 0x11, 0x91, 0x71, 0xf1, 0x31,
-       0xb1, 0x41, 0xc1, 0x01, 0x81, 0x61, 0xe1, 0x21,
-       0x59, 0xd9, 0x19, 0x99, 0x79, 0xf9, 0x39, 0xb9,
-       0x49, 0xc9, 0x09, 0x89, 0x69, 0xe9, 0x29, 0xa9,
-       0xd7, 0x17, 0x97, 0x77, 0xf7, 0x37, 0xb7, 0x47,
-       0xc7, 0x07, 0x87, 0x67, 0xe7, 0x27, 0xa7, 0xdf,
-       0x9f, 0x7f, 0xff, 0x3f, 0xbf, 0x4f, 0xcf, 0x0f,
-       0x8f, 0x6f, 0xef, 0x2f, 0x53, 0x13, 0x73, 0x33,
-       0xb3, 0x43, 0xc3, 0x03, 0x83, 0x63, 0xe3, 0x23,
-       0xa3, 0x5b, 0xdb, 0x1b, 0x9b, 0x7b, 0xfb, 0x3b,
-       0xbb, 0xbb, 0x4b, 0x4b, 0xcb, 0xcb, 0x0b, 0x0b,
-       0x8b, 0x8b, 0x6b, 0x6b, 0xeb, 0xeb, 0x2b, 0x2b,
-       0xab, 0x54, 0xd4, 0x14, 0x94, 0x74, 0xf4, 0x34,
-       0xb4, 0x44, 0xc4, 0x04, 0x84, 0x64, 0xe4, 0x24,
-       0xa4, 0x5c, 0xdc, 0x1c, 0x9c, 0x7c, 0xfc, 0x3c,
-       0xbc, 0x4c, 0xcc, 0x0c, 0x8c, 0x6c, 0xec, 0x2c,
-       0xac, 0x50, 0xd0, 0x10, 0x90, 0x70, 0xf0, 0x30,
-       0xb0, 0x40, 0xc0, 0x00, 0x80, 0x60, 0xe0, 0x20,
-       0x58, 0xd8, 0x18, 0x98, 0x78, 0xf8, 0x38, 0xb8,
-       0x48, 0xc8, 0x08, 0x88, 0x68, 0xe8, 0x28, 0xa8,
-       0xd6, 0x16, 0x96, 0x76, 0xf6, 0x36, 0xb6, 0x46,
-       0xc6, 0x06, 0x86, 0x66, 0xe6, 0x26, 0xa6, 0xde,
-       0x9e, 0x7e, 0xfe, 0x3e, 0xbe, 0x4e, 0xce, 0x0e,
-       0x8e, 0x6e, 0xee, 0x2e, 0x52, 0x12, 0x72, 0x32,
-       0xb2, 0x42, 0xc2, 0x02, 0x82, 0x62, 0xe2, 0x22,
-       0xa2, 0x5a, 0xda, 0x1a, 0x9a, 0x7a, 0xfa, 0x3a,
-       0xba, 0xba, 0x4a, 0x4a, 0xca, 0xca, 0x0a, 0x0a,
-       0x8a, 0x8a, 0x6a, 0x6a, 0xea, 0xea, 0x2a, 0x2a
-};
-
-static inline void
-isdn_audio_tlookup(const guint8 *table, guint8 *buff, gulong n)
-{
-       while (n--)
-       {
-               *buff = table[*(unsigned char *)buff];
-               buff++;
-       }
-}
-
-void
-isdn_audio_ulaw2alaw(guint8 *buff, gulong len)
-{
-       isdn_audio_tlookup(isdn_audio_ulaw_to_alaw, buff, len);
-}
-
-void
-isdn_audio_alaw2ulaw(guint8 *buff, gulong len)
-{
-       isdn_audio_tlookup(isdn_audio_alaw_to_ulaw, buff, len);
-}

diff --git a/gst/law/alaw-conversion.h b/gst/law/alaw-conversion.h
deleted file mode 100644 (file)
index b7d1297..0000000
--- a/gst/law/alaw-conversion.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _GST_ALAW_CONVERSION_H
-#define _GST_ALAW_CONVERSION_H
-
-#include <glib.h>
-
-void
-isdn_audio_ulaw2alaw(guint8 *buff, gulong len);
-
-void
-isdn_audio_alaw2ulaw(guint8 *buff, gulong len);
-
-#endif

diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c
index 9806f0e..8236fa0 100644 (file)
--- a/gst/law/alaw-decode.c
+++ b/gst/law/alaw-decode.c
@@ -1,10 +1,12 @@
 /* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) 1999 Erik Walthinsen <omega@cse.ogi.edu>
+ * PCM - A-Law conversion
+ *   Copyright (C) 2000 by Abramo Bagnara <abramo@alsa-project.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +21,6 @@
 
 #include <gst/gst.h>
 #include "alaw-decode.h"
-#include "mulaw-conversion.h"
-#include "alaw-conversion.h"
 
 extern GstPadTemplate *alawdec_src_template, *alawdec_sink_template;
 
@@ -46,35 +46,59 @@ static void         gst_alawdec_chain                       (GstPad *pad, GstBuffer *buf);
 
 static GstElementClass *parent_class = NULL;
 /*static guint gst_stereo_signals[LAST_SIGNAL] = { 0 }; */
+
 /*
-static GstPadNegotiateReturn
-alawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter)
+ * alaw_to_s16() - Convert an A-law value to 16-bit linear PCM
+ *
+ */
+static gint alaw_to_s16(guint8 a_val)
+{
+       gint            t;
+       gint            seg;
+
+       a_val ^= 0x55;
+       t = a_val & 0x7f;
+       if (t < 16)
+               t = (t << 4) + 8;
+       else {
+               seg = (t >> 4) & 0x07;
+               t = ((t & 0x0f) << 4) + 0x108;
+               t <<= seg -1;
+       }
+       return ((a_val & 0x80) ? t : -t);
+}
+
+static GstPadLinkReturn
+alawdec_link (GstPad *pad, GstCaps *caps)
 {
   GstCaps* tempcaps;
+  gint rate, channels;
   
-  GstALawDec* alawdec=GST_ALAWDEC (GST_OBJECT_PARENT (pad));
+  GstALawDec* alawdec = GST_ALAWDEC (GST_OBJECT_PARENT (pad));
   
-  if (*caps==NULL) 
-    return GST_PAD_NEGOTIATE_FAIL;
-
-  tempcaps = gst_caps_copy(*caps);
-
-  gst_caps_set(tempcaps,"format",GST_PROPS_STRING("int"));
-  gst_caps_set(tempcaps,"law",GST_PROPS_INT(0));
-  gst_caps_set(tempcaps,"depth",GST_PROPS_INT(16));
-  gst_caps_set(tempcaps,"width",GST_PROPS_INT(16));
-  gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(TRUE));
-
-  if (gst_pad_try_set_caps (alawdec->srcpad, tempcaps) > 0)
-  {
-    return GST_PAD_NEGOTIATE_AGREE;
-  }
-  else {
-    gst_caps_unref (tempcaps);
-    return GST_PAD_NEGOTIATE_FAIL;
-  }
-}              
-*/
+  if (!GST_CAPS_IS_FIXED (caps))
+    return GST_PAD_LINK_DELAYED;  
+  
+  if (!gst_caps_get (caps, "rate", &rate,
+                           "channels", &channels,
+                           NULL))
+    return GST_PAD_LINK_DELAYED;
+  
+  tempcaps = GST_CAPS_NEW (
+             "alawdec_src_caps",
+             "audio/raw",
+          "format",   GST_PROPS_STRING ("int"),
+          "law",      GST_PROPS_INT (0),
+          "depth",    GST_PROPS_INT (16),
+          "width",    GST_PROPS_INT (16),
+          "signed",   GST_PROPS_BOOLEAN (TRUE),
+          "endianness",   GST_PROPS_INT (G_BYTE_ORDER),
+          "rate",     GST_PROPS_INT (rate),
+          "channels", GST_PROPS_INT (channels),
+        NULL);
+  
+  return gst_pad_try_set_caps (alawdec->srcpad, tempcaps);
+}
 
 GType
 gst_alawdec_get_type(void) {
@@ -116,7 +140,7 @@ gst_alawdec_init (GstALawDec *alawdec)
 {
   alawdec->sinkpad = gst_pad_new_from_template(alawdec_sink_template,"sink");
   alawdec->srcpad = gst_pad_new_from_template(alawdec_src_template,"src");
-  /*gst_pad_set_negotiate_function(alawdec->sinkpad, alawdec_negotiate_sink);*/
+  gst_pad_set_link_function(alawdec->sinkpad, alawdec_link);
 
   gst_element_add_pad(GST_ELEMENT(alawdec),alawdec->sinkpad);
   gst_pad_set_chain_function(alawdec->sinkpad,gst_alawdec_chain);
@@ -130,6 +154,7 @@ gst_alawdec_chain (GstPad *pad,GstBuffer *buf)
   gint16 *linear_data;
   guint8 *alaw_data;
   GstBuffer* outbuf;
+  gint i;
 
   g_return_if_fail(pad != NULL);
   g_return_if_fail(GST_IS_PAD(pad));
@@ -145,9 +170,11 @@ gst_alawdec_chain (GstPad *pad,GstBuffer *buf)
   GST_BUFFER_SIZE(outbuf) = GST_BUFFER_SIZE(buf)*2;
 
   linear_data = (gint16*)GST_BUFFER_DATA(outbuf);
-
-  isdn_audio_alaw2ulaw(alaw_data,GST_BUFFER_SIZE(buf));
-  mulaw_decode(alaw_data,linear_data,GST_BUFFER_SIZE(buf));
+  for (i = 0; i < GST_BUFFER_SIZE(buf); i++) {
+    *linear_data = alaw_to_s16 (*alaw_data);
+    linear_data++;
+    alaw_data++;
+  }
   
   gst_buffer_unref(buf);
   gst_pad_push(alawdec->srcpad,outbuf);

diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c
index f7ebed1..9d799ed 100644 (file)
--- a/gst/law/alaw-encode.c
+++ b/gst/law/alaw-encode.c
@@ -1,10 +1,12 @@
 /* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) 1999 Erik Walthinsen <omega@cse.ogi.edu>
+ * PCM - A-Law conversion
+ *   Copyright (C) 2000 by Abramo Bagnara <abramo@alsa-project.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +21,6 @@
 
 #include <gst/gst.h>
 #include "alaw-encode.h"
-#include "mulaw-conversion.h"
-#include "alaw-conversion.h"
 
 extern GstPadTemplate *alawenc_src_template, *alawenc_sink_template;
 
@@ -43,39 +43,101 @@ static void                gst_alawenc_get_property                        (GObject *object, guint prop_id, GValue
 
 static void            gst_alawenc_chain                       (GstPad *pad, GstBuffer *buf);
 
+/*
+ * s16_to_alaw() - Convert a 16-bit linear PCM value to 8-bit A-law
+ *
+ * s16_to_alaw() accepts an 16-bit integer and encodes it as A-law data.
+ *
+ *             Linear Input Code       Compressed Code
+ *     ------------------------        ---------------
+ *     0000000wxyza                    000wxyz
+ *     0000001wxyza                    001wxyz
+ *     000001wxyzab                    010wxyz
+ *     00001wxyzabc                    011wxyz
+ *     0001wxyzabcd                    100wxyz
+ *     001wxyzabcde                    101wxyz
+ *     01wxyzabcdef                    110wxyz
+ *     1wxyzabcdefg                    111wxyz
+ *
+ * For further information see John C. Bellamy's Digital Telephony, 1982,
+ * John Wiley & Sons, pps 98-111 and 472-476.
+ */
+
+static inline gint val_seg(gint val)
+{
+       gint r = 1;
+       val >>= 8;
+       if (val & 0xf0) {
+               val >>= 4;
+               r += 4;
+       }
+       if (val & 0x0c) {
+               val >>= 2;
+               r += 2;
+       }
+       if (val & 0x02)
+               r += 1;
+       return r;
+}
+
+static guint8 s16_to_alaw(gint pcm_val)
+{
+       gint            seg;
+       guint8  mask;
+       guint8  aval;
+
+       if (pcm_val >= 0) {
+               mask = 0xD5;
+       } else {
+               mask = 0x55;
+               pcm_val = -pcm_val;
+               if (pcm_val > 0x7fff)
+                       pcm_val = 0x7fff;
+       }
+
+       if (pcm_val < 256)
+               aval = pcm_val >> 4;
+       else {
+               /* Convert the scaled magnitude to segment number. */
+               seg = val_seg(pcm_val);
+               aval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f);
+       }
+       return aval ^ mask;
+}
 
 static GstElementClass *parent_class = NULL;
 /*static guint gst_stereo_signals[LAST_SIGNAL] = { 0 }; */
 
-/*
-static GstPadNegotiateReturn
-alawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter)
+static GstPadLinkReturn
+alawenc_link (GstPad *pad, GstCaps *caps)
 {
   GstCaps* tempcaps;
+  gint rate, channels;
   
-  GstALawEnc* alawenc=GST_ALAWENC (GST_OBJECT_PARENT (pad));
+  GstALawEnc* alawenc = GST_ALAWENC (GST_OBJECT_PARENT (pad));
   
-  if (*caps==NULL) 
-    return GST_PAD_NEGOTIATE_FAIL;
-
-  tempcaps = gst_caps_copy(*caps);
-
-  gst_caps_set(tempcaps,"format",GST_PROPS_STRING("int"));
-  gst_caps_set(tempcaps,"law",GST_PROPS_INT(2));
-  gst_caps_set(tempcaps,"depth",GST_PROPS_INT(8));
-  gst_caps_set(tempcaps,"width",GST_PROPS_INT(8));
-  gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(FALSE));
-
-  if (gst_pad_try_set_caps (alawenc->srcpad, tempcaps) > 0)
-  {
-    return GST_PAD_NEGOTIATE_AGREE;
-  }
-  else {
-    gst_caps_unref (tempcaps);
-    return GST_PAD_NEGOTIATE_FAIL;
-  }
+  if (!GST_CAPS_IS_FIXED (caps))
+    return GST_PAD_LINK_DELAYED;  
+  
+  if (!gst_caps_get (caps, "rate", &rate,
+                           "channels", &channels,
+                           NULL))
+    return GST_PAD_LINK_DELAYED;
+  
+  tempcaps = GST_CAPS_NEW (
+             "alawenc_src_caps",
+             "audio/raw",
+          "format",   GST_PROPS_STRING ("int"),
+          "law",      GST_PROPS_INT (2),
+          "depth",    GST_PROPS_INT (8),
+          "width",    GST_PROPS_INT (8),
+          "signed",   GST_PROPS_BOOLEAN (FALSE),
+          "rate",     GST_PROPS_INT (rate),
+          "channels", GST_PROPS_INT (channels),
+        NULL);
+  
+  return gst_pad_try_set_caps (alawenc->srcpad, tempcaps);
 }              
-*/
 
 GType
 gst_alawenc_get_type(void) {
@@ -117,7 +179,7 @@ gst_alawenc_init (GstALawEnc *alawenc)
 {
   alawenc->sinkpad = gst_pad_new_from_template(alawenc_sink_template,"sink");
   alawenc->srcpad = gst_pad_new_from_template(alawenc_src_template,"src");
-  /*gst_pad_set_negotiate_function(alawenc->sinkpad, alawenc_negotiate_sink);*/
+  gst_pad_set_link_function (alawenc->sinkpad, alawenc_link);
 
   gst_element_add_pad(GST_ELEMENT(alawenc),alawenc->sinkpad);
   gst_pad_set_chain_function(alawenc->sinkpad,gst_alawenc_chain);
@@ -131,6 +193,7 @@ gst_alawenc_chain (GstPad *pad,GstBuffer *buf)
   gint16 *linear_data;
   guint8 *alaw_data;
   GstBuffer* outbuf;
+  gint i;
 
   g_return_if_fail(pad != NULL);
   g_return_if_fail(GST_IS_PAD(pad));
@@ -142,12 +205,16 @@ gst_alawenc_chain (GstPad *pad,GstBuffer *buf)
 
   linear_data = (gint16 *)GST_BUFFER_DATA(buf);
   outbuf=gst_buffer_new();
-  GST_BUFFER_DATA(outbuf) = (gchar*)g_new(gint16,GST_BUFFER_SIZE(buf)/4);
+  GST_BUFFER_DATA(outbuf) = (gchar*)g_new(guint8,GST_BUFFER_SIZE(buf)/2);
   GST_BUFFER_SIZE(outbuf) = GST_BUFFER_SIZE(buf)/2;
 
+  
   alaw_data = (guint8*)GST_BUFFER_DATA(outbuf);
-  mulaw_encode(linear_data,alaw_data,GST_BUFFER_SIZE(outbuf));
-  isdn_audio_ulaw2alaw(alaw_data,GST_BUFFER_SIZE(outbuf));
+  for (i = 0; i < GST_BUFFER_SIZE(outbuf); i++) {
+    *alaw_data = s16_to_alaw (*linear_data);
+    *alaw_data++;
+    *linear_data++;
+  }
   gst_buffer_unref(buf);
   gst_pad_push(alawenc->srcpad,outbuf);
 }

diff --git a/gst/law/alaw.c b/gst/law/alaw.c
index 3d56f44..7f6e7de 100644 (file)
--- a/gst/law/alaw.c
+++ b/gst/law/alaw.c
@@ -51,6 +51,7 @@ linear_factory (void)
            "law",      GST_PROPS_INT(0),
            "width",    GST_PROPS_INT(16),
            "depth",    GST_PROPS_INT(16),
+           "endianness",    GST_PROPS_INT(G_BYTE_ORDER),
            "signed",   GST_PROPS_BOOLEAN(TRUE),
            NULL));
 }

diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c
index 48de557..a772866 100644 (file)
--- a/gst/law/mulaw-decode.c
+++ b/gst/law/mulaw-decode.c
@@ -48,26 +48,36 @@ static GstElementClass *parent_class = NULL;
 
 
 static GstPadLinkReturn
-mulawdec_connect_sink (GstPad *pad, GstCaps *caps)
+mulawdec_link (GstPad *pad, GstCaps *caps)
 {
-  GstCaps *newcaps;
-  GstMuLawDec* mulawdec=GST_MULAWDEC (GST_OBJECT_PARENT (pad));
+  GstCaps* tempcaps;
+  gint rate, channels;
   
-  if (caps==NULL) 
-    return GST_PAD_LINK_REFUSED;
-
-  newcaps = gst_caps_copy(caps);
-
-  gst_caps_set(newcaps,"format",GST_PROPS_STRING("int"));
-  gst_caps_set(newcaps,"law",GST_PROPS_INT(0));
-  gst_caps_set(newcaps,"depth",GST_PROPS_INT(16));
-  gst_caps_set(newcaps,"width",GST_PROPS_INT(16));
-  gst_caps_set(newcaps,"signed",GST_PROPS_BOOLEAN(TRUE));
-
-  if (GST_CAPS_IS_FIXED (newcaps))
-    return gst_pad_try_set_caps (mulawdec->srcpad, newcaps);
-  return GST_PAD_LINK_DELAYED;
-}              
+  GstMuLawDec* mulawdec = GST_MULAWDEC (GST_OBJECT_PARENT (pad));
+  
+  if (!GST_CAPS_IS_FIXED (caps))
+    return GST_PAD_LINK_DELAYED;  
+  
+  if (!gst_caps_get (caps, "rate", &rate,
+                           "channels", &channels,
+                           NULL))
+    return GST_PAD_LINK_DELAYED;
+  
+  tempcaps = GST_CAPS_NEW (
+             "sinesrc_src_caps",
+             "audio/raw",
+          "format",   GST_PROPS_STRING ("int"),
+          "law",      GST_PROPS_INT (0),
+          "depth",    GST_PROPS_INT (16),
+          "width",    GST_PROPS_INT (16),
+          "signed",   GST_PROPS_BOOLEAN (TRUE),
+          "endianness",    GST_PROPS_INT (G_BYTE_ORDER),
+          "rate",     GST_PROPS_INT (rate),
+          "channels", GST_PROPS_INT (channels),
+        NULL);
+  
+  return gst_pad_try_set_caps (mulawdec->srcpad, tempcaps);
+}
 
 GType
 gst_mulawdec_get_type(void) {
@@ -109,7 +119,7 @@ gst_mulawdec_init (GstMuLawDec *mulawdec)
 {
   mulawdec->sinkpad = gst_pad_new_from_template(mulawdec_sink_template,"sink");
   mulawdec->srcpad = gst_pad_new_from_template(mulawdec_src_template,"src");
-  gst_pad_set_link_function(mulawdec->sinkpad, mulawdec_connect_sink);
+  gst_pad_set_link_function(mulawdec->sinkpad, mulawdec_link);
 
   gst_element_add_pad(GST_ELEMENT(mulawdec),mulawdec->sinkpad);
   gst_pad_set_chain_function(mulawdec->sinkpad,gst_mulawdec_chain);

diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c
index bb08b7a..d1eb849 100644 (file)
--- a/gst/law/mulaw-encode.c
+++ b/gst/law/mulaw-encode.c
@@ -60,7 +60,7 @@ mulawenc_link (GstPad *pad, GstCaps *caps)
   if (!gst_caps_get (caps, "rate", &rate,
                            "channels", &channels,
                            NULL))
-    return GST_PAD_LINK_REFUSED;
+    return GST_PAD_LINK_DELAYED;
   
   tempcaps = GST_CAPS_NEW (
              "sinesrc_src_caps",

diff --git a/gst/law/mulaw.c b/gst/law/mulaw.c
index ccab61d..5a6ce24 100644 (file)
--- a/gst/law/mulaw.c
+++ b/gst/law/mulaw.c
@@ -52,6 +52,7 @@ linear_factory (void)
            "width",    GST_PROPS_INT(16),
            "depth",    GST_PROPS_INT(16),
            "signed",   GST_PROPS_BOOLEAN(TRUE),
+           "endianness",    GST_PROPS_INT(G_BYTE_ORDER),
            NULL));
 }