comparison aaccoder.c @ 9939:6c5a58b34997 libavcodec

Turn on AAC rate control.

9938:6c1ac45b3097

        }
        put_bits(&s->pb, run_bits, count);
    }
}

static void encode_window_bands_info_fixed(AACEncContext *s,
                                           SingleChannelElement *sce,
                                           int win, int group_len,
                                           const float lambda)
{
    encode_window_bands_info(s, sce, win, group_len, 1.0f);
}


typedef struct TrellisPath {
    float cost;
    int prev;
    int min_val;
    int max_val;

                            dist += quantize_band_cost(s, coefs + w2*128,
                                                       scaled + w2*128,
                                                       sce->ics.swb_sizes[g],
                                                       sce->sf_idx[w*16+g],
                                                       ESC_BT,
                                                       1.0,
                                                       INFINITY,
                                                       &b);
                            bb += b;
                        }
                        if (dist < mindist) {
                            mindist = dist;
                            minbits = bb;
                        }
                    }
                    dists[w*16+g] = mindist - minbits;
                    bits = minbits;
                    if (prev != -1) {
                        bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO];
                    }
                    tbits += bits;

                    dist += quantize_band_cost(s, coefs + w2*128,
                                               scaled + w2*128,
                                               sce->ics.swb_sizes[g],
                                               scf,
                                               ESC_BT,
                                               1.0,
                                               INFINITY,
                                               &b);
                    dist -= b;
                }
                dist *= 1.0f/512.0f;
                quant_max = quant(maxq[w*16+g], ff_aac_pow2sf_tab[200 - scf + SCALE_ONE_POS - SCALE_DIV_512]);
                if (quant_max >= 8191) { // too much, return to the previous quantizer
                    sce->sf_idx[w*16+g] = prev_scf;
                    break;
                }

}

AACCoefficientsEncoder ff_aac_coders[] = {
    {
        search_for_quantizers_faac,
        encode_window_bands_info_fixed,
        quantize_and_encode_band,
//        search_for_ms,
    },
    {
        search_for_quantizers_anmr,

9939:6c5a58b34997

        }
        put_bits(&s->pb, run_bits, count);
    }
}

typedef struct TrellisPath {
    float cost;
    int prev;
    int min_val;
    int max_val;

                            dist += quantize_band_cost(s, coefs + w2*128,
                                                       scaled + w2*128,
                                                       sce->ics.swb_sizes[g],
                                                       sce->sf_idx[w*16+g],
                                                       ESC_BT,
                                                       lambda,
                                                       INFINITY,
                                                       &b);
                            bb += b;
                        }
                        if (dist < mindist) {
                            mindist = dist;
                            minbits = bb;
                        }
                    }
                    dists[w*16+g] = (mindist - minbits) / lambda;
                    bits = minbits;
                    if (prev != -1) {
                        bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO];
                    }
                    tbits += bits;

                    dist += quantize_band_cost(s, coefs + w2*128,
                                               scaled + w2*128,
                                               sce->ics.swb_sizes[g],
                                               scf,
                                               ESC_BT,
                                               lambda,
                                               INFINITY,
                                               &b);
                    dist -= b;
                }
                dist *= 1.0f / 512.0f / lambda;
                quant_max = quant(maxq[w*16+g], ff_aac_pow2sf_tab[200 - scf + SCALE_ONE_POS - SCALE_DIV_512]);
                if (quant_max >= 8191) { // too much, return to the previous quantizer
                    sce->sf_idx[w*16+g] = prev_scf;
                    break;
                }

}

AACCoefficientsEncoder ff_aac_coders[] = {
    {
        search_for_quantizers_faac,
        encode_window_bands_info,
        quantize_and_encode_band,
//        search_for_ms,
    },
    {
        search_for_quantizers_anmr,