Changeset 3323:043a35dd07e5 in roaraudio

Timestamp:

02/03/10 23:26:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support ROAR_VIO_CTL_SET_AUINFO

File:

• libroar/vio_rtp.c (modified) (3 diffs)

libroar/vio_rtp.c

@@ -331 +331 @@
 int     roar_vio_rtp_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
  struct roar_rtp_inst * self = vio->inst;
- struct roar_stream          * s  = NULL;
- struct roar_stream_server   * ss = NULL;
+ struct roar_stream          * s    = NULL;
+ struct roar_stream_server   * ss   = NULL;
+ struct roar_audio_info      * info = NULL;
 
  ROAR_DBG("roar_vio_rtp_ctl(vio=%p, cmd=%i, data=%p) = ?", vio, cmd, data);
@@ -344 +345 @@
   case ROAR_VIO_CTL_SET_SSTREAM:
     s = ROAR_STREAM(ss = data);
+    info = &(s->info);
    break;
   case ROAR_VIO_CTL_SET_STREAM:
     s = ROAR_STREAM(data);
+    info = &(s->info);
+   break;
+  case ROAR_VIO_CTL_SET_AUINFO:
+    info = data;
    break;
   case ROAR_VIO_CTL_GET_NEXT:
@@ -360 +366 @@
  ROAR_DBG("roar_vio_rtp_ctl(vio=%p, cmd=%i, data=%p) = ?", vio, cmd, data);
 
- if ( s != NULL ) {
-  switch (s->info.codec) {
+ if ( info != NULL ) {
+  switch (info->codec) {
    case ROAR_CODEC_PCM_S_LE:
    case ROAR_CODEC_PCM_S_PDP:
-     s->info.codec = ROAR_CODEC_PCM_S_BE;
+     info->codec = ROAR_CODEC_PCM_S_BE;
     break;
    case ROAR_CODEC_PCM_U_LE:
    case ROAR_CODEC_PCM_U_PDP:
-     s->info.codec = ROAR_CODEC_PCM_U_BE;
+     info->codec = ROAR_CODEC_PCM_U_BE;
     break;
   }
 
-  memcpy(&(self->info), &(s->info), sizeof(struct roar_audio_info));
-
-  self->header.payload_type = _info2pt(&(s->info));
-
-  self->bpf                 = s->info.channels * s->info.bits / 8;
+  memcpy(&(self->info), info, sizeof(struct roar_audio_info));
+
+  self->header.payload_type = _info2pt(info);
+
+  self->bpf                 = info->channels * info->bits / 8;
 
   roar_vio_ctl(self->vio, cmd, data);