Changeset 1493 for pjproject/trunk/pjmedia/src/pjmedia/resample_resample.c

Timestamp:

Oct 12, 2007 5:24:32 AM (17 years ago)

Author:

bennylp

Message:

Ticket #398: Initial support for Secret Rabbit Code (aka libsamplerate) sample rate conversionl library

File:

• pjproject/trunk/pjmedia/src/pjmedia/resample_resample.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/resample_resample.c

@@ -26 +26 @@
 
 
-#if defined(PJMEDIA_HAS_LIBRESAMPLE) && PJMEDIA_HAS_LIBRESAMPLE != 0
+#if PJMEDIA_RESAMPLE_IMP==PJMEDIA_RESAMPLE_LIBRESAMPLE
 
 #include <third_party/resample/include/resamplesubs.h>
@@ -216 +216 @@
 
 
-#else /* PJMEDIA_HAS_LIBRESAMPLE */
+#elif PJMEDIA_RESAMPLE_IMP==PJMEDIA_RESAMPLE_NONE
 
 /*
  * This is the configuration when sample rate conversion is disabled.
  */
-struct pjmedia_resample
-{
-        unsigned samples_per_frame;
-};
-
 PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
                                              pj_bool_t high_quality,
@@ -235 +230 @@
                                              pjmedia_resample **p_resample) 
 {
-        pjmedia_resample *resample;
-        
-        PJ_ASSERT_RETURN(rate_in == rate_out, PJ_EINVALIDOP);
-
-        PJ_UNUSED_ARG(high_quality);
-        PJ_UNUSED_ARG(large_filter);
-        PJ_UNUSED_ARG(channel_count);
-        PJ_UNUSED_ARG(rate_in);
-        PJ_UNUSED_ARG(rate_out);
-                
-        resample = PJ_POOL_ZALLOC_T(pool, pjmedia_resample);
-        resample->samples_per_frame = samples_per_frame;
-        
-        *p_resample = resample;
-        
-        return PJ_SUCCESS;
+    PJ_UNUSED_ARG(pool);
+    PJ_UNUSED_ARG(high_quality);
+    PJ_UNUSED_ARG(large_filter);
+    PJ_UNUSED_ARG(channel_count);
+    PJ_UNUSED_ARG(rate_in);
+    PJ_UNUSED_ARG(rate_out);
+    PJ_UNUSED_ARG(samples_per_frame);
+    PJ_UNUSED_ARG(p_resample);
+
+    return PJ_EINVALIDOP;
 }
 
@@ -257 +246 @@
                                    pj_int16_t *output ) 
 {
-        pjmedia_copy_samples(output, input, resample->samples_per_frame);
+    PJ_UNUSED_ARG(resample);
+    PJ_UNUSED_ARG(input);
+    PJ_UNUSED_ARG(output);
 }
 
 PJ_DEF(unsigned) pjmedia_resample_get_input_size(pjmedia_resample *resample) 
 {
-        return resample->samples_per_frame;
+    PJ_UNUSED_ARG(resample);
+    return 0;
 }
 
 PJ_DEF(void) pjmedia_resample_destroy(pjmedia_resample *resample) 
 {
-        PJ_UNUSED_ARG(resample);
-}
-
-#endif  /* PJMEDIA_HAS_LIBRESAMPLE */
-
+    PJ_UNUSED_ARG(resample);
+}
+
+#endif  /* PJMEDIA_RESAMPLE_IMP */
+