Changeset 3323:043a35dd07e5 in roaraudio for libroar/vio_rtp.c
- Timestamp:
- 02/03/10 23:26:06 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/vio_rtp.c
r3289 r3323 331 331 int roar_vio_rtp_ctl (struct roar_vio_calls * vio, int cmd, void * data) { 332 332 struct roar_rtp_inst * self = vio->inst; 333 struct roar_stream * s = NULL; 334 struct roar_stream_server * ss = NULL; 333 struct roar_stream * s = NULL; 334 struct roar_stream_server * ss = NULL; 335 struct roar_audio_info * info = NULL; 335 336 336 337 ROAR_DBG("roar_vio_rtp_ctl(vio=%p, cmd=%i, data=%p) = ?", vio, cmd, data); … … 344 345 case ROAR_VIO_CTL_SET_SSTREAM: 345 346 s = ROAR_STREAM(ss = data); 347 info = &(s->info); 346 348 break; 347 349 case ROAR_VIO_CTL_SET_STREAM: 348 350 s = ROAR_STREAM(data); 351 info = &(s->info); 352 break; 353 case ROAR_VIO_CTL_SET_AUINFO: 354 info = data; 349 355 break; 350 356 case ROAR_VIO_CTL_GET_NEXT: … … 360 366 ROAR_DBG("roar_vio_rtp_ctl(vio=%p, cmd=%i, data=%p) = ?", vio, cmd, data); 361 367 362 if ( s!= NULL ) {363 switch ( s->info.codec) {368 if ( info != NULL ) { 369 switch (info->codec) { 364 370 case ROAR_CODEC_PCM_S_LE: 365 371 case ROAR_CODEC_PCM_S_PDP: 366 s->info.codec = ROAR_CODEC_PCM_S_BE;372 info->codec = ROAR_CODEC_PCM_S_BE; 367 373 break; 368 374 case ROAR_CODEC_PCM_U_LE: 369 375 case ROAR_CODEC_PCM_U_PDP: 370 s->info.codec = ROAR_CODEC_PCM_U_BE;376 info->codec = ROAR_CODEC_PCM_U_BE; 371 377 break; 372 378 } 373 379 374 memcpy(&(self->info), &(s->info), sizeof(struct roar_audio_info));375 376 self->header.payload_type = _info2pt( &(s->info));377 378 self->bpf = s->info.channels * s->info.bits / 8;380 memcpy(&(self->info), info, sizeof(struct roar_audio_info)); 381 382 self->header.payload_type = _info2pt(info); 383 384 self->bpf = info->channels * info->bits / 8; 379 385 380 386 roar_vio_ctl(self->vio, cmd, data);
Note: See TracChangeset
for help on using the changeset viewer.