Changeset 3275:8786fd84f600 in roaraudio

Timestamp:

02/01/10 11:31:03 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

implement write()

Files:

• include/libroar/vio_rtp.h (modified) (1 diff)
• libroar/vio_rtp.c (modified) (2 diffs)

include/libroar/vio_rtp.h

@@ -107 +107 @@
  struct roar_vio_calls * vio;
  struct roar_rtp_header header;
+ struct roar_buffer    * tx;
 };
 

libroar/vio_rtp.c

@@ -67 +67 @@
 
 ssize_t roar_vio_rtp_read    (struct roar_vio_calls * vio, void *buf, size_t count);
-ssize_t roar_vio_rtp_write   (struct roar_vio_calls * vio, void *buf, size_t count);
+ssize_t roar_vio_rtp_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
+ struct roar_rtp_inst * self = vio->inst;
+ size_t len_need = count + sizeof(struct roar_rtp_header); // this is a bit more than we need
+                                                           // we ignore this at the moment
+ size_t len_have;
+ union {
+  void     * vp;
+  char     * cp;
+  uint16_t * u16;
+  uint32_t * u32;
+ } data;
+ size_t  dataoffset;
+ ssize_t ret;
+ int     i;
+
+ if ( self->tx == NULL ) {
+  if ( roar_buffer_new(&(self->tx), len_need) == -1 )
+   return -1;
+
+  len_have = len_need;
+ } else {
+  if ( roar_buffer_get_len(self->tx, &len_have) == -1 )
+   return -1;
+
+  if ( len_have < len_need ) {
+   if ( roar_buffer_set_len(self->tx, len_need) == -1 ) {
+    if ( roar_buffer_free(self->tx) == -1 )
+     return -1;
+
+    self->tx = NULL;
+    return roar_vio_rtp_write(vio, buf, count); // restart ower self from the beginning with no buffer
+   }
+  }
+ }
+
+ if ( roar_buffer_get_data(self->tx, &(data.vp)) == -1 )
+  return -1;
+
+ memset(data.vp, 0, len_need);
+
+ data.cp[0]   = 2;
+ data.cp[0]  |= self->header.csrc_count   << 4;
+ data.cp[1]  |= self->header.payload_type << 1;
+
+ data.u16[1]  = self->header.seq_num;
+
+ data.u32[1]  = self->header.ts;
+ data.u32[2]  = self->header.ssrc;
+
+ for (i = 0; i < self->header.csrc_count; i++) {
+  data.u32[3+i] = self->header.csrc[i];
+ }
+
+ dataoffset   = 3*4 + self->header.csrc_count*4;
+
+ memcpy(data.vp + dataoffset, buf, count);
+
+ if ( (ret = roar_vio_write(self->vio, data.vp, count+dataoffset)) == -1 )
+  return -1;
+
+ return ret - dataoffset;
+}
+
 off_t   roar_vio_rtp_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
 
@@ -108 +170 @@
  ret = roar_vio_close(self->vio);
 
+ if ( self->tx != NULL )
+  if ( roar_buffer_free(self->tx) == -1 )
+   ret = -1;
+
  roar_mm_free(self);