Changeset 876:b8c42b09b8f7 in roaraudio for libroardsp
- Timestamp:
- 10/21/08 22:59:07 (16 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroardsp/convert.c
r875 r876 353 353 } 354 354 } else { 355 if ( out == in )356 return 0;357 358 memcpy(out, in, samples * bits / 8);355 return -1; 356 } 357 } else { 358 if ( out == in ) 359 359 return 0; 360 } 361 } 362 363 return -1; 364 } 365 366 int raor_conv_codec (void * out, void * in, int samples, int from, int to, int bits) { 360 361 memcpy(out, in, samples * bits / 8); 362 return 0; 363 } 364 365 return 0; 366 } 367 368 int roar_conv_codec (void * out, void * in, int samples, int from, int to, int bits) { 367 369 int inbo = ROAR_CODEC_BYTE_ORDER(from), outbo = ROAR_CODEC_BYTE_ORDER(to); 368 370 int ins = ROAR_CODEC_IS_SIGNED(from), outs = ROAR_CODEC_IS_SIGNED(to); … … 370 372 371 373 372 ROAR_DBG("r aor_conv_codec(out=%p, in=%p, samples=%i, from=%i(%s), to=%i(%s), bits=%i) = ?",374 ROAR_DBG("roar_conv_codec(out=%p, in=%p, samples=%i, from=%i(%s), to=%i(%s), bits=%i) = ?", 373 375 out, in, samples, from, roar_codec2str(from), to, roar_codec2str(to), bits); 374 376 … … 458 460 } 459 461 462 ROAR_DBG("roar_conv_endian(out=%p, in=%p, samples=%i, from=%i, to=%i, bits=%i) = ?", out, in, samples, from, to, bits); 463 460 464 if ( from == to ) { 461 465 if ( in != out ) { 462 466 memcpy(out, in, samples * bits / 8); 463 return 0;464 }465 467 } 468 return 0; 469 } else { 466 470 if ( bits == 16 ) { 467 471 // in this case we can only have LE vs. BE, so, only need to swap: 472 ROAR_DBG("roar_conv_endian(*): Doing 16 bit byteswap"); 468 473 return roar_conv_endian_16(out, in, samples); 469 474 } else if ( bits == 24 ) { … … 574 579 // for the moment: guess out >= in 575 580 581 ROAR_DBG("roar_conv(*): bo conv: %i->%i(native)", ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN); 582 576 583 if ( ROAR_CODEC_BYTE_ORDER(from->codec) != ROAR_CODEC_NATIVE_ENDIAN ) { 577 if ( roar_conv_endian(out, ip, samples, ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN, to->bits) == -1 ) 584 ROAR_DBG("roar_conv(*): doing bo input conv"); 585 if ( roar_conv_endian(out, ip, samples, ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN, from->bits) == -1 ) 578 586 return -1; 579 587 else … … 597 605 /* 598 606 if ( from->codec != to->codec ) { 599 if ( r aor_conv_codec (out, ip, samples, from->codec, to->codec, to->bits) == -1 )607 if ( roar_conv_codec (out, ip, samples, from->codec, to->codec, to->bits) == -1 ) 600 608 return -1; 601 609 else
Note: See TracChangeset
for help on using the changeset viewer.