comparison dca.c @ 7724:ea9aa2aa4caa libavcodec

dca: Do float -> int16 interleaving in-place using s->dsp.float_to_int16_interleave()

7723:20b105281e87

    int output;                 ///< type of output
    int bias;                   ///< output bias

    DECLARE_ALIGNED_16(float, samples[1536]);  /* 6 * 256 = 1536, might only need 5 */
    DECLARE_ALIGNED_16(int16_t, tsamples[1536]);

    uint8_t dca_buffer[DCA_MAX_FRAME_SIZE];
    int dca_buffer_size;        ///< how much data is in the dca_buffer

    GetBitContext gb;

static int dca_decode_frame(AVCodecContext * avctx,
                            void *data, int *data_size,
                            const uint8_t * buf, int buf_size)
{

    int i, j, k;
    int16_t *samples = data;
    DCAContext *s = avctx->priv_data;
    int channels;

    if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
        return -1;
    *data_size = 0;
    for (i = 0; i < (s->sample_blocks / 8); i++) {
        dca_decode_block(s);
        s->dsp.float_to_int16(s->tsamples, s->samples, 256 * channels);
        /* interleave samples */
        for (j = 0; j < 256; j++) {
            for (k = 0; k < channels; k++)
                samples[k] = s->tsamples[j + k * 256];
            samples += channels;
        }
        *data_size += 256 * sizeof(int16_t) * channels;
    }

    return buf_size;
}

 */

static av_cold int dca_decode_init(AVCodecContext * avctx)
{
    DCAContext *s = avctx->priv_data;

    s->avctx = avctx;
    dca_init_vlcs();
    pre_calc_cosmod(s);

    /* allow downmixing to stereo */
    if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
            avctx->request_channels == 2) {
        avctx->channels = avctx->request_channels;
    }

    avctx->sample_fmt = SAMPLE_FMT_S16;
    return 0;
}

7724:ea9aa2aa4caa

    int output;                 ///< type of output
    int bias;                   ///< output bias

    DECLARE_ALIGNED_16(float, samples[1536]);  /* 6 * 256 = 1536, might only need 5 */
    float *samples_chanptr[6];

    uint8_t dca_buffer[DCA_MAX_FRAME_SIZE];
    int dca_buffer_size;        ///< how much data is in the dca_buffer

    GetBitContext gb;

static int dca_decode_frame(AVCodecContext * avctx,
                            void *data, int *data_size,
                            const uint8_t * buf, int buf_size)
{

    int i;
    int16_t *samples = data;
    DCAContext *s = avctx->priv_data;
    int channels;

    if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
        return -1;
    *data_size = 0;
    for (i = 0; i < (s->sample_blocks / 8); i++) {
        dca_decode_block(s);
        s->dsp.float_to_int16_interleave(samples, s->samples_chanptr, 256, channels);
        samples += 256 * channels;
        *data_size += 256 * sizeof(int16_t) * channels;
    }

    return buf_size;
}

 */

static av_cold int dca_decode_init(AVCodecContext * avctx)
{
    DCAContext *s = avctx->priv_data;
    int i;

    s->avctx = avctx;
    dca_init_vlcs();
    pre_calc_cosmod(s);

    /* allow downmixing to stereo */
    if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
            avctx->request_channels == 2) {
        avctx->channels = avctx->request_channels;
    }
    for(i = 0; i < 6; i++)
        s->samples_chanptr[i] = s->samples + i * 256;
    avctx->sample_fmt = SAMPLE_FMT_S16;
    return 0;
}