Changeset 3288:cc632cc556e7 in roaraudio

Timestamp:

02/01/10 16:40:13 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

beginning support for reading RTP streams

Location:

libroar

Files:

• Makefile (modified) (1 diff)
• vio_rtp.c (modified) (2 diffs)

libroar/Makefile

@@ -10 +10 @@
 OBJS=libroar.o config.o debug.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o pinentry.o sshaskpass.o $(VIO) stack.o slp.o nnode.o
 
-#DEFINES        = -DDEBUG
+DEFINES        = -DDEBUG
 INCLUDE = -I../include -I../include/libroar
 CFLAGS += -g -Wall -O2 $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC)

libroar/vio_rtp.c

@@ -109 +109 @@
 
  calls->inst               = self;
-// calls->read               = roar_vio_rtp_read;
+ calls->read               = roar_vio_rtp_read;
  calls->write              = roar_vio_rtp_write;
 // calls->lseek              = roar_vio_rtp_lseek;
@@ -122 +122 @@
 }
 
-ssize_t roar_vio_rtp_read    (struct roar_vio_calls * vio, void *buf, size_t count);
+ssize_t roar_vio_rtp_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
+ struct roar_rtp_inst * self = vio->inst;
+ size_t len_need = self->mtu * 4 + sizeof(struct roar_rtp_header); // we hope to never get pkgs with size > 4*mtu
+ size_t len_have;
+ size_t have = 0;
+ ssize_t ret;
+ union {
+  void     * vp;
+  char     * cp;
+  uint16_t * u16;
+  uint32_t * u32;
+ } data;
+ size_t  dataoffset;
+ int     i;
+
+ ROAR_DBG("roar_vio_rtp_read(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned)count);
+
+ if ( self->rx_decoded != NULL ) {
+  // handle this case and set to NULL if the buffer is empty
+  // set have;
+  // increment buf, decrement count
+ }
+
+ if ( count == 0 )
+  return have;
+
+ if ( self->io == NULL ) {
+  if ( roar_buffer_new(&(self->io), len_need) == -1 )
+   return have ? have : -1;
+
+  len_have = len_need;
+ } else {
+  if ( roar_buffer_get_len(self->io, &len_have) == -1 )
+   return have ? have : -1;
+
+  if ( len_have < len_need ) {
+   if ( roar_buffer_set_len(self->io, len_need) == -1 ) {
+    if ( roar_buffer_free(self->io) == -1 )
+     return have ? have : -1;
+
+    self->io = NULL;
+    if ( have != 0 ) {
+     return have;
+    } else {
+     return roar_vio_rtp_read(vio, buf, count); // restart ower self from the beginning with no buffer
+    }
+   }
+  }
+ }
+
+ if ( roar_buffer_get_data(self->io, &(data.vp)) == -1 )
+  return have ? have : -1;
+
+ if ( (ret = roar_vio_read(self->vio, data.vp, len_need)) == -1 )
+  return have ? have : -1;
+
+ if ( (data.cp[0] && 0x02) == 0x02 ) /* version check */
+  return have ? have : -1;
+
+ self->header.csrc_count   = (data.cp[0] & 0xF0) >> 4;
+ self->header.payload_type = (data.cp[1] & 0xFE) >> 1;
+
+ // TODO: check old seqnum < new seqnum
+ self->header.seq_num      = data.u16[1];
+
+ // TODO: check timestamp:
+ self->header.ts           = data.u32[1];
+
+ self->header.ssrc         = data.u32[2];
+
+ for (i = 0; i < self->header.csrc_count; i++) {
+  self->header.csrc[i]     = data.u32[3+i];
+ }
+
+ dataoffset   = 3*4 + self->header.csrc_count*4;
+
+ ret     -= dataoffset;
+ data.vp += dataoffset;
+
+ if ( ret <= count ) {
+  memcpy(buf, data.vp, ret);
+  ROAR_DBG("roar_vio_rtp_read(vio=%p, buf=%p, count=?) = %llu", vio, buf, (long long unsigned)(have+ret));
+  return have + ret;
+ } else {
+ }
+
+ ROAR_DBG("roar_vio_rtp_read(vio=%p, buf=%p, count=?) = -1", vio, buf);
+ return -1;
+}
+
 ssize_t roar_vio_rtp_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct roar_rtp_inst * self = vio->inst;