#include "opustab.h"
#include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
#include "libavutil/opt.h"
#include "internal.h"
#include "bytestream.h"
static int opus_gen_toc(OpusEncContext *s, uint8_t *toc, int *size, int *fsize_needed)
{
- int i, tmp = 0x0, extended_toc = 0;
+ int tmp = 0x0, extended_toc = 0;
static const int toc_cfg[][OPUS_MODE_NB][OPUS_BANDWITH_NB] = {
/* Silk Hybrid Celt Layer */
/* NB MB WB SWB FB NB MB WB SWB FB NB MB WB SWB FB Bandwidth */
tmp |= (cfg - 1) << 3; /* codec configuration */
*toc++ = tmp;
if (extended_toc) {
- for (i = 0; i < (s->packet.frames - 1); i++)
+ for (int i = 0; i < (s->packet.frames - 1); i++)
*fsize_needed |= (s->frame[i].framebits != s->frame[i + 1].framebits);
tmp = (*fsize_needed) << 7; /* vbr flag */
tmp |= (0) << 6; /* padding flag */
static void celt_frame_setup_input(OpusEncContext *s, CeltFrame *f)
{
- int sf, ch;
AVFrame *cur = NULL;
const int subframesize = s->avctx->frame_size;
int subframes = OPUS_BLOCK_SIZE(s->packet.framesize) / subframesize;
cur = ff_bufqueue_get(&s->bufqueue);
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *b = &f->block[ch];
const void *input = cur->extended_data[ch];
size_t bps = av_get_bytes_per_sample(cur->format);
av_frame_free(&cur);
- for (sf = 0; sf < subframes; sf++) {
+ for (int sf = 0; sf < subframes; sf++) {
if (sf != (subframes - 1))
cur = ff_bufqueue_get(&s->bufqueue);
else
cur = ff_bufqueue_peek(&s->bufqueue, 0);
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *b = &f->block[ch];
const void *input = cur->extended_data[ch];
const size_t bps = av_get_bytes_per_sample(cur->format);
/* Apply the pre emphasis filter */
static void celt_apply_preemph_filter(OpusEncContext *s, CeltFrame *f)
{
- int i, sf, ch;
const int subframesize = s->avctx->frame_size;
const int subframes = OPUS_BLOCK_SIZE(s->packet.framesize) / subframesize;
/* Filter overlap */
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *b = &f->block[ch];
float m = b->emph_coeff;
- for (i = 0; i < CELT_OVERLAP; i++) {
+ for (int i = 0; i < CELT_OVERLAP; i++) {
float sample = b->overlap[i];
b->overlap[i] = sample - m;
m = sample * CELT_EMPH_COEFF;
}
/* Filter the samples but do not update the last subframe's coeff - overlap ^^^ */
- for (sf = 0; sf < subframes; sf++) {
- for (ch = 0; ch < f->channels; ch++) {
+ for (int sf = 0; sf < subframes; sf++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *b = &f->block[ch];
float m = b->emph_coeff;
- for (i = 0; i < subframesize; i++) {
+ for (int i = 0; i < subframesize; i++) {
float sample = b->samples[sf*subframesize + i];
b->samples[sf*subframesize + i] = sample - m;
m = sample * CELT_EMPH_COEFF;
/* Create the window and do the mdct */
static void celt_frame_mdct(OpusEncContext *s, CeltFrame *f)
{
- int i, j, t, ch;
float *win = s->scratch, *temp = s->scratch + 1920;
if (f->transient) {
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *b = &f->block[ch];
float *src1 = b->overlap;
- for (t = 0; t < f->blocks; t++) {
+ for (int t = 0; t < f->blocks; t++) {
float *src2 = &b->samples[CELT_OVERLAP*t];
s->dsp->vector_fmul(win, src1, ff_celt_window, 128);
s->dsp->vector_fmul_reverse(&win[CELT_OVERLAP], src2,
int blk_len = OPUS_BLOCK_SIZE(f->size), wlen = OPUS_BLOCK_SIZE(f->size + 1);
int rwin = blk_len - CELT_OVERLAP, lap_dst = (wlen - blk_len - CELT_OVERLAP) >> 1;
memset(win, 0, wlen*sizeof(float));
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *b = &f->block[ch];
/* Overlap */
}
}
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *block = &f->block[ch];
- for (i = 0; i < CELT_MAX_BANDS; i++) {
+ for (int i = 0; i < CELT_MAX_BANDS; i++) {
float ener = 0.0f;
int band_offset = ff_celt_freq_bands[i] << f->size;
int band_size = ff_celt_freq_range[i] << f->size;
float *coeffs = &block->coeffs[band_offset];
- for (j = 0; j < band_size; j++)
+ for (int j = 0; j < band_size; j++)
ener += coeffs[j]*coeffs[j];
block->lin_energy[i] = sqrtf(ener) + FLT_EPSILON;
ener = 1.0f/block->lin_energy[i];
- for (j = 0; j < band_size; j++)
+ for (int j = 0; j < band_size; j++)
coeffs[j] *= ener;
block->energy[i] = log2f(block->lin_energy[i]) - ff_celt_mean_energy[i];
static void celt_enc_tf(CeltFrame *f, OpusRangeCoder *rc)
{
- int i, tf_select = 0, diff = 0, tf_changed = 0, tf_select_needed;
+ int tf_select = 0, diff = 0, tf_changed = 0, tf_select_needed;
int bits = f->transient ? 2 : 4;
tf_select_needed = ((f->size && (opus_rc_tell(rc) + bits + 1) <= f->framebits));
- for (i = f->start_band; i < f->end_band; i++) {
+ for (int i = f->start_band; i < f->end_band; i++) {
if ((opus_rc_tell(rc) + bits + tf_select_needed) <= f->framebits) {
const int tbit = (diff ^ 1) == f->tf_change[i];
ff_opus_rc_enc_log(rc, tbit, bits);
tf_select = f->tf_select;
}
- for (i = f->start_band; i < f->end_band; i++)
+ for (int i = f->start_band; i < f->end_band; i++)
f->tf_change[i] = ff_celt_tf_select[f->size][f->transient][tf_select][f->tf_change[i]];
}
-void ff_celt_enc_bitalloc(CeltFrame *f, OpusRangeCoder *rc)
-{
- int i, j, low, high, total, done, bandbits, remaining, tbits_8ths;
- int skip_startband = f->start_band;
- int skip_bit = 0;
- int intensitystereo_bit = 0;
- int dualstereo_bit = 0;
- int dynalloc = 6;
- int extrabits = 0;
-
- int *cap = f->caps;
- int boost[CELT_MAX_BANDS];
- int trim_offset[CELT_MAX_BANDS];
- int threshold[CELT_MAX_BANDS];
- int bits1[CELT_MAX_BANDS];
- int bits2[CELT_MAX_BANDS];
-
- /* Tell the spread to the decoder */
- if (opus_rc_tell(rc) + 4 <= f->framebits)
- ff_opus_rc_enc_cdf(rc, f->spread, ff_celt_model_spread);
- else
- f->spread = CELT_SPREAD_NORMAL;
-
- /* Generate static allocation caps */
- for (i = 0; i < CELT_MAX_BANDS; i++) {
- cap[i] = (ff_celt_static_caps[f->size][f->channels - 1][i] + 64)
- * ff_celt_freq_range[i] << (f->channels - 1) << f->size >> 2;
- }
-
- /* Band boosts */
- tbits_8ths = f->framebits << 3;
- for (i = f->start_band; i < f->end_band; i++) {
- int quanta, b_dynalloc, boost_amount = f->alloc_boost[i];
-
- boost[i] = 0;
-
- quanta = ff_celt_freq_range[i] << (f->channels - 1) << f->size;
- quanta = FFMIN(quanta << 3, FFMAX(6 << 3, quanta));
- b_dynalloc = dynalloc;
-
- while (opus_rc_tell_frac(rc) + (b_dynalloc << 3) < tbits_8ths && boost[i] < cap[i]) {
- int is_boost = boost_amount--;
-
- ff_opus_rc_enc_log(rc, is_boost, b_dynalloc);
- if (!is_boost)
- break;
-
- boost[i] += quanta;
- tbits_8ths -= quanta;
-
- b_dynalloc = 1;
- }
-
- if (boost[i])
- dynalloc = FFMAX(2, dynalloc - 1);
- }
-
- /* Put allocation trim */
- if (opus_rc_tell_frac(rc) + (6 << 3) <= tbits_8ths)
- ff_opus_rc_enc_cdf(rc, f->alloc_trim, ff_celt_model_alloc_trim);
-
- /* Anti-collapse bit reservation */
- tbits_8ths = (f->framebits << 3) - opus_rc_tell_frac(rc) - 1;
- f->anticollapse_needed = 0;
- if (f->transient && f->size >= 2 && tbits_8ths >= ((f->size + 2) << 3))
- f->anticollapse_needed = 1 << 3;
- tbits_8ths -= f->anticollapse_needed;
-
- /* Band skip bit reservation */
- if (tbits_8ths >= 1 << 3)
- skip_bit = 1 << 3;
- tbits_8ths -= skip_bit;
-
- /* Intensity/dual stereo bit reservation */
- if (f->channels == 2) {
- intensitystereo_bit = ff_celt_log2_frac[f->end_band - f->start_band];
- if (intensitystereo_bit <= tbits_8ths) {
- tbits_8ths -= intensitystereo_bit;
- if (tbits_8ths >= 1 << 3) {
- dualstereo_bit = 1 << 3;
- tbits_8ths -= 1 << 3;
- }
- } else {
- intensitystereo_bit = 0;
- }
- }
-
- /* Trim offsets */
- for (i = f->start_band; i < f->end_band; i++) {
- int trim = f->alloc_trim - 5 - f->size;
- int band = ff_celt_freq_range[i] * (f->end_band - i - 1);
- int duration = f->size + 3;
- int scale = duration + f->channels - 1;
-
- /* PVQ minimum allocation threshold, below this value the band is
- * skipped */
- threshold[i] = FFMAX(3 * ff_celt_freq_range[i] << duration >> 4,
- f->channels << 3);
-
- trim_offset[i] = trim * (band << scale) >> 6;
-
- if (ff_celt_freq_range[i] << f->size == 1)
- trim_offset[i] -= f->channels << 3;
- }
-
- /* Bisection */
- low = 1;
- high = CELT_VECTORS - 1;
- while (low <= high) {
- int center = (low + high) >> 1;
- done = total = 0;
-
- for (i = f->end_band - 1; i >= f->start_band; i--) {
- bandbits = ff_celt_freq_range[i] * ff_celt_static_alloc[center][i]
- << (f->channels - 1) << f->size >> 2;
-
- if (bandbits)
- bandbits = FFMAX(0, bandbits + trim_offset[i]);
- bandbits += boost[i];
-
- if (bandbits >= threshold[i] || done) {
- done = 1;
- total += FFMIN(bandbits, cap[i]);
- } else if (bandbits >= f->channels << 3)
- total += f->channels << 3;
- }
-
- if (total > tbits_8ths)
- high = center - 1;
- else
- low = center + 1;
- }
- high = low--;
-
- /* Bisection */
- for (i = f->start_band; i < f->end_band; i++) {
- bits1[i] = ff_celt_freq_range[i] * ff_celt_static_alloc[low][i]
- << (f->channels - 1) << f->size >> 2;
- bits2[i] = high >= CELT_VECTORS ? cap[i] :
- ff_celt_freq_range[i] * ff_celt_static_alloc[high][i]
- << (f->channels - 1) << f->size >> 2;
-
- if (bits1[i])
- bits1[i] = FFMAX(0, bits1[i] + trim_offset[i]);
- if (bits2[i])
- bits2[i] = FFMAX(0, bits2[i] + trim_offset[i]);
- if (low)
- bits1[i] += boost[i];
- bits2[i] += boost[i];
-
- if (boost[i])
- skip_startband = i;
- bits2[i] = FFMAX(0, bits2[i] - bits1[i]);
- }
-
- /* Bisection */
- low = 0;
- high = 1 << CELT_ALLOC_STEPS;
- for (i = 0; i < CELT_ALLOC_STEPS; i++) {
- int center = (low + high) >> 1;
- done = total = 0;
-
- for (j = f->end_band - 1; j >= f->start_band; j--) {
- bandbits = bits1[j] + (center * bits2[j] >> CELT_ALLOC_STEPS);
-
- if (bandbits >= threshold[j] || done) {
- done = 1;
- total += FFMIN(bandbits, cap[j]);
- } else if (bandbits >= f->channels << 3)
- total += f->channels << 3;
- }
- if (total > tbits_8ths)
- high = center;
- else
- low = center;
- }
-
- /* Bisection */
- done = total = 0;
- for (i = f->end_band - 1; i >= f->start_band; i--) {
- bandbits = bits1[i] + (low * bits2[i] >> CELT_ALLOC_STEPS);
-
- if (bandbits >= threshold[i] || done)
- done = 1;
- else
- bandbits = (bandbits >= f->channels << 3) ?
- f->channels << 3 : 0;
-
- bandbits = FFMIN(bandbits, cap[i]);
- f->pulses[i] = bandbits;
- total += bandbits;
- }
-
- /* Band skipping */
- for (f->coded_bands = f->end_band; ; f->coded_bands--) {
- int allocation;
- j = f->coded_bands - 1;
-
- if (j == skip_startband) {
- /* all remaining bands are not skipped */
- tbits_8ths += skip_bit;
- break;
- }
-
- /* determine the number of bits available for coding "do not skip" markers */
- remaining = tbits_8ths - total;
- bandbits = remaining / (ff_celt_freq_bands[j+1] - ff_celt_freq_bands[f->start_band]);
- remaining -= bandbits * (ff_celt_freq_bands[j+1] - ff_celt_freq_bands[f->start_band]);
- allocation = f->pulses[j] + bandbits * ff_celt_freq_range[j]
- + FFMAX(0, remaining - (ff_celt_freq_bands[j] - ff_celt_freq_bands[f->start_band]));
-
- /* a "do not skip" marker is only coded if the allocation is
- above the chosen threshold */
- if (allocation >= FFMAX(threshold[j], (f->channels + 1) << 3)) {
- const int do_not_skip = f->coded_bands <= f->skip_band_floor;
- ff_opus_rc_enc_log(rc, do_not_skip, 1);
- if (do_not_skip)
- break;
-
- total += 1 << 3;
- allocation -= 1 << 3;
- }
-
- /* the band is skipped, so reclaim its bits */
- total -= f->pulses[j];
- if (intensitystereo_bit) {
- total -= intensitystereo_bit;
- intensitystereo_bit = ff_celt_log2_frac[j - f->start_band];
- total += intensitystereo_bit;
- }
-
- total += f->pulses[j] = (allocation >= f->channels << 3) ? f->channels << 3 : 0;
- }
-
- /* Encode stereo flags */
- if (intensitystereo_bit) {
- f->intensity_stereo = FFMIN(f->intensity_stereo, f->coded_bands);
- ff_opus_rc_enc_uint(rc, f->intensity_stereo, f->coded_bands + 1 - f->start_band);
- }
- if (f->intensity_stereo <= f->start_band)
- tbits_8ths += dualstereo_bit; /* no intensity stereo means no dual stereo */
- else if (dualstereo_bit)
- ff_opus_rc_enc_log(rc, f->dual_stereo, 1);
-
- /* Supply the remaining bits in this frame to lower bands */
- remaining = tbits_8ths - total;
- bandbits = remaining / (ff_celt_freq_bands[f->coded_bands] - ff_celt_freq_bands[f->start_band]);
- remaining -= bandbits * (ff_celt_freq_bands[f->coded_bands] - ff_celt_freq_bands[f->start_band]);
- for (i = f->start_band; i < f->coded_bands; i++) {
- int bits = FFMIN(remaining, ff_celt_freq_range[i]);
-
- f->pulses[i] += bits + bandbits * ff_celt_freq_range[i];
- remaining -= bits;
- }
-
- /* Finally determine the allocation */
- for (i = f->start_band; i < f->coded_bands; i++) {
- int N = ff_celt_freq_range[i] << f->size;
- int prev_extra = extrabits;
- f->pulses[i] += extrabits;
-
- if (N > 1) {
- int dof; // degrees of freedom
- int temp; // dof * channels * log(dof)
- int offset; // fine energy quantization offset, i.e.
- // extra bits assigned over the standard
- // totalbits/dof
- int fine_bits, max_bits;
-
- extrabits = FFMAX(0, f->pulses[i] - cap[i]);
- f->pulses[i] -= extrabits;
-
- /* intensity stereo makes use of an extra degree of freedom */
- dof = N * f->channels + (f->channels == 2 && N > 2 && !f->dual_stereo && i < f->intensity_stereo);
- temp = dof * (ff_celt_log_freq_range[i] + (f->size << 3));
- offset = (temp >> 1) - dof * CELT_FINE_OFFSET;
- if (N == 2) /* dof=2 is the only case that doesn't fit the model */
- offset += dof << 1;
-
- /* grant an additional bias for the first and second pulses */
- if (f->pulses[i] + offset < 2 * (dof << 3))
- offset += temp >> 2;
- else if (f->pulses[i] + offset < 3 * (dof << 3))
- offset += temp >> 3;
-
- fine_bits = (f->pulses[i] + offset + (dof << 2)) / (dof << 3);
- max_bits = FFMIN((f->pulses[i] >> 3) >> (f->channels - 1), CELT_MAX_FINE_BITS);
-
- max_bits = FFMAX(max_bits, 0);
-
- f->fine_bits[i] = av_clip(fine_bits, 0, max_bits);
-
- /* if fine_bits was rounded down or capped,
- give priority for the final fine energy pass */
- f->fine_priority[i] = (f->fine_bits[i] * (dof << 3) >= f->pulses[i] + offset);
-
- /* the remaining bits are assigned to PVQ */
- f->pulses[i] -= f->fine_bits[i] << (f->channels - 1) << 3;
- } else {
- /* all bits go to fine energy except for the sign bit */
- extrabits = FFMAX(0, f->pulses[i] - (f->channels << 3));
- f->pulses[i] -= extrabits;
- f->fine_bits[i] = 0;
- f->fine_priority[i] = 1;
- }
-
- /* hand back a limited number of extra fine energy bits to this band */
- if (extrabits > 0) {
- int fineextra = FFMIN(extrabits >> (f->channels + 2),
- CELT_MAX_FINE_BITS - f->fine_bits[i]);
- f->fine_bits[i] += fineextra;
-
- fineextra <<= f->channels + 2;
- f->fine_priority[i] = (fineextra >= extrabits - prev_extra);
- extrabits -= fineextra;
- }
- }
- f->remaining = extrabits;
-
- /* skipped bands dedicate all of their bits for fine energy */
- for (; i < f->end_band; i++) {
- f->fine_bits[i] = f->pulses[i] >> (f->channels - 1) >> 3;
- f->pulses[i] = 0;
- f->fine_priority[i] = f->fine_bits[i] < 1;
- }
-}
-
static void celt_enc_quant_pfilter(OpusRangeCoder *rc, CeltFrame *f)
{
float gain = f->pf_gain;
- int i, txval, octave = f->pf_octave, period = f->pf_period, tapset = f->pf_tapset;
+ int txval, octave = f->pf_octave, period = f->pf_period, tapset = f->pf_tapset;
ff_opus_rc_enc_log(rc, f->pfilter, 1);
if (!f->pfilter)
else
tapset = 0;
/* Finally create the coeffs */
- for (i = 0; i < 2; i++) {
+ for (int i = 0; i < 2; i++) {
CeltBlock *block = &f->block[i];
block->pf_period_new = FFMAX(period, CELT_POSTFILTER_MINPERIOD);
static void exp_quant_coarse(OpusRangeCoder *rc, CeltFrame *f,
float last_energy[][CELT_MAX_BANDS], int intra)
{
- int i, ch;
float alpha, beta, prev[2] = { 0, 0 };
const uint8_t *pmod = ff_celt_coarse_energy_dist[f->size][intra];
beta = ff_celt_beta_coef[f->size];
}
- for (i = f->start_band; i < f->end_band; i++) {
- for (ch = 0; ch < f->channels; ch++) {
+ for (int i = f->start_band; i < f->end_band; i++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *block = &f->block[ch];
const int left = f->framebits - opus_rc_tell(rc);
const float last = FFMAX(-9.0f, last_energy[ch][i]);
static void celt_quant_fine(CeltFrame *f, OpusRangeCoder *rc)
{
- int i, ch;
- for (i = f->start_band; i < f->end_band; i++) {
+ for (int i = f->start_band; i < f->end_band; i++) {
if (!f->fine_bits[i])
continue;
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *block = &f->block[ch];
int quant, lim = (1 << f->fine_bits[i]);
float offset, diff = 0.5f - block->error_energy[i];
static void celt_quant_final(OpusEncContext *s, OpusRangeCoder *rc, CeltFrame *f)
{
- int i, ch, priority;
- for (priority = 0; priority < 2; priority++) {
- for (i = f->start_band; i < f->end_band && (f->framebits - opus_rc_tell(rc)) >= f->channels; i++) {
+ for (int priority = 0; priority < 2; priority++) {
+ for (int i = f->start_band; i < f->end_band && (f->framebits - opus_rc_tell(rc)) >= f->channels; i++) {
if (f->fine_priority[i] != priority || f->fine_bits[i] >= CELT_MAX_FINE_BITS)
continue;
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *block = &f->block[ch];
const float err = block->error_energy[i];
const float offset = 0.5f * (1 << (14 - f->fine_bits[i] - 1)) / 16384.0f;
static void celt_encode_frame(OpusEncContext *s, OpusRangeCoder *rc,
CeltFrame *f, int index)
{
- int i, ch;
-
ff_opus_rc_enc_init(rc);
ff_opus_psy_celt_frame_init(&s->psyctx, f, index);
if (f->silence) {
if (f->framebits >= 16)
ff_opus_rc_enc_log(rc, 1, 15); /* Silence (if using explicit singalling) */
- for (ch = 0; ch < s->channels; ch++)
+ for (int ch = 0; ch < s->channels; ch++)
memset(s->last_quantized_energy[ch], 0.0f, sizeof(float)*CELT_MAX_BANDS);
return;
}
ff_opus_rc_enc_log(rc, f->transient, 3);
/* Main encoding */
- celt_quant_coarse (f, rc, s->last_quantized_energy);
- celt_enc_tf (f, rc);
- ff_celt_enc_bitalloc(f, rc);
- celt_quant_fine (f, rc);
- ff_celt_quant_bands (f, rc);
+ celt_quant_coarse (f, rc, s->last_quantized_energy);
+ celt_enc_tf (f, rc);
+ ff_celt_bitalloc (f, rc, 1);
+ celt_quant_fine (f, rc);
+ ff_celt_quant_bands(f, rc);
/* Anticollapse bit */
if (f->anticollapse_needed)
/* Final per-band energy adjustments from leftover bits */
celt_quant_final(s, rc, f);
- for (ch = 0; ch < f->channels; ch++) {
+ for (int ch = 0; ch < f->channels; ch++) {
CeltBlock *block = &f->block[ch];
- for (i = 0; i < CELT_MAX_BANDS; i++)
+ for (int i = 0; i < CELT_MAX_BANDS; i++)
s->last_quantized_energy[ch][i] = block->energy[i] + block->error_energy[i];
}
}
static void opus_packet_assembler(OpusEncContext *s, AVPacket *avpkt)
{
- int i, offset, fsize_needed;
+ int offset, fsize_needed;
/* Write toc */
opus_gen_toc(s, avpkt->data, &offset, &fsize_needed);
/* Frame sizes if needed */
if (fsize_needed) {
- for (i = 0; i < s->packet.frames - 1; i++) {
+ for (int i = 0; i < s->packet.frames - 1; i++) {
offset += write_opuslacing(avpkt->data + offset,
s->frame[i].framebits >> 3);
}
}
/* Packets */
- for (i = 0; i < s->packet.frames; i++) {
+ for (int i = 0; i < s->packet.frames; i++) {
ff_opus_rc_enc_end(&s->rc[i], avpkt->data + offset,
s->frame[i].framebits >> 3);
offset += s->frame[i].framebits >> 3;
/* Used as overlap for the first frame and padding for the last encoded packet */
static AVFrame *spawn_empty_frame(OpusEncContext *s)
{
- int i;
AVFrame *f = av_frame_alloc();
if (!f)
return NULL;
av_frame_free(&f);
return NULL;
}
- for (i = 0; i < s->channels; i++) {
+ for (int i = 0; i < s->channels; i++) {
size_t bps = av_get_bytes_per_sample(f->format);
memset(f->extended_data[i], 0, bps*f->nb_samples);
}
const AVFrame *frame, int *got_packet_ptr)
{
OpusEncContext *s = avctx->priv_data;
- int i, ret, frame_size, alloc_size = 0;
+ int ret, frame_size, alloc_size = 0;
if (frame) { /* Add new frame to queue */
if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
ff_bufqueue_add(avctx, &s->bufqueue, av_frame_clone(frame));
} else {
ff_opus_psy_signal_eof(&s->psyctx);
- if (!s->afq.remaining_samples)
+ if (!s->afq.remaining_samples || !avctx->frame_number)
return 0; /* We've been flushed and there's nothing left to encode */
}
* this should only happen at the very last flush frame. The frames
* allocated here will be freed (because they have no other references)
* after they get used by celt_frame_setup_input() */
- for (i = 0; i < pad_empty; i++) {
+ for (int i = 0; i < pad_empty; i++) {
AVFrame *empty = spawn_empty_frame(s);
if (!empty)
return AVERROR(ENOMEM);
}
}
- for (i = 0; i < s->packet.frames; i++) {
+ for (int i = 0; i < s->packet.frames; i++) {
celt_encode_frame(s, &s->rc[i], &s->frame[i], i);
alloc_size += s->frame[i].framebits >> 3;
}
static av_cold int opus_encode_end(AVCodecContext *avctx)
{
- int i;
OpusEncContext *s = avctx->priv_data;
- for (i = 0; i < CELT_BLOCK_NB; i++)
+ for (int i = 0; i < CELT_BLOCK_NB; i++)
ff_mdct15_uninit(&s->mdct[i]);
ff_celt_pvq_uninit(&s->pvq);
static av_cold int opus_encode_init(AVCodecContext *avctx)
{
- int i, ch, ret, max_frames;
+ int ret, max_frames;
OpusEncContext *s = avctx->priv_data;
s->avctx = avctx;
return AVERROR(ENOMEM);
/* I have no idea why a base scaling factor of 68 works, could be the twiddles */
- for (i = 0; i < CELT_BLOCK_NB; i++)
+ for (int i = 0; i < CELT_BLOCK_NB; i++)
if ((ret = ff_mdct15_init(&s->mdct[i], 0, i + 3, 68 << (CELT_BLOCK_NB - 1 - i))))
return AVERROR(ENOMEM);
/* Zero out previous energy (matters for inter first frame) */
- for (ch = 0; ch < s->channels; ch++)
+ for (int ch = 0; ch < s->channels; ch++)
memset(s->last_quantized_energy[ch], 0.0f, sizeof(float)*CELT_MAX_BANDS);
/* Allocate an empty frame to use as overlap for the first frame of audio */
if (!s->rc)
return AVERROR(ENOMEM);
- for (i = 0; i < max_frames; i++) {
+ for (int i = 0; i < max_frames; i++) {
s->frame[i].dsp = s->dsp;
s->frame[i].avctx = s->avctx;
s->frame[i].seed = 0;
s->frame[i].pvq = s->pvq;
- s->frame[i].apply_phase_inv = 1;
+ s->frame[i].apply_phase_inv = s->options.apply_phase_inv;
s->frame[i].block[0].emph_coeff = s->frame[i].block[1].emph_coeff = 0.0f;
}
#define OPUSENC_FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
static const AVOption opusenc_options[] = {
{ "opus_delay", "Maximum delay in milliseconds", offsetof(OpusEncContext, options.max_delay_ms), AV_OPT_TYPE_FLOAT, { .dbl = OPUS_MAX_LOOKAHEAD }, 2.5f, OPUS_MAX_LOOKAHEAD, OPUSENC_FLAGS, "max_delay_ms" },
+ { "apply_phase_inv", "Apply intensity stereo phase inversion", offsetof(OpusEncContext, options.apply_phase_inv), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, OPUSENC_FLAGS, "apply_phase_inv" },
{ NULL },
};
{ NULL },
};
-AVCodec ff_opus_encoder = {
+const AVCodec ff_opus_encoder = {
.name = "opus",
.long_name = NULL_IF_CONFIG_SMALL("Opus"),
.type = AVMEDIA_TYPE_AUDIO,
projects / ffmpeg / blobdiff