Changeset 480 for pjproject/trunk

Timestamp:

May 28, 2006 2:51:21 PM (19 years ago)

Author:

bennylp

Message:

Added set_pos() to WAV player

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/wav_port.h (modified) (3 diffs)
• src/pjmedia/wav_player.c (modified) (1 diff)

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

@@ -58 +58 @@
 
 /**
+ * Set the play position of WAV player.
+ *
+ * @param port          The file player port.
+ * @param samples       Sample position (zero as start of file).
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_wav_player_port_set_pos( pjmedia_port *port,
+                                                      pj_uint32_t samples );
+
+
+/**
  * Create a media port to record streams to a WAV file. Note that the port
  * must be closed properly (with #pjmedia_port_destroy()) so that the WAV
@@ -64 +76 @@
  * @param pool          Pool to create memory buffers for this port.
  * @param filename      File name.
- * @param flags         Port creation flags.
+ * @param clock_rate    The sampling rate.
+ * @param channel_count Number of channels.
+ * @param samples_per_frame Number of samples per frame.
+ * @param bits_per_sampe Number of bits per sample (eg 16).
+ * @param flags         Port creation flags (must be 0 at present).
  * @param buf_size      Buffer size to be allocated. If the value is zero or
  *                      negative, the port will use default buffer size (which
@@ -73 +89 @@
  * @return              PJ_SUCCESS on success.
  */
-PJ_DECL(pj_status_t) pjmedia_wav_writer_port_create( pj_pool_t *pool,
-                                                      const char *filename,
-                                                      unsigned sampling_rate,
-                                                      unsigned channel_count,
-                                                      unsigned samples_per_frame,
-                                                      unsigned bits_per_sample,
-                                                      unsigned flags,
-                                                      pj_ssize_t buff_size,
-                                                      void *user_data,
-                                                      pjmedia_port **p_port );
+PJ_DECL(pj_status_t) pjmedia_wav_writer_port_create(pj_pool_t *pool,
+                                                    const char *filename,
+                                                    unsigned clock_rate,
+                                                    unsigned channel_count,
+                                                    unsigned samples_per_frame,
+                                                    unsigned bits_per_sample,
+                                                    unsigned flags,
+                                                    pj_ssize_t buff_size,
+                                                    void *user_data,
+                                                    pjmedia_port **p_port );
 
 

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

@@ -320 +320 @@
 
 /*
+ * Set position.
+ */
+PJ_DEF(pj_status_t) pjmedia_wav_player_port_set_pos(pjmedia_port *port,
+                                                    pj_uint32_t samples )
+{
+    struct file_port *fport;
+
+    PJ_ASSERT_RETURN(port, PJ_EINVAL);
+
+    fport = (struct file_port*) port;
+
+    PJ_ASSERT_RETURN(samples*BYTES_PER_SAMPLE < fport->fsize -
+                      sizeof(pjmedia_wave_hdr), PJ_EINVAL);
+
+    fport->fpos = sizeof(struct pjmedia_wave_hdr) + 
+                    samples * BYTES_PER_SAMPLE;
+    pj_file_setpos( fport->fd, fport->fpos, PJ_SEEK_SET);
+
+    return fill_buffer(fport);
+}
+
+
+/*
  * Put frame to file.
  */