| @@ -153,6 +153,10 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s, · 152 unmodified lines |
| 153 | 153 | return s; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | +static void set_audiodata_fmt(AudioData *a, enum AVSampleFormat fmt){ |
| 157 | + a->bps = av_get_bytes_per_sample(fmt); |
| 158 | + a->planar= av_sample_fmt_is_planar(fmt); |
| 159 | +} |
| 156 | 160 | |
| 157 | 161 | static void free_temp(AudioData *a){ |
| 158 | 162 | av_free(a->data); |
| @@ -191,9 +195,6 @@ int swr_init(struct SwrContext *s){ · 32 unmodified lines |
| 191 | 195 | |
| 192 | 196 | s->flushed = 0; |
| 193 | 197 | |
| 194 | | − s-> in.planar= av_sample_fmt_is_planar(s-> in_sample_fmt); |
| 195 | | − s->out.planar= av_sample_fmt_is_planar(s->out_sample_fmt); |
| 196 | | − |
| 197 | 198 | if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){ |
| 198 | 199 | av_log(s, AV_LOG_ERROR, "Requested input sample format %d is invalid\n", s->in_sample_fmt); |
| 199 | 200 | return AVERROR(EINVAL); |
| @@ -216,6 +217,9 @@ int swr_init(struct SwrContext *s){ · 16 unmodified lines |
| 216 | 217 | return AVERROR(EINVAL); |
| 217 | 218 | } |
| 218 | 219 | |
| 220 | + set_audiodata_fmt(&s-> in, s-> in_sample_fmt); |
| 221 | + set_audiodata_fmt(&s->out, s->out_sample_fmt); |
| 222 | + |
| 219 | 223 | if (s->out_sample_rate!=s->in_sample_rate || (s->flags & SWR_FLAG_RESAMPLE)){ |
| 220 | 224 | 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); |
| 221 | 225 | }else |
| @@ -267,9 +271,6 @@ av_assert0(s->used_ch_count); · 45 unmodified lines |
| 267 | 271 | av_assert0(s->out.ch_count); |
| 268 | 272 | s->resample_first= RSC*s->out.ch_count/s->in.ch_count - RSC < s->out_sample_rate/(float)s-> in_sample_rate - 1.0; |
| 269 | 273 | |
| 270 | | − s-> in.bps= av_get_bytes_per_sample(s-> in_sample_fmt); |
| 271 | | − s->int_bps= av_get_bytes_per_sample(s->int_sample_fmt); |
| 272 | | − s->out.bps= av_get_bytes_per_sample(s->out_sample_fmt); |
| 273 | 274 | s->in_buffer= s->in; |
| 274 | 275 | |
| 275 | 276 | if(!s->resample && !s->rematrix && !s->channel_map){ |
| @@ -300,12 +301,12 @@ av_assert0(s->out.ch_count); · 24 unmodified lines |
| 300 | 301 | s->in_buffer.ch_count = s->out.ch_count; |
| 301 | 302 | } |
| 302 | 303 | |
| 303 | | − s->postin.bps = s->midbuf.bps = s->preout.bps = s->int_bps; |
| 304 | | − s->postin.planar = s->midbuf.planar = s->preout.planar = 1; |
| 304 | + set_audiodata_fmt(&s->postin, s->int_sample_fmt); |
| 305 | + set_audiodata_fmt(&s->midbuf, s->int_sample_fmt); |
| 306 | + set_audiodata_fmt(&s->preout, s->int_sample_fmt); |
| 305 | 307 | |
| 306 | 308 | if(s->resample){ |
| 307 | | − s->in_buffer.bps = s->int_bps; |
| 308 | | − s->in_buffer.planar = 1; |
| 309 | + set_audiodata_fmt(&s->in_buffer, s->int_sample_fmt); |
| 309 | 310 | } |
| 310 | 311 | |
| 311 | 312 | s->dither = s->preout; |