mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-23 19:49:56 +00:00
lavc: G.723.1 encoder
Additional improvements by Michael Niedermayer <michaelni@gmx.at>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Mohamed Naufal
Vittorio Giovara
parent
165cc6fb9d
commit
f023d57d35
@ -49,6 +49,7 @@ version <next>:
|
||||
- innoHeim/Rsupport Screen Capture Codec decoder
|
||||
- support encoding 16-bit RLE SGI images
|
||||
- support Apple AVFoundation video capture
|
||||
- G.723.1 encoder
|
||||
|
||||
|
||||
version 11:
|
||||
|
||||
@ -874,7 +874,7 @@ following image formats are supported:
|
||||
@item DV audio @tab @tab X
|
||||
@item Enhanced AC-3 @tab X @tab X
|
||||
@item FLAC (Free Lossless Audio Codec) @tab X @tab IX
|
||||
@item G.723.1 @tab @tab X
|
||||
@item G.723.1 @tab X @tab X
|
||||
@item GSM @tab E @tab X
|
||||
@tab encoding supported through external library libgsm
|
||||
@item GSM Microsoft variant @tab E @tab X
|
||||
|
||||
@ -227,6 +227,8 @@ OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
|
||||
OBJS-$(CONFIG_G2M_DECODER) += g2meet.o elsdec.o
|
||||
OBJS-$(CONFIG_G723_1_DECODER) += g723_1dec.o g723_1.o \
|
||||
acelp_vectors.o celp_filters.o
|
||||
OBJS-$(CONFIG_G723_1_ENCODER) += g723_1enc.o g723_1.o \
|
||||
acelp_vectors.o celp_filters.o
|
||||
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
|
||||
OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o
|
||||
OBJS-$(CONFIG_GSM_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o
|
||||
|
||||
@ -330,7 +330,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_DECODER(DSS_SP, dss_sp);
|
||||
REGISTER_ENCDEC (EAC3, eac3);
|
||||
REGISTER_ENCDEC (FLAC, flac);
|
||||
REGISTER_DECODER(G723_1, g723_1);
|
||||
REGISTER_ENCDEC (G723_1, g723_1);
|
||||
REGISTER_DECODER(GSM, gsm);
|
||||
REGISTER_DECODER(GSM_MS, gsm_ms);
|
||||
REGISTER_DECODER(IAC, iac);
|
||||
|
||||
@ -26,6 +26,8 @@
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "celp_math.h"
|
||||
#include "mathops.h"
|
||||
|
||||
#include "libavutil/common.h"
|
||||
|
||||
static const uint16_t exp2a[]=
|
||||
@ -86,3 +88,14 @@ int ff_log2_q15(uint32_t value)
|
||||
|
||||
return (power_int << 15) + value;
|
||||
}
|
||||
|
||||
int64_t ff_dot_product(const int16_t *a, const int16_t *b, int length)
|
||||
{
|
||||
int i;
|
||||
int64_t sum = 0;
|
||||
|
||||
for (i = 0; i < length; i++)
|
||||
sum += MUL16(a[i], b[i]);
|
||||
|
||||
return sum;
|
||||
}
|
||||
|
||||
@ -42,6 +42,16 @@ int ff_exp2(uint16_t power);
|
||||
*/
|
||||
int ff_log2_q15(uint32_t value);
|
||||
|
||||
/**
|
||||
* Calculate the dot product of 2 int16_t vectors.
|
||||
* @param a input data array
|
||||
* @param b input data array
|
||||
* @param length number of elements
|
||||
*
|
||||
* @return dot product = sum of elementwise products
|
||||
*/
|
||||
int64_t ff_dot_product(const int16_t *a, const int16_t *b, int length);
|
||||
|
||||
/**
|
||||
* Shift value left or right depending on sign of offset parameter.
|
||||
* @param value value to shift
|
||||
|
||||
@ -53,13 +53,8 @@ int ff_g723_1_normalize_bits(int num, int width)
|
||||
|
||||
int ff_g723_1_dot_product(const int16_t *a, const int16_t *b, int length)
|
||||
{
|
||||
int i, sum = 0;
|
||||
|
||||
for (i = 0; i < length; i++) {
|
||||
int prod = a[i] * b[i];
|
||||
sum = av_sat_dadd32(sum, prod);
|
||||
}
|
||||
return sum;
|
||||
int sum = ff_dot_product(a, b, length);
|
||||
return av_sat_add32(sum, sum);
|
||||
}
|
||||
|
||||
void ff_g723_1_get_residual(int16_t *residual, int16_t *prev_excitation,
|
||||
|
||||
@ -33,6 +33,8 @@
|
||||
#define SUBFRAMES 4
|
||||
#define SUBFRAME_LEN 60
|
||||
#define FRAME_LEN (SUBFRAME_LEN << 2)
|
||||
#define HALF_FRAME_LEN (FRAME_LEN / 2)
|
||||
#define LPC_FRAME (HALF_FRAME_LEN + SUBFRAME_LEN)
|
||||
#define LPC_ORDER 10
|
||||
#define LSP_BANDS 3
|
||||
#define LSP_CB_SIZE 256
|
||||
@ -92,6 +94,26 @@ typedef struct PPFParam {
|
||||
int16_t sc_gain; ///< scaling gain
|
||||
} PPFParam;
|
||||
|
||||
/**
|
||||
* Harmonic filter parameters
|
||||
*/
|
||||
typedef struct HFParam {
|
||||
int index;
|
||||
int gain;
|
||||
} HFParam;
|
||||
|
||||
/**
|
||||
* Optimized fixed codebook excitation parameters
|
||||
*/
|
||||
typedef struct FCBParam {
|
||||
int min_err;
|
||||
int amp_index;
|
||||
int grid_index;
|
||||
int dirac_train;
|
||||
int pulse_pos[PULSE_MAX];
|
||||
int pulse_sign[PULSE_MAX];
|
||||
} FCBParam;
|
||||
|
||||
typedef struct g723_1_context {
|
||||
AVClass *class;
|
||||
|
||||
@ -122,6 +144,17 @@ typedef struct g723_1_context {
|
||||
int postfilter;
|
||||
|
||||
int16_t audio[FRAME_LEN + LPC_ORDER + PITCH_MAX + 4];
|
||||
|
||||
/* encoder */
|
||||
int16_t prev_data[HALF_FRAME_LEN];
|
||||
int16_t prev_weight_sig[PITCH_MAX];
|
||||
|
||||
int16_t hpf_fir_mem; ///< highpass filter fir
|
||||
int hpf_iir_mem; ///< and iir memories
|
||||
int16_t perf_fir_mem[LPC_ORDER]; ///< perceptual filter fir
|
||||
int16_t perf_iir_mem[LPC_ORDER]; ///< and iir memories
|
||||
|
||||
int16_t harmonic_mem[PITCH_MAX];
|
||||
} G723_1_Context;
|
||||
|
||||
|
||||
@ -1329,6 +1362,55 @@ static const int16_t postfilter_tbl[2][LPC_ORDER] = {
|
||||
{ 24576, 18432, 13824, 10368, 7776, 5832, 4374, 3281, 2460, 1845 }
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Hamming window coefficients scaled by 2^15
|
||||
*/
|
||||
static const int16_t hamming_window[LPC_FRAME] = {
|
||||
2621, 2631, 2659, 2705, 2770, 2853, 2955, 3074, 3212, 3367,
|
||||
3541, 3731, 3939, 4164, 4405, 4663, 4937, 5226, 5531, 5851,
|
||||
6186, 6534, 6897, 7273, 7661, 8062, 8475, 8899, 9334, 9780,
|
||||
10235, 10699, 11172, 11653, 12141, 12636, 13138, 13645, 14157, 14673,
|
||||
15193, 15716, 16242, 16769, 17298, 17827, 18356, 18884, 19411, 19935,
|
||||
20457, 20975, 21489, 21999, 22503, 23002, 23494, 23978, 24455, 24924,
|
||||
25384, 25834, 26274, 26704, 27122, 27529, 27924, 28306, 28675, 29031,
|
||||
29373, 29700, 30012, 30310, 30592, 30857, 31107, 31340, 31557, 31756,
|
||||
31938, 32102, 32249, 32377, 32488, 32580, 32654, 32710, 32747, 32766,
|
||||
32766, 32747, 32710, 32654, 32580, 32488, 32377, 32249, 32102, 31938,
|
||||
31756, 31557, 31340, 31107, 30857, 30592, 30310, 30012, 29700, 29373,
|
||||
29031, 28675, 28306, 27924, 27529, 27122, 26704, 26274, 25834, 25384,
|
||||
24924, 24455, 23978, 23494, 23002, 22503, 21999, 21489, 20975, 20457,
|
||||
19935, 19411, 18884, 18356, 17827, 17298, 16769, 16242, 15716, 15193,
|
||||
14673, 14157, 13645, 13138, 12636, 12141, 11653, 11172, 10699, 10235,
|
||||
9780, 9334, 8899, 8475, 8062, 7661, 7273, 6897, 6534, 6186,
|
||||
5851, 5531, 5226, 4937, 4663, 4405, 4164, 3939, 3731, 3541,
|
||||
3367, 3212, 3074, 2955, 2853, 2770, 2705, 2659, 2631, 2621
|
||||
};
|
||||
|
||||
/**
|
||||
* Binomial window coefficients scaled by 2^15
|
||||
*/
|
||||
static const int16_t binomial_window[LPC_ORDER] = {
|
||||
32749, 32695, 32604, 32477, 32315, 32118, 31887, 31622, 31324, 30995
|
||||
};
|
||||
|
||||
/**
|
||||
* 0.994^i scaled by 2^15
|
||||
*/
|
||||
static const int16_t bandwidth_expand[LPC_ORDER] = {
|
||||
32571, 32376, 32182, 31989, 31797, 31606, 31416, 31228, 31040, 30854
|
||||
};
|
||||
|
||||
/**
|
||||
* 0.5^i scaled by 2^15
|
||||
*/
|
||||
static const int16_t percept_flt_tbl[2][LPC_ORDER] = {
|
||||
/* Zero part */
|
||||
{29491, 26542, 23888, 21499, 19349, 17414, 15673, 14106, 12695, 11425},
|
||||
/* Pole part */
|
||||
{16384, 8192, 4096, 2048, 1024, 512, 256, 128, 64, 32}
|
||||
};
|
||||
|
||||
static const int cng_adaptive_cb_lag[4] = { 1, 0, 1, 3 };
|
||||
|
||||
static const int cng_filt[4] = { 273, 998, 499, 333 };
|
||||
|
||||
1202
libavcodec/g723_1enc.c
Normal file
1202
libavcodec/g723_1enc.c
Normal file
File diff suppressed because it is too large
Load Diff
@ -29,8 +29,8 @@
|
||||
#include "libavutil/version.h"
|
||||
|
||||
#define LIBAVCODEC_VERSION_MAJOR 57
|
||||
#define LIBAVCODEC_VERSION_MINOR 9
|
||||
#define LIBAVCODEC_VERSION_MICRO 1
|
||||
#define LIBAVCODEC_VERSION_MINOR 10
|
||||
#define LIBAVCODEC_VERSION_MICRO 0
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||
LIBAVCODEC_VERSION_MINOR, \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user