highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacenc: copy PRNG from the decoder

Browse Source 
Needed for the following PNS commits.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2015-09-06 15:06:34 +01:00
parent 34e85cb340
commit 92aa3e7fb2
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/aacenc.c
View File

@ -861,6 +861,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
ff_aac_coder_init_mips(s); ff_aac_coder_init_mips(s);
s->lambda = avctx->global_quality > 0 ? avctx->global_quality : 120; s->lambda = avctx->global_quality > 0 ? avctx->global_quality : 120;
s->random_state = 0x1f2e3d4c;
ff_aac_tableinit(); ff_aac_tableinit();

1
libavcodec/aacenc.h
View File

@ -98,6 +98,7 @@ typedef struct AACEncContext {
AACCoefficientsEncoder *coder; AACCoefficientsEncoder *coder;
int cur_channel; int cur_channel;
int last_frame; int last_frame;
int random_state;
float lambda; float lambda;
AudioFrameQueue afq; AudioFrameQueue afq;
DECLARE_ALIGNED(16, int, qcoefs)[96]; ///< quantized coefficients DECLARE_ALIGNED(16, int, qcoefs)[96]; ///< quantized coefficients

9
libavcodec/aacenc_utils.h
View File

@ -128,6 +128,15 @@ static inline int quant_array_idx(const float val, const float *arr, const int n
return index; return index;
} }
/*
* linear congruential pseudorandom number generator, copied from the decoder
*/
static inline int lcg_random(unsigned previous_val)
{
union { unsigned u; int s; } v = { previous_val * 1664525u + 1013904223 };
return v.s;
}
#define ERROR_IF(cond, ...) \ #define ERROR_IF(cond, ...) \
if (cond) { \ if (cond) { \
av_log(avctx, AV_LOG_ERROR, __VA_ARGS__); \ av_log(avctx, AV_LOG_ERROR, __VA_ARGS__); \