Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswresample / swresample_test.c

diff --git a/libswresample/swresample_test.c b/libswresample/swresample_test.c
index 1a37bcd5d218c27c4bb1bc79523509003034434c..d41b964ba4cca43ab58e29890a9e0afdffa1e27c 100644 (file)
--- a/libswresample/swresample_test.c
+++ b/libswresample/swresample_test.c
@@ -28,10 +28,10 @@
 
 #define ASSERT_LEVEL 2
 
-static double get(const uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f){
+static double get(uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f){
     const uint8_t *p;
-    if(f>=0x100){
-        f&=0xFF;
+    if(av_sample_fmt_is_planar(f)){
+        f= av_get_alt_sample_fmt(f, 0);
         p= a[ch];
     }else{
         p= a[0];
@@ -44,14 +44,14 @@ static double get(const uint8_t *a[], int ch, int index, int ch_count, enum AVSa
     case AV_SAMPLE_FMT_S32: return ((const int32_t*)p)[index]/2147483647.0;
     case AV_SAMPLE_FMT_FLT: return ((const float  *)p)[index];
     case AV_SAMPLE_FMT_DBL: return ((const double *)p)[index];
-    default: av_assert2(0);
+    default: av_assert0(0);
     }
 }
 
 static void  set(uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f, double v){
     uint8_t *p;
-    if(f>=0x100){
-        f&=0xFF;
+    if(av_sample_fmt_is_planar(f)){
+        f= av_get_alt_sample_fmt(f, 0);
         p= a[ch];
     }else{
         p= a[0];
@@ -86,7 +86,7 @@ AV_CH_LAYOUT_7POINT1_WIDE            ,
 };
 
 static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleFormat format, int samples){
-    if(format >= 0x100){
+    if(av_sample_fmt_is_planar(format)){
         int i;
         int plane_size= av_get_bytes_per_sample(format&0xFF)*samples;
         format&=0xFF;
@@ -109,7 +109,6 @@ int main(int argc, char **argv){
     uint8_t *ain[SWR_CH_MAX];
     uint8_t *aout[SWR_CH_MAX];
     uint8_t *amid[SWR_CH_MAX];
-    int planar_in=256, planar_out=256;
 
     struct SwrContext * forw_ctx= NULL;
     struct SwrContext *backw_ctx= NULL;
@@ -120,22 +119,23 @@ int main(int argc, char **argv){
         for(in_sample_fmt= AV_SAMPLE_FMT_U8; in_sample_fmt<=AV_SAMPLE_FMT_DBL; in_sample_fmt++){
             for(out_sample_fmt= AV_SAMPLE_FMT_U8; out_sample_fmt<=AV_SAMPLE_FMT_DBL; out_sample_fmt++){
                 for(in_ch_layout_index=0; layouts[in_ch_layout_index]; in_ch_layout_index++){
+                    int in_ch_count;
                     in_ch_layout= layouts[in_ch_layout_index];
-                    int in_ch_count= av_get_channel_layout_nb_channels(in_ch_layout);
+                    in_ch_count= av_get_channel_layout_nb_channels(in_ch_layout);
                     for(out_ch_layout_index=0; layouts[out_ch_layout_index]; out_ch_layout_index++){
-                        int out_count, mid_count;
+                        int out_count, mid_count, out_ch_count;
                         out_ch_layout= layouts[out_ch_layout_index];
-                        int out_ch_count= av_get_channel_layout_nb_channels(out_ch_layout);
+                        out_ch_count= av_get_channel_layout_nb_channels(out_ch_layout);
                         fprintf(stderr, "ch %d->%d, rate:%5d->%5d, fmt:%s->%s",
                                in_ch_count, out_ch_count,
                                in_sample_rate, out_sample_rate,
                                av_get_sample_fmt_name(in_sample_fmt), av_get_sample_fmt_name(out_sample_fmt));
-                        forw_ctx  = swr_alloc2(forw_ctx, out_ch_layout, out_sample_fmt+planar_out, out_sample_rate,
-                                                          in_ch_layout,  in_sample_fmt+planar_in ,  in_sample_rate,
-                                                          NULL, 0, 0);
-                        backw_ctx = swr_alloc2(backw_ctx,in_ch_layout,  in_sample_fmt,             in_sample_rate,
-                                                        out_ch_layout, out_sample_fmt+planar_out, out_sample_rate,
-                                                        NULL, 0, 0);
+                        forw_ctx  = swr_alloc_set_opts(forw_ctx, out_ch_layout, av_get_alt_sample_fmt(out_sample_fmt, 1), out_sample_rate,
+                                                                  in_ch_layout, av_get_alt_sample_fmt( in_sample_fmt, 1),  in_sample_rate,
+                                                       0, 0);
+                        backw_ctx = swr_alloc_set_opts(backw_ctx, in_ch_layout,  in_sample_fmt,             in_sample_rate,
+                                                                 out_ch_layout, av_get_alt_sample_fmt(out_sample_fmt, 1), out_sample_rate,
+                                                       0, 0);
                         if(swr_init( forw_ctx) < 0)
                             fprintf(stderr, "swr_init(->) failed\n");
                         if(swr_init(backw_ctx) < 0)
@@ -145,12 +145,12 @@ int main(int argc, char **argv){
                         if(!backw_ctx)
                             fprintf(stderr, "Failed to init backw_ctx\n");
                                //FIXME test planar
-                        setup_array(ain , array_in ,  in_sample_fmt+planar_in ,   SAMPLES);
-                        setup_array(amid, array_mid, out_sample_fmt+planar_out, 3*SAMPLES);
+                        setup_array(ain , array_in , av_get_alt_sample_fmt( in_sample_fmt, 1),   SAMPLES);
+                        setup_array(amid, array_mid, av_get_alt_sample_fmt(out_sample_fmt, 1), 3*SAMPLES);
                         setup_array(aout, array_out,  in_sample_fmt           ,   SAMPLES);
                         for(ch=0; ch<in_ch_count; ch++){
                             for(i=0; i<SAMPLES; i++)
-                                set(ain, ch, i, in_ch_count, in_sample_fmt+planar_in, sin(i*i*3/SAMPLES));
+                                set(ain, ch, i, in_ch_count, av_get_alt_sample_fmt(in_sample_fmt, 1), sin(i*i*3/SAMPLES));
                         }
                         mid_count= swr_convert(forw_ctx, amid, 3*SAMPLES, ain, SAMPLES);
                         out_count= swr_convert(backw_ctx,aout, SAMPLES, amid, mid_count);
@@ -163,7 +163,7 @@ int main(int argc, char **argv){
                             double sum_bb= 0;
                             double sum_ab= 0;
                             for(i=0; i<out_count; i++){
-                                double a= get(ain , ch, i, in_ch_count, in_sample_fmt+planar_in);
+                                double a= get(ain , ch, i, in_ch_count, av_get_alt_sample_fmt(in_sample_fmt, 1));
                                 double b= get(aout, ch, i, in_ch_count, in_sample_fmt);
                                 sum_a += a;
                                 sum_b += b;
@@ -188,7 +188,7 @@ int main(int argc, char **argv){
                                 double sum_bb= 0;
                                 double sum_ab= 0;
                                 for(i=0; i<flush_count; i++){
-                                    double a= get(ain , ch, i+out_count, in_ch_count, in_sample_fmt+planar_in);
+                                    double a= get(ain , ch, i+out_count, in_ch_count, av_get_alt_sample_fmt(in_sample_fmt, 1));
                                     double b= get(aout, ch, i, in_ch_count, in_sample_fmt);
                                     sum_a += a;
                                     sum_b += b;