swr: add set_audiodata_fmt() and use it to simplify code

Michael Niedermayer committed 14 years ago

Commit 2d6c29f1 parent 65722e72 files · +11 −11Browse files

Unified · Split

2 files

libswresample/swresample.c +11 −10
libswresample/swresample_internal.h +0 −1

     return s;
 }
+static void set_audiodata_fmt(AudioData *a, enum AVSampleFormat fmt){
+    a->bps   = av_get_bytes_per_sample(fmt);
+    a->planar= av_sample_fmt_is_planar(fmt);
+}
 static void free_temp(AudioData *a){
     av_free(a->data);
     s->flushed = 0;
-    s-> in.planar= av_sample_fmt_is_planar(s-> in_sample_fmt);
-    s->out.planar= av_sample_fmt_is_planar(s->out_sample_fmt);
     if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){
         av_log(s, AV_LOG_ERROR, "Requested input sample format %d is invalid\n", s->in_sample_fmt);
         return AVERROR(EINVAL);
         return AVERROR(EINVAL);
     }
+    set_audiodata_fmt(&s-> in, s-> in_sample_fmt);
+    set_audiodata_fmt(&s->out, s->out_sample_fmt);
     if (s->out_sample_rate!=s->in_sample_rate || (s->flags & SWR_FLAG_RESAMPLE)){
         s->resample = swri_resample_init(s->resample, s->out_sample_rate, s->in_sample_rate, s->filter_size, s->phase_shift, s->linear_interp, s->cutoff, s->int_sample_fmt);
     }else
 av_assert0(s->out.ch_count);
     s->resample_first= RSC*s->out.ch_count/s->in.ch_count - RSC < s->out_sample_rate/(float)s-> in_sample_rate - 1.0;
-    s-> in.bps= av_get_bytes_per_sample(s-> in_sample_fmt);
-    s->int_bps= av_get_bytes_per_sample(s->int_sample_fmt);
-    s->out.bps= av_get_bytes_per_sample(s->out_sample_fmt);
     s->in_buffer= s->in;
     if(!s->resample && !s->rematrix && !s->channel_map){
             s->in_buffer.ch_count = s->out.ch_count;
     }
-    s->postin.bps    = s->midbuf.bps    = s->preout.bps    =  s->int_bps;
+    set_audiodata_fmt(&s->postin, s->int_sample_fmt);
-    s->postin.planar = s->midbuf.planar = s->preout.planar =  1;
+    set_audiodata_fmt(&s->midbuf, s->int_sample_fmt);
+    set_audiodata_fmt(&s->preout, s->int_sample_fmt);
     if(s->resample){
-        s->in_buffer.bps    = s->int_bps;
+        set_audiodata_fmt(&s->in_buffer, s->int_sample_fmt);
-        s->in_buffer.planar = 1;
     }
     s->dither = s->preout;

libswresample/swresample_internal.h+0−1

@@ -57,7 +57,6 @@ struct SwrContext { · 56 unmodified lines
57	int linear_interp; /*< if 1 then the resampling FIR filter will be linearly interpolated /	57	int linear_interp; /*< if 1 then the resampling FIR filter will be linearly interpolated /
58	double cutoff; /*< resampling cutoff frequency. 1.0 corresponds to half the output sample rate /	58	double cutoff; /*< resampling cutoff frequency. 1.0 corresponds to half the output sample rate /
59		59
60	int int_bps; ///< internal bytes per sample
61	int resample_first; ///< 1 if resampling must come first, 0 if rematrixing	60	int resample_first; ///< 1 if resampling must come first, 0 if rematrixing
62	int rematrix; ///< flag to indicate if rematrixing is needed (basically if input and output layouts mismatch)	61	int rematrix; ///< flag to indicate if rematrixing is needed (basically if input and output layouts mismatch)
63	int rematrix_custom; ///< flag to indicate that a custom matrix has been defined	62	int rematrix_custom; ///< flag to indicate that a custom matrix has been defined

swr: add set_audiodata_fmt() and use it to simplify code

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code