← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavresample/audio_convert.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavresample/audio_convert.c
288
288
        return ac;
289
289
    }
290
290
 
291
 
    in_planar  = av_sample_fmt_is_planar(in_fmt);
292
 
    out_planar = av_sample_fmt_is_planar(out_fmt);
 
291
    in_planar  = ff_sample_fmt_is_planar(in_fmt, channels);
 
292
    out_planar = ff_sample_fmt_is_planar(out_fmt, channels);
293
293
 
294
294
    if (in_planar == out_planar) {
295
295
        ac->func_type = CONV_FUNC_TYPE_FLAT;
301
301
 
302
302
    set_generic_function(ac);
303
303
 
 
304
    if (ARCH_AARCH64)
 
305
        ff_audio_convert_init_aarch64(ac);
304
306
    if (ARCH_ARM)
305
307
        ff_audio_convert_init_arm(ac);
306
308
    if (ARCH_X86)
343
345
    if (ac->apply_map) {
344
346
        ChannelMapInfo *map = &ac->avr->ch_map_info;
345
347
 
346
 
        if (!av_sample_fmt_is_planar(ac->out_fmt)) {
 
348
        if (!ff_sample_fmt_is_planar(ac->out_fmt, ac->channels)) {
347
349
            av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
348
350
            return AVERROR(EINVAL);
349
351
        }
350
352
 
351
353
        if (map->do_remap) {
352
 
            if (av_sample_fmt_is_planar(ac->in_fmt)) {
 
354
            if (ff_sample_fmt_is_planar(ac->in_fmt, ac->channels)) {
353
355
                conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
354
356
                                                        ac->conv_flat;
355
357