comparison adpcm.c @ 4807:30ac525752b9 libavcodec

prev1/2 -> prev[2]

4806:52cb2800e26c

    case CODEC_ID_ADPCM_THP:
      {
        GetBitContext gb;
        int table[2][16];
        unsigned int samplecnt;
        int prev1[2], prev2[2];
        int ch;

        if (buf_size < 80) {
            av_log(avctx, AV_LOG_ERROR, "frame too small\n");
            return -1;

        for (i = 0; i < 32; i++)
            table[0][i] = get_sbits(&gb, 16);

        /* Initialize the previous sample.  */
        for (ch = 0; ch < 2; ch++) {
            prev1[ch] = get_sbits(&gb, 16);
            prev2[ch] = get_sbits(&gb, 16);
        }

        if (samplecnt >= (samples_end - samples) /  (st + 1)) {
            av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n");
            return -1;

                /* Decode 14 samples.  */
                for (n = 0; n < 14; n++) {
                    int sampledat = get_sbits (&gb, 4);

                    *samples = ((prev1[ch]*factor1
                                + prev2[ch]*factor2) >> 11) + (sampledat << exp);
                    prev2[ch] = prev1[ch];
                    prev1[ch] = *samples++;

                    /* In case of stereo, skip one sample, this sample
                       is for the other channel.  */
                    samples += st;
                }

4807:30ac525752b9

    case CODEC_ID_ADPCM_THP:
      {
        GetBitContext gb;
        int table[2][16];
        unsigned int samplecnt;
        int prev[2][2];
        int ch;

        if (buf_size < 80) {
            av_log(avctx, AV_LOG_ERROR, "frame too small\n");
            return -1;

        for (i = 0; i < 32; i++)
            table[0][i] = get_sbits(&gb, 16);

        /* Initialize the previous sample.  */
        for (ch = 0; ch < 2; ch++) {
            prev[ch][0] = get_sbits(&gb, 16);
            prev[ch][1] = get_sbits(&gb, 16);
        }

        if (samplecnt >= (samples_end - samples) /  (st + 1)) {
            av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n");
            return -1;

                /* Decode 14 samples.  */
                for (n = 0; n < 14; n++) {
                    int sampledat = get_sbits (&gb, 4);

                    *samples = ((prev[ch][0]*factor1
                                + prev[ch][1]*factor2) >> 11) + (sampledat << exp);
                    prev[ch][1] = prev[ch][0];
                    prev[ch][0] = *samples++;

                    /* In case of stereo, skip one sample, this sample
                       is for the other channel.  */
                    samples += st;
                }