Changeset 2438 for pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/sound.h

Timestamp:

Feb 5, 2009 10:59:14 AM (15 years ago)

Author:

nanang

Message:

• Added new API for sound & sound port to create/open sound device with extended setting, to allow opening sound device with non-PCM format and other settings.
• Updated symbian_ua/ua.cpp to be able to reopen sound device when audio stream session is using non-PCM data/passthrough codec.
• Updated stream.c to allow it works with non-PCM data.
• Added PCMU/A frames processing into non-PCM play/record callbacks in symbian_audio_aps.cpp.
• Added passthrough codec init/deinitialization in pjsua-lib.
• Added a new pjmedia_frame_ext helper function, pjmedia_frame_ext_pop_subframes, to pop-out/remove some subframes.
• Other minor updates/fixes.

File:

• pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/sound.h (modified) (2 diffs)

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/sound.h

@@ -92 +92 @@
     unsigned    play_latency;       /**< Playback latency, in samples.      */
 } pjmedia_snd_stream_info;
+
+
+/** 
+ * Stream setting for opening sound device with non-PCM data.
+ */
+typedef struct pjmedia_snd_setting
+{
+    pjmedia_fourcc      format;   /**< Format (FourCC ID).          */ 
+    pj_uint32_t         bitrate;  /**< Bitrate (bps).               */
+    pj_uint32_t         mode;     /**< Mode, e.g: iLBC format has
+                                       20ms or 30ms frame size.     */
+    pj_bool_t           plc;      /**< PLC enabled/disabled.        */
+    pj_bool_t           vad;      /**< VAD enabled/disabled.        */
+    pj_bool_t           cng;      /**< CNG enabled/disabled.        */
+    pj_bool_t           loudspk;  /**< Audio routed to loudspeaker. */
+} pjmedia_snd_setting;
 
 
@@ -274 +290 @@
 
 /**
+ * Create sound stream for capturing audio and/or audio playback, from the 
+ * same device. This also allows opening sound stream with extended settings, 
+ * e.g: stream format, see #pjmedia_snd_setting.
+ *
+ * @param dir               Sound stream direction.
+ * @param rec_id            Device index for recorder/capture stream, or
+ *                          -1 to use the first capable device.
+ * @param play_id           Device index for playback stream, or -1 to use 
+ *                          the first capable device.
+ * @param clock_rate        Sound device's clock rate to set.
+ * @param channel_count     Set number of channels, 1 for mono, or 2 for
+ *                          stereo. The channel count determines the format
+ *                          of the frame.
+ * @param samples_per_frame Number of samples per frame.
+ * @param bits_per_sample   Set the number of bits per sample. The normal 
+ *                          value for this parameter is 16 bits per sample.
+ * @param rec_cb            Callback to handle captured audio samples.
+ * @param play_cb           Callback to be called when the sound player needs
+ *                          more audio samples to play.
+ * @param user_data         User data to be associated with the stream.
+ * @param setting           Sound device extended setting.
+ * @param p_snd_strm        Pointer to receive the stream instance.
+ *
+ * @return                  PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_snd_open2( pjmedia_dir dir,
+                                        int rec_id,
+                                        int play_id,
+                                        unsigned clock_rate,
+                                        unsigned channel_count,
+                                        unsigned samples_per_frame,
+                                        unsigned bits_per_sample,
+                                        pjmedia_snd_rec_cb rec_cb,
+                                        pjmedia_snd_play_cb play_cb,
+                                        void *user_data,
+                                        const pjmedia_snd_setting *setting,
+                                        pjmedia_snd_stream **p_snd_strm);
+
+
+/**
  * Get information about live stream.
  *