Changeset 2096:40ce6a9c8492 in roaraudio

Timestamp:

07/20/09 20:00:15 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

started with roar_conv2(), still need to add support to convert codec and rate

File:

• libroardsp/convert.c (modified) (2 diffs)

libroardsp/convert.c

@@ -738 +738 @@
  size_t samples;
  size_t needed_buffer;
+ void   * cin = in;
+ struct roar_audio_info cinfo;
+
+ memcpy(&cinfo, from, sizeof(cinfo));
 
  // calcumate number of input samples:
@@ -754 +758 @@
   return -1;
 
- return -1;
+ if ( ROAR_CODEC_BYTE_ORDER(from->codec) != ROAR_CODEC_NATIVE_ENDIAN ) {
+  ROAR_DBG("roar_conv(*): doing bo input conv");
+  if ( roar_conv_endian(out, cin, samples,
+       ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN, from->bits) == -1 ) {
+   return -1;
+  }
+  cin = out;
+ }
+
+ if ( to->bits > from->bits ) {
+  if ( roar_conv_bits(out, cin, samples, from->bits, to->bits) == -1 )
+   return -1;
+
+  cin        = out;
+  cinfo.bits = to->bits;
+ }
+
+ if ( to->channels > from->channels ) {
+  if ( roar_conv_chans(out, cin, samples, from->channels, to->channels, cinfo.bits) == -1 )
+   return -1;
+
+  cin            = out;
+  cinfo.channels = to->channels;
+ }
+
+//--//
+
+ if ( cinfo.channels != to->channels ) {
+  if ( roar_conv_chans(out, cin, samples, cinfo.channels, to->channels, cinfo.bits) == -1 )
+   return -1;
+
+  cin            = out;
+  cinfo.channels = to->channels;
+ }
+
+ if ( cinfo.bits != to->bits ) {
+  if ( roar_conv_bits(out, cin, samples, cinfo.bits, to->bits) == -1 )
+   return -1;
+
+  cin        = out;
+  cinfo.bits = to->bits;
+ }
+
+ if ( ROAR_CODEC_BYTE_ORDER(to->codec) != ROAR_CODEC_NATIVE_ENDIAN ) {
+  ROAR_DBG("roar_conv(*): doing bo output conv");
+  if ( roar_conv_endian(out, cin, samples,
+       ROAR_CODEC_NATIVE_ENDIAN, ROAR_CODEC_BYTE_ORDER(to->codec), to->bits) == -1 ) {
+   return -1;
+  }
+  cin = out;
+ }
+
+ return 0;
 }