Changeset 532

Timestamp:

Jun 22, 2006 12:34:27 AM (18 years ago)

Author:

bennylp

Message:

Added memory/buffer based media playback and recording

Location:

pjproject/trunk/pjmedia

Files:

• build/pjmedia.dsp (modified) (2 diffs)
• include/pjmedia/mem_port.h (added)
• include/pjmedia/wav_port.h (modified) (6 diffs)
• src/pjmedia/mem_capture.c (added)
• src/pjmedia/mem_player.c (added)
• src/pjmedia/wav_player.c (modified) (2 diffs)
• src/pjmedia/wav_writer.c (modified) (2 diffs)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -124 +124 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\mem_capture.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\pjmedia\mem_player.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\null_port.c
 # End Source File
@@ -249 +257 @@
 
 SOURCE=..\include\pjmedia\master_port.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\mem_port.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/include/pjmedia/wav_port.h

@@ -63 +63 @@
  *                      negative, the port will use default buffer size (which
  *                      is about 4KB).
- * @param user_data     User data to be associated with the file player port.
  * @param p_port        Pointer to receive the file port instance.
  *
@@ -73 +72 @@
                                                      unsigned flags,
                                                      pj_ssize_t buff_size,
-                                                     void *user_data,
                                                      pjmedia_port **p_port );
 
@@ -107 +105 @@
  *
  * @param port          The file player port.
- * @param user_data     User data to be specified in the callback. Note that
- *                      this overwrites the user data previously set when
- *                      the file port is created.
+ * @param user_data     User data to be specified in the callback
  * @param cb            Callback to be called. If the callback returns non-
  *                      PJ_SUCCESS, the playback will stop. Note that if
@@ -152 +148 @@
  *                          zero or negative, the port will use default buffer
  *                          size (which is about 4KB).
- * @param user_data         User data to be associated with the file port.
- * @param p_port            Pointer to receive the file port instance.
+  * @param p_port           Pointer to receive the file port instance.
  *
  * @return                  PJ_SUCCESS on success.
@@ -165 +160 @@
                                                     unsigned flags,
                                                     pj_ssize_t buff_size,
-                                                    void *user_data,
                                                     pjmedia_port **p_port );
 
@@ -190 +184 @@
  * @param port          The file writer port.
  * @param pos           The file position on which the callback will be called.
- * @param user_data     User data to be specified in the callback. Note that
- *                      this overwrites the user data previously set when
- *                      the file port is created.
+ * @param user_data     User data to be specified in the callback, and will be
+ *                      given on the callback.
  * @param cb            Callback to be called. If the callback returns non-
  *                      PJ_SUCCESS, the writing will stop. Note that if 

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -195 +195 @@
                                                      unsigned options,
                                                      pj_ssize_t buff_size,
-                                                     void *user_data,
                                                      pjmedia_port **p_port )
 {
@@ -294 +293 @@
 
     /* Initialize */
-    fport->base.user_data = user_data;
     fport->options = options;
 

pjproject/trunk/pjmedia/src/pjmedia/wav_writer.c

@@ -65 +65 @@
                                                      unsigned flags,
                                                      pj_ssize_t buff_size,
-                                                     void *user_data,
                                                      pjmedia_port **p_port )
 {
@@ -74 +73 @@
 
     PJ_UNUSED_ARG(flags);
-    PJ_UNUSED_ARG(user_data);
 
     /* Check arguments. */