Changeset 1174

Timestamp:

Apr 7, 2007 4:17:33 PM (17 years ago)

Author:

bennylp

Message:

mv resample.c resample_resample.c

Location:

pjproject/branches/split-3rd-party/pjmedia/src/pjmedia

Files:

• resample_resample.c (moved) (moved from pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/resample.c) (3 diffs)
• resample_speex.c (modified) (5 diffs)

pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/resample_resample.c

@@ -478 +478 @@
                                              pj_bool_t high_quality,
                                              pj_bool_t large_filter,
+                                             unsigned channel_count,
                                              unsigned rate_in,
                                              unsigned rate_out,
@@ -490 +491 @@
     resample = pj_pool_alloc(pool, sizeof(pjmedia_resample));
     PJ_ASSERT_RETURN(resample, PJ_ENOMEM);
+
+    PJ_UNUSED_ARG(channel_count);
 
     /*
@@ -703 +706 @@
 }
 
+PJ_DEF(void) pjmedia_resample_destroy(pjmedia_resample *resample)
+{
+    PJ_UNUSED_ARG(resample);
+}

pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/resample_speex.c

@@ -32 +32 @@
 {
     SpeexResamplerState *state;
-#if defined(PJ_HAS_FLOATING_POINT) && PJ_HAS_FLOATING_POINT != 0
-    float               *in_buffer;
-    float               *out_buffer;
-#endif
     unsigned             in_samples_per_frame;
     unsigned             out_samples_per_frame;
@@ -62 +58 @@
     if (high_quality) {
         if (large_filter)
-            quality = 8;
+            quality = 10;
         else
             quality = 7;
@@ -76 +72 @@
         return PJ_ENOMEM;
 
-#if defined(PJ_HAS_FLOATING_POINT) && PJ_HAS_FLOATING_POINT != 0
-    resample->in_buffer = pj_pool_calloc(pool, resample->in_samples_per_frame, 
-                                         sizeof(float));
-    resample->out_buffer=pj_pool_calloc(pool, resample->out_samples_per_frame,
-                                        sizeof(float));
-#endif
 
     *p_resample = resample;
@@ -97 +87 @@
 {
     spx_uint32_t in_length, out_length;
-    float *fp;
-    unsigned i;
 
     PJ_ASSERT_ON_FAIL(resample, return);
@@ -105 +93 @@
     out_length = resample->out_samples_per_frame;
 
-#if defined(PJ_HAS_FLOATING_POINT) && PJ_HAS_FLOATING_POINT != 0
-    fp = resample->in_buffer;
-    for (i=0; i<in_length; ++i) {
-        fp[i] = input[i];
-    }
-    speex_resampler_process_interleaved_float(resample->state,
-                                              resample->in_buffer, &in_length,
-                                              resample->out_buffer, &out_length);
-    fp = resample->out_buffer;
-    for (i=0; i<out_length; ++i) {
-        output[i] = (pj_int16_t)fp[i];
-    }
-#else
-    PJ_UNUSED_ARG(dst);
-    PJ_UNUSED_ARG(i);
     speex_resampler_process_interleaved_int(resample->state,
                                             (const __int16 *)input, &in_length,
                                             (__int16 *)output, &out_length);
-#endif
 
     pj_assert(in_length == resample->in_samples_per_frame);