*/
//#define DEBUG
//#define DEBUG_BITALLOC
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
-#include "crc.h"
#include "ac3.h"
typedef struct AC3EncodeContext {
static int16_t costab[64];
static int16_t sintab[64];
-static int16_t fft_rev[512];
static int16_t xcos1[128];
static int16_t xsin1[128];
/* new exponents are sent if their Norm 1 exceed this number */
#define EXP_DIFF_THRESHOLD 1000
-static void fft_init(int ln);
-
static inline int16_t fix15(float a)
{
int v;
static void fft_init(int ln)
{
- int i, j, m, n;
+ int i, n;
float alpha;
n = 1 << ln;
costab[i] = fix15(cos(alpha));
sintab[i] = fix15(sin(alpha));
}
-
- for(i=0;i<n;i++) {
- m=0;
- for(j=0;j<ln;j++) {
- m |= ((i >> j) & 1) << (ln-j-1);
- }
- fft_rev[i]=m;
- }
}
/* butter fly op */
/* reverse */
for(j=0;j<np;j++) {
- int k;
- IComplex tmp;
- k = fft_rev[j];
- if (k < j) {
- tmp = z[k];
- z[k] = z[j];
- z[j] = tmp;
- }
+ int k = ff_reverse[j] >> (8 - ln);
+ if (k < j)
+ FFSWAP(IComplex, z[k], z[j]);
}
/* pass 0 */
for(ch=0;ch<s->nb_all_channels;ch++) {
ff_ac3_bit_alloc_calc_bap(mask[i][ch], psd[i][ch], 0,
s->nb_coefs[ch], snr_offset,
- s->bit_alloc.floor, bap[i][ch]);
+ s->bit_alloc.floor, ff_ac3_bap_tab,
+ bap[i][ch]);
frame_bits += compute_mantissa_size(s, bap[i][ch],
s->nb_coefs[ch]);
}
return 0;
}
-static int AC3_encode_init(AVCodecContext *avctx)
+static av_cold int AC3_encode_init(AVCodecContext *avctx)
{
int freq = avctx->sample_rate;
int bitrate = avctx->bit_rate;
} else {
/* use default bandwidth setting */
/* XXX: should compute the bandwidth according to the frame
- size, so that we avoid anoying high freq artefacts */
+ size, so that we avoid annoying high frequency artifacts */
bw_code = 50;
}
for(ch=0;ch<s->nb_channels;ch++) {
/* Now we must compute both crcs : this is not so easy for crc1
because it is at the beginning of the data... */
frame_size_58 = (frame_size >> 1) + (frame_size >> 3);
- crc1 = bswap_16(av_crc(av_crc8005, 0, frame + 4, 2 * frame_size_58 - 4));
+ crc1 = bswap_16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0,
+ frame + 4, 2 * frame_size_58 - 4));
/* XXX: could precompute crc_inv */
crc_inv = pow_poly((CRC16_POLY >> 1), (16 * frame_size_58) - 16, CRC16_POLY);
crc1 = mul_poly(crc_inv, crc1, CRC16_POLY);
AV_WB16(frame+2,crc1);
- crc2 = bswap_16(av_crc(av_crc8005, 0, frame + 2 * frame_size_58, (frame_size - frame_size_58) * 2 - 2));
+ crc2 = bswap_16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0,
+ frame + 2 * frame_size_58,
+ (frame_size - frame_size_58) * 2 - 2));
AV_WB16(frame+2*frame_size-2,crc2);
// printf("n=%d frame_size=%d\n", n, frame_size);
return output_frame_end(s);
}
-static int AC3_encode_close(AVCodecContext *avctx)
+static av_cold int AC3_encode_close(AVCodecContext *avctx)
{
av_freep(&avctx->coded_frame);
return 0;
AC3_encode_frame,
AC3_encode_close,
NULL,
+ .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 / AC-3"),
};