Changeset 121 for pjproject

Timestamp:

Jan 18, 2006 11:12:57 PM (19 years ago)

Author:

bennylp

Message:

Compiled cleanly first time for the new pjlib

Location:

pjproject/trunk/pjmedia

Files:

• build (modified) (1 prop)
• build/output (modified) (1 prop)
• build/pjaut.dsp (moved) (moved from pjproject/trunk/pjmedia/build/pjmedia_audio_tool.dsp) (5 diffs)
• build/pjmedia.dsp (modified) (3 diffs)
• build/pjmedia.dsw (modified) (5 diffs)
• build/pjmedia.sln (deleted)
• build/pjmedia.vcproj (deleted)
• build/pjmedia_audio_tool.vcproj (deleted)
• build/pjmedia_test.vcproj (deleted)
• include (added)
• include/pjmedia (added)
• include/pjmedia.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia.h) (1 diff, 1 prop)
• include/pjmedia/codec.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/codec.h) (2 diffs, 1 prop)
• include/pjmedia/config.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/config.h) (1 prop)
• include/pjmedia/jbuf.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/jbuf.h) (1 prop)
• include/pjmedia/mediamgr.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/mediamgr.h) (1 prop)
• include/pjmedia/rtcp.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/rtcp.h) (1 prop)
• include/pjmedia/rtp.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/rtp.h) (1 prop)
• include/pjmedia/sdp.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/sdp.h) (1 prop)
• include/pjmedia/session.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/session.h) (1 prop)
• include/pjmedia/sound.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/sound.h) (1 prop)
• include/pjmedia/stream.h (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/stream.h) (1 prop)
• src/pjmedia/codec.c (modified) (3 diffs, 1 prop)
• src/pjmedia/dsound.c (modified) (1 prop)
• src/pjmedia/g711.c (modified) (5 diffs, 1 prop)
• src/pjmedia/jbuf.c (modified) (2 diffs, 1 prop)
• src/pjmedia/mediamgr.c (modified) (1 prop)
• src/pjmedia/nullsound.c (modified) (1 diff, 1 prop)
• src/pjmedia/pasound.c (modified) (4 diffs, 1 prop)
• src/pjmedia/rtcp.c (modified) (3 diffs)
• src/pjmedia/rtp.c (modified) (2 diffs)
• src/pjmedia/sdp.c (modified) (13 diffs)
• src/pjmedia/session.c (modified) (2 diffs)
• src/pjmedia/stream.c (modified) (14 diffs)

pjproject/trunk/pjmedia/build/pjaut.dsp

@@ -1 @@
-# Microsoft Developer Studio Project File - Name="pjmedia_audio_tool" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="pjaut" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
@@ -5 +5 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=pjmedia_audio_tool - Win32 Debug
+CFG=pjaut - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "pjmedia_audio_tool.mak".
+!MESSAGE NMAKE /f "pjaut.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "pjmedia_audio_tool.mak" CFG="pjmedia_audio_tool - Win32 Debug"
+!MESSAGE NMAKE /f "pjaut.mak" CFG="pjaut - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "pjmedia_audio_tool - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "pjmedia_audio_tool - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "pjaut - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "pjaut - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
@@ -29 +29 @@
 RSC=rc.exe
 
-!IF  "$(CFG)" == "pjmedia_audio_tool - Win32 Release"
+!IF  "$(CFG)" == "pjaut - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\pjmedia_audio_tool_vc6_Release"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Release"
+# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_release"
+# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\pjmedia_audio_tool_vc6_Release"
-# PROP Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Release"
+# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_release"
+# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
@@ -53 +53 @@
 # ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjaut_vc6.exe"
 
-!ELSEIF  "$(CFG)" == "pjmedia_audio_tool - Win32 Debug"
+!ELSEIF  "$(CFG)" == "pjaut - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
+# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_debug"
+# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
-# PROP Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
+# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_debug"
+# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
@@ -81 +81 @@
 # Begin Target
 
-# Name "pjmedia_audio_tool - Win32 Release"
-# Name "pjmedia_audio_tool - Win32 Debug"
+# Name "pjaut - Win32 Release"
+# Name "pjaut - Win32 Debug"
 # Begin Group "Source Files"
 

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -33 +33 @@
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\pjmedia_vc6_Release"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_vc6_Release"
+# PROP BASE Output_Dir ".\output\pjmedia_i386_win32_vc6_release"
+# PROP BASE Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\pjmedia_vc6_Release"
-# PROP Intermediate_Dir ".\output\pjmedia_vc6_Release"
+# PROP Output_Dir ".\output\pjmedia_i386_win32_vc6_release"
+# PROP Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /I "../src/pjmedia/portaudio" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -57 +57 @@
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\output\pjmedia_vc6_Debug"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_vc6_Debug"
+# PROP BASE Output_Dir ".\output\pjmedia_i386_win32_vc6_debug"
+# PROP BASE Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\output\pjmedia_vc6_Debug"
-# PROP Intermediate_Dir ".\output\pjmedia_vc6_Debug"
+# PROP Output_Dir ".\output\pjmedia_i386_win32_vc6_debug"
+# PROP Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -142 +142 @@
 # Begin Source File
 
-SOURCE=..\src\pjmedia\codec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\jbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\mediamgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\rtcp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\rtp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\sdp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\session.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\stream.h
+SOURCE=..\include\pjmedia\codec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\jbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\mediamgr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\rtcp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\rtp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\sdp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\session.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\stream.h
 # End Source File
 # End Group

pjproject/trunk/pjmedia/build/pjmedia.dsw

@@ -4 +4 @@
 ###############################################################################
 
-Project: "pjaudio_tool"=.\pjaudio_tool.dsp - Package Owner=<4>
+Project: "pjaut"=.\pjaut.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}
 
@@ -30 +26 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
 }}}
 
@@ -46 +50 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}
 
@@ -65 +65 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}
 
@@ -90 +86 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}
 

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -1 @@
-/* $Id$
+/* $Id$ */
+/* 
+ * Copyright (C) 2003-2006 Benny Prijono <benny@prijono.org>
  *
- */
-/* 
- * PJMEDIA - Multimedia over IP Stack 
- * (C)2003-2005 Benny Prijono <bennylp@bulukucing.org>
+ * 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 of the License, or
+ * (at your option) any later version.
  *
- * Author:
- *  Benny Prijono <bennylp@bulukucing.org>
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 #ifndef __PJMEDIA_H__

pjproject/trunk/pjmedia/include/pjmedia/codec.h

@@ -215 +215 @@
 {
     /** Entries to put this codec instance in codec factory's list. */
-    PJ_DECL_LIST_MEMBER(struct pj_codec)
+    PJ_DECL_LIST_MEMBER(struct pj_codec);
 
     /** Codec's private data. */
@@ -283 +283 @@
 {
     /** Entries to put this structure in the codec manager list. */
-    PJ_DECL_LIST_MEMBER(struct pj_codec_factory)
+    PJ_DECL_LIST_MEMBER(struct pj_codec_factory);
 
     /** The factory's private data. */

pjproject/trunk/pjmedia/src/pjmedia/codec.c

@@ -20 +20 @@
 #include <pj/pool.h>
 #include <pj/string.h>
+#include <pj/assert.h>
 #include <pj/log.h>
 
@@ -66 +67 @@
 PJ_DEF(void) pj_codec_mgr_unregister_factory (pj_codec_mgr *mgr, pj_codec_factory *factory)
 {
-    PJ_UNUSED_ARG(mgr)
+    PJ_UNUSED_ARG(mgr);
     pj_list_erase(factory);
     enum_all_codecs (mgr);
@@ -101 +102 @@
 PJ_DEF(void) pj_codec_mgr_dealloc_codec (pj_codec_mgr *mgr, pj_codec *codec)
 {
-    PJ_UNUSED_ARG(mgr)
+    PJ_UNUSED_ARG(mgr);
     (*codec->factory->op->dealloc_codec)(codec->factory, codec);
 }

pjproject/trunk/pjmedia/src/pjmedia/g711.c

@@ -23 +23 @@
 #include <pj/pool.h>
 #include <pj/string.h>
-#include <string.h>     /* memset */
+#include <pj/assert.h>
+
 
 #define G711_BPS        64000
@@ -129 +130 @@
 static pj_status_t g711_match_id( pj_codec_factory *factory, const pj_codec_id *id )
 {
-    PJ_UNUSED_ARG(factory)
+    PJ_UNUSED_ARG(factory);
 
     /* It's sufficient to check payload type only. */
@@ -139 +140 @@
                                       pj_codec_attr *attr )
 {
-    PJ_UNUSED_ARG(factory)
+    PJ_UNUSED_ARG(factory);
 
     memset(attr, 0, sizeof(pj_codec_attr));
@@ -156 +157 @@
                                   unsigned count, pj_codec_id codecs[])
 {
-    PJ_UNUSED_ARG(factory)
+    PJ_UNUSED_ARG(factory);
 
     if (count > 0) {
@@ -230 +231 @@
 {
     /* There's nothing to do here really */
-    PJ_UNUSED_ARG(codec)
-    PJ_UNUSED_ARG(pool)
+    PJ_UNUSED_ARG(codec);
+    PJ_UNUSED_ARG(pool);
 
     return PJ_SUCCESS;

pjproject/trunk/pjmedia/src/pjmedia/jbuf.c

@@ -20 +20 @@
 #include <pj/log.h>
 #include <pj/pool.h>
-#include <string.h>     /* memset() */
+#include <pj/assert.h>
+#include <pj/string.h>
+
 
 /*
@@ -68 +70 @@
     PJ_LOG(5, (THIS_FILE, "..pj_frame_list_init [lst=%p], maxcount=%d", lst, maxcount));
 
-    memset(lst, 0, sizeof(*lst));
+    pj_memset(lst, 0, sizeof(*lst));
     lst->maxcount = maxcount;
     lst->frames = pj_pool_calloc( pool, maxcount, sizeof(*lst->frames) );

pjproject/trunk/pjmedia/src/pjmedia/nullsound.c

@@ -18 +18 @@
  */
 #include <pjmedia/sound.h>
+#include <pj/assert.h>
 
-/*
- * Null Factory Operations
- */
-static pj_status_t null_sound_init(void);
-static const char *null_sound_get_name(void);
-static pj_status_t null_sound_destroy(void);
-static pj_status_t null_sound_enum_devices(int *count, char *dev_names[]);
-static pj_status_t null_sound_create_dev(const char *dev_name, pj_snd_dev *dev);
-static pj_status_t null_sound_destroy_dev(pj_snd_dev *dev);
+static pj_snd_dev_info null_info = 
+{
+    "Null Device",
+    1,
+    1,
+    8000
+};
 
 
-/*
- * Null Device Operations
- */
-static pj_status_t null_sound_dev_open( pj_snd_dev *dev, pj_snd_role_t role );
-static pj_status_t null_sound_dev_close( pj_snd_dev *dev );
-static pj_status_t null_sound_dev_play( pj_snd_dev *dev );
-static pj_status_t null_sound_dev_record( pj_snd_dev *dev );
-
-
-static pj_snd_dev_factory null_sound_factory = 
+PJ_DEF(pj_status_t) pj_snd_init(pj_pool_factory *factory)
 {
-    &null_sound_init,
-    &null_sound_get_name,
-    &null_sound_destroy,
-    &null_sound_enum_devices,
-    &null_sound_create_dev,
-    &null_sound_destroy_dev
-};
-
-static struct pj_snd_dev_op null_sound_dev_op = 
-{
-    &null_sound_dev_open,
-    &null_sound_dev_close,
-    &null_sound_dev_play,
-    &null_sound_dev_record
-};
-
-PJ_DEF(pj_snd_dev_factory*) pj_nullsound_get_factory()
-{
-    return &null_sound_factory;
+    PJ_UNUSED_ARG(factory);
+    return PJ_SUCCESS;
 }
 
-static pj_status_t null_sound_init(void)
+PJ_DEF(int) pj_snd_get_dev_count(void)
 {
-    return 0;
+    return 1;
 }
 
-static const char *null_sound_get_name(void)
+PJ_DEF(const pj_snd_dev_info*) pj_snd_get_dev_info(unsigned index)
 {
-    return "nullsound";
+    PJ_ASSERT_RETURN(index==0, NULL);
+    return &null_info;
 }
 
-static pj_status_t null_sound_destroy(void)
+PJ_DEF(pj_snd_stream*) pj_snd_open_recorder( int index,
+                                             const pj_snd_stream_info *param,
+                                             pj_snd_rec_cb rec_cb,
+                                             void *user_data)
 {
-    return 0;
+    PJ_UNUSED_ARG(index);
+    PJ_UNUSED_ARG(param);
+    PJ_UNUSED_ARG(rec_cb);
+    PJ_UNUSED_ARG(user_data);
+    return (void*)1;
 }
 
-static pj_status_t null_sound_enum_devices(int *count, char *dev_names[])
+PJ_DEF(pj_snd_stream*) pj_snd_open_player( int index,
+                                           const pj_snd_stream_info *param,
+                                           pj_snd_play_cb play_cb,
+                                           void *user_data)
 {
-    *count = 1;
-    dev_names[0] = "nullsound";
-    return 0;
+    PJ_UNUSED_ARG(index);
+    PJ_UNUSED_ARG(param);
+    PJ_UNUSED_ARG(play_cb);
+    PJ_UNUSED_ARG(user_data);
+    return (void*)1;
 }
 
-static pj_status_t null_sound_create_dev(const char *dev_name, pj_snd_dev *dev)
+PJ_DEF(pj_status_t) pj_snd_stream_start(pj_snd_stream *stream)
 {
-    PJ_UNUSED_ARG(dev_name);
-    dev->op = &null_sound_dev_op;
-    return 0;
+    PJ_UNUSED_ARG(stream);
+    return PJ_SUCCESS;
 }
 
-static pj_status_t null_sound_destroy_dev(pj_snd_dev *dev)
+PJ_DEF(pj_status_t) pj_snd_stream_stop(pj_snd_stream *stream)
 {
-    PJ_UNUSED_ARG(dev);
-    return 0;
+    PJ_UNUSED_ARG(stream);
+    return PJ_SUCCESS;
 }
 
-
-/*
- * Null Device Operations
- */
-static pj_status_t null_sound_dev_open( pj_snd_dev *dev, pj_snd_role_t role )
+PJ_DEF(pj_status_t) pj_snd_stream_close(pj_snd_stream *stream)
 {
-    PJ_UNUSED_ARG(dev);
-    PJ_UNUSED_ARG(role);
-    return 0;
+    PJ_UNUSED_ARG(stream);
+    return PJ_SUCCESS;
 }
 
-static pj_status_t null_sound_dev_close( pj_snd_dev *dev )
+PJ_DEF(pj_status_t) pj_snd_deinit(void)
 {
-    PJ_UNUSED_ARG(dev);
-    return 0;
+    return PJ_SUCCESS;
 }
-
-static pj_status_t null_sound_dev_play( pj_snd_dev *dev )
-{
-    PJ_UNUSED_ARG(dev);
-    return 0;
-}
-
-static pj_status_t null_sound_dev_record( pj_snd_dev *dev )
-{
-    PJ_UNUSED_ARG(dev);
-    return 0;
-}
-

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -61 +61 @@
     pj_status_t status;
 
-    PJ_UNUSED_ARG(output)
-    PJ_UNUSED_ARG(timeInfo)
+    PJ_UNUSED_ARG(output);
+    PJ_UNUSED_ARG(timeInfo);
 
     if (stream->quit_flag)
@@ -68 +68 @@
 
     if (stream->thread_initialized == 0) {
-        stream->thread = pj_thread_register("pa_rec", stream->thread_desc);
+        status = pj_thread_register("pa_rec", stream->thread_desc, &stream->thread);
         stream->thread_initialized = 1;
     }
@@ -101 +101 @@
     unsigned size = frameCount * stream->bytes_per_sample;
 
-    PJ_UNUSED_ARG(input)
-    PJ_UNUSED_ARG(timeInfo)
+    PJ_UNUSED_ARG(input);
+    PJ_UNUSED_ARG(timeInfo);
 
     if (stream->quit_flag)
@@ -108 +108 @@
 
     if (stream->thread_initialized == 0) {
-        stream->thread = pj_thread_register("pa_rec", stream->thread_desc);
+        status = pj_thread_register("pa_rec", stream->thread_desc, &stream->thread);
         stream->thread_initialized = 1;
     }

pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

@@ -20 +20 @@
 #include <pj/os.h>      /* pj_gettimeofday */
 #include <pj/sock.h>    /* pj_htonx, pj_ntohx */
-#include <string.h>     /* memset */
+#include <pj/string.h>  /* pj_memset */
+
 
 #define RTCP_SR   200
@@ -47 +48 @@
     pj_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
     
-    memset(rtcp_pkt, 0, sizeof(pj_rtcp_pkt));
+    pj_memset(rtcp_pkt, 0, sizeof(pj_rtcp_pkt));
     
     /* Init time */
@@ -68 +69 @@
 {
     /* Nothing to do. */
-    PJ_UNUSED_ARG(session)
+    PJ_UNUSED_ARG(session);
 }
 

pjproject/trunk/pjmedia/src/pjmedia/rtp.c

@@ -21 +21 @@
 #include <pj/os.h>      /* pj_gettimeofday() */
 #include <pj/sock.h>    /* pj_htonx, pj_htonx */
-#include <string.h>     /* memset() */
+#include <pj/assert.h>
+#include <pj/string.h>
+
 
 #define THIS_FILE   "rtp.c"
@@ -62 +64 @@
 
     /* Build default header for outgoing RTP packet. */
-    memset(ses, 0, sizeof(*ses));
+    pj_memset(ses, 0, sizeof(*ses));
     ses->out_hdr.v = RTP_VERSION;
     ses->out_hdr.p = 0;

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -18 +18 @@
  */
 #include <pjmedia/sdp.h>
-#include <pj/scanner.h>
+#include <pjlib-util/scanner.h>
 #include <pj/except.h>
 #include <pj/log.h>
@@ -24 +24 @@
 #include <pj/string.h>
 #include <pj/pool.h>
+#include <pj/assert.h>
 
 enum {
@@ -124 +125 @@
  */
 static int is_initialized;
-static pj_char_spec cs_token;
+static pj_cis_buf_t cis_buf;
+static pj_cis_t cs_token;
 
 static void init_sdp_parser(void)
@@ -134 +136 @@
         }
     }
-    pj_cs_add_alpha(cs_token);
-    pj_cs_add_num(cs_token);
-    pj_cs_add_str( cs_token, TOKEN);
+
+    pj_cis_buf_init(&cis_buf);
+    pj_cis_init(&cis_buf, &cs_token);
+    pj_cis_add_alpha(&cs_token);
+    pj_cis_add_num(&cs_token);
+    pj_cis_add_str(&cs_token, TOKEN);
 }
 
@@ -203 +208 @@
 static int print_name_only_attr(const pjsdp_attr *attr, char *buf, int len)
 {
-    PJ_UNUSED_ARG(attr)
-    PJ_UNUSED_ARG(buf)
-    PJ_UNUSED_ARG(len)
+    PJ_UNUSED_ARG(attr);
+    PJ_UNUSED_ARG(buf);
+    PJ_UNUSED_ARG(len);
     return 0;
 }
@@ -707 +712 @@
 
     /* port */
-    pj_scan_get(scanner, cs_token, &str);
+    pj_scan_get(scanner, &cs_token, &str);
     med->desc.port = (unsigned short)pj_strtoul(&str);
-    if (*scanner->current == '/') {
+    if (*scanner->curptr == '/') {
         /* port count */
         pj_scan_get_char(scanner);
-        pj_scan_get(scanner, cs_token, &str);
+        pj_scan_get(scanner, &cs_token, &str);
         med->desc.port_count = pj_strtoul(&str);
 
@@ -728 +733 @@
     /* format list */
     med->desc.fmt_count = 0;
-    while (*scanner->current == ' ') {
+    while (*scanner->curptr == ' ') {
         pj_scan_get_char(scanner);
-        pj_scan_get(scanner, cs_token, &med->desc.fmt[med->desc.fmt_count++]);
+        pj_scan_get(scanner, &cs_token, &med->desc.fmt[med->desc.fmt_count++]);
     }
 
@@ -752 +757 @@
     pj_scan_get_until_ch(scanner, '/', &rtpmap->encoding_name);
     pj_scan_get_char(scanner);
-    pj_scan_get(scanner, cs_token, &str);
+    pj_scan_get(scanner, &cs_token, &str);
     rtpmap->clock_rate = pj_strtoul(&str);
 
-    if (*scanner->current == '/') {
+    if (*scanner->curptr == '/') {
         pj_scan_get_char(scanner);
         pj_scan_get_until_ch(scanner, '\r', &rtpmap->parameter);
@@ -794 +799 @@
     pjsdp_attr *attr;
 
-    PJ_UNUSED_ARG(scanner)
+    PJ_UNUSED_ARG(scanner);
     attr = pj_pool_calloc(pool, 1, sizeof(*attr));
     return attr;
@@ -825 +830 @@
     
     /* get attr name. */
-    pj_scan_get(scanner, cs_token, &attrname);
+    pj_scan_get(scanner, &cs_token, &attrname);
 
     /* find entry to handle attrname */
@@ -852 +857 @@
 static void on_scanner_error(pj_scanner *scanner)
 {
-    PJ_UNUSED_ARG(scanner)
+    PJ_UNUSED_ARG(scanner);
 
     PJ_THROW(SYNTAX_ERROR);
@@ -879 +884 @@
     PJ_TRY {
         while (!pj_scan_is_eof(&scanner)) {
-                cur_name = *scanner.current;
+                cur_name = *scanner.curptr;
                 switch (cur_name) {
                 case 'a':
@@ -925 +930 @@
     PJ_CATCH(SYNTAX_ERROR) {
         PJ_LOG(2, (LOG_THIS, "Syntax error in SDP parser '%c' line %d col %d",
-                cur_name, scanner.line, scanner.col));
+                cur_name, scanner.line, pj_scan_get_col(&scanner)));
         if (!pj_scan_is_eof(&scanner)) {
-            if (*scanner.current != '\r') {
+            if (*scanner.curptr != '\r') {
                 pj_scan_get_until_ch(&scanner, '\r', &dummy);
             }

pjproject/trunk/pjmedia/src/pjmedia/session.c

@@ -22 +22 @@
 #include <pj/pool.h>
 #include <pj/string.h>
+#include <pj/assert.h>
+
 
 typedef struct pj_media_stream_desc
@@ -772 +774 @@
     scp.rtcp_sock = sd->info.sock_info.rtcp_sock;
     scp.remote_addr = pj_pool_calloc (session->pool, 1, sizeof(pj_sockaddr_in));
-    pj_sockaddr_init (scp.remote_addr, &sd->info.rem_addr, sd->info.rem_port);
+    pj_sockaddr_in_init(scp.remote_addr, &sd->info.rem_addr, sd->info.rem_port);
     scp.ssrc = tv.sec;
     scp.jb_min = 1;

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -25 +25 @@
 #include <pj/string.h>      /* memcpy() */
 #include <pj/pool.h>
+#include <pj/assert.h>
+#include <pj/compat/socket.h>
+#include <pj/sock_select.h>
+#include <pj/errno.h>
 #include <stdlib.h>
+
 
 #define THISFILE    "stream.c"
@@ -92 +97 @@
     struct pj_audio_frame frame_in, frame_out;
 
-    PJ_UNUSED_ARG(timestamp)
+    PJ_UNUSED_ARG(timestamp);
 
     /* Lock mutex */
@@ -153 +158 @@
     void *rtphdr;
     int rtphdrlen;
-    int sent;
+    pj_ssize_t sent;
 #if 0
     static FILE *fhnd = NULL;
 #endif
 
-    PJ_UNUSED_ARG(timestamp)
+    PJ_UNUSED_ARG(timestamp);
 
     /* Start locking channel mutex */
@@ -203 +208 @@
 
     /* Send. */
-    sent = pj_sock_sendto (channel->rtp_sock, channel->out_pkt, frame_out.size+sizeof(pj_rtp_hdr), 0, 
+    sent = frame_out.size+sizeof(pj_rtp_hdr);
+    status = pj_sock_sendto (channel->rtp_sock, channel->out_pkt, &sent, 0, 
                            &channel->dst_addr, sizeof(channel->dst_addr));
-    if (sent != (int)frame_out.size + (int)sizeof(pj_rtp_hdr))  {
-        pj_perror(THISFILE, "Error sending RTP packet to %s:%d", 
-                  pj_sockaddr_get_str_addr(&channel->dst_addr),
-                  pj_sockaddr_get_port(&channel->dst_addr));
+    if (status != PJ_SUCCESS)
         goto on_return;
-    }
 
     /* Update stat */
@@ -232 +234 @@
 
 
-static void* PJ_THREAD_FUNC stream_decoder_transport_thread (void*arg)
+static int PJ_THREAD_FUNC stream_decoder_transport_thread (void*arg)
 {
     pj_media_stream_t *channel = arg;
 
     while (!channel->thread_quit_flag) {
-        int len, size;
+        pj_ssize_t len, size;
         const pj_rtp_hdr *hdr;
         const void *payload;
@@ -245 +247 @@
 
         /* Wait for packet. */
-        fd_set fds;
+        pj_fd_set_t fds;
         pj_time_val timeout;
 
@@ -259 +261 @@
 
         /* Get packet from socket. */
-        len = pj_sock_recv (channel->rtp_sock, channel->in_pkt, channel->in_pkt_size, 0);
-        if (len < 1) {
-            if (pj_getlasterror() == PJ_ECONNRESET) {
+        len = channel->in_pkt_size;
+        status = pj_sock_recv (channel->rtp_sock, channel->in_pkt, &len, 0);
+        if (len < 1 || status != PJ_SUCCESS) {
+            if (pj_get_netos_error() == PJ_STATUS_FROM_OS(OSERR_ECONNRESET)) {
                 /* On Win2K SP2 (or above) and WinXP, recv() will get WSAECONNRESET
                    when the sending side receives ICMP port unreachable.
@@ -267 +270 @@
                 continue;
             }
-            pj_perror(THISFILE, "Error receiving packet from socket (len=%d)", len);
+            //pj_perror(THISFILE, "Error receiving packet from socket (len=%d)", len);
             pj_thread_sleep(1);
             continue;
@@ -326 +329 @@
     }
 
-    return NULL;
+    return 0;
 }
 
@@ -349 +352 @@
     void *ptr;
     unsigned size;
-    int status;
+    pj_status_t status;
     
     /* Allocate memory for channel descriptor */
@@ -370 +373 @@
 
     /* Create mutex for the channel. */
-    channel->mutex = pj_mutex_create(pool, NULL, PJ_MUTEX_SIMPLE);
-    if (channel->mutex == NULL)
+    status = pj_mutex_create_simple(pool, NULL, &channel->mutex);
+    if (status != PJ_SUCCESS)
         goto err_cleanup;
 
@@ -485 +488 @@
         }
 
-        channel->transport_thread = pj_thread_create(pool, "decode", 
-                                                     &stream_decoder_transport_thread, channel,
-                                                     0, NULL, 0);
-        if (!channel->transport_thread) {
-            pj_perror(THISFILE, "Unable to create transport thread");
+        status = pj_thread_create(pool, "decode", 
+                                  &stream_decoder_transport_thread, channel,
+                                  0, 0, &channel->transport_thread);
+        if (status != PJ_SUCCESS) {
+            //pj_perror(THISFILE, "Unable to create transport thread");
             goto err_cleanup;
         }
@@ -574 +577 @@
 PJ_DEF(pj_status_t) pj_media_stream_pause (pj_media_stream_t *channel)
 {
-    PJ_UNUSED_ARG(channel)
+    PJ_UNUSED_ARG(channel);
     return -1;
 }
@@ -580 +583 @@
 PJ_DEF(pj_status_t) pj_media_stream_resume (pj_media_stream_t *channel)
 {
-    PJ_UNUSED_ARG(channel)
+    PJ_UNUSED_ARG(channel);
     return -1;
 }