comparison alac.c @ 5368:a31f6ae7e83d libavcodec

Make deinterlace_16 receive an array as a parameter and not two separated vars

5367:1a1f93a4e726

            buffer_out++;
        }
    }
}

static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b,
                           int16_t *buffer_out,
                           int numchannels, int numsamples,
                           uint8_t interlacing_shift,
                           uint8_t interlacing_leftweight)
{

        for (i = 0; i < numsamples; i++) {
            int32_t difference, midright;
            int16_t left;
            int16_t right;

            midright = buffer_a[i];
            difference = buffer_b[i];


            right = midright - ((difference * interlacing_leftweight) >> interlacing_shift);
            left = right + difference;

    /* otherwise basic interlacing took place */
    for (i = 0; i < numsamples; i++) {
        int16_t left, right;

        left = buffer_a[i];
        right = buffer_b[i];

        buffer_out[i*numchannels] = left;
        buffer_out[i*numchannels + 1] = right;
    }
}

    }

    switch(alac->setinfo_sample_size) {
    case 16: {
        if (channels == 2) {
            deinterlace_16(alac->outputsamples_buffer[0],
                           alac->outputsamples_buffer[1],
                           (int16_t*)outbuffer,
                           alac->numchannels,
                           outputsamples,
                           interlacing_shift,
                           interlacing_leftweight);

5368:a31f6ae7e83d

            buffer_out++;
        }
    }
}

static void deinterlace_16(int32_t *buffer[MAX_CHANNELS],
                           int16_t *buffer_out,
                           int numchannels, int numsamples,
                           uint8_t interlacing_shift,
                           uint8_t interlacing_leftweight)
{

        for (i = 0; i < numsamples; i++) {
            int32_t difference, midright;
            int16_t left;
            int16_t right;

            midright = buffer[0][i];
            difference = buffer[1][i];


            right = midright - ((difference * interlacing_leftweight) >> interlacing_shift);
            left = right + difference;

    /* otherwise basic interlacing took place */
    for (i = 0; i < numsamples; i++) {
        int16_t left, right;

        left = buffer[0][i];
        right = buffer[1][i];

        buffer_out[i*numchannels] = left;
        buffer_out[i*numchannels + 1] = right;
    }
}

    }

    switch(alac->setinfo_sample_size) {
    case 16: {
        if (channels == 2) {
            deinterlace_16(alac->outputsamples_buffer,
                           (int16_t*)outbuffer,
                           alac->numchannels,
                           outputsamples,
                           interlacing_shift,
                           interlacing_leftweight);