virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/aacenc_is: Make ff_aac_is_encoding_err() static

Browse Source 
Possible since 9b11fefb88.
Also remove a now always-zero parameter.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-04-02 11:35:55 +02:00
parent d78cb537a2
commit a2136d545c
2 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/aacenc_is.c
View File

@@ -30,16 +30,27 @@
#include "aacenc_is.h" #include "aacenc_is.h"
#include "aacenc_quantization.h" #include "aacenc_quantization.h"
struct AACISError ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe, /** Frequency in Hz for lower limit of intensity stereo **/
#define INT_STEREO_LOW_LIMIT 6100
struct AACISError {
int pass; /* 1 if dist2 <= dist1 */
int phase; /* -1 or +1 */
float error; /* fabs(dist1 - dist2) */
float dist1; /* From original coeffs */
float dist2; /* From IS'd coeffs */
float ener01;
};
static struct AACISError aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
int start, int w, int g, float ener0, int start, int w, int g, float ener0,
float ener1, float ener01, float ener1, float ener01, int phase)
int use_pcoeffs, int phase)
{ {
int i, w2; int i, w2;
SingleChannelElement *sce0 = &cpe->ch[0]; SingleChannelElement *sce0 = &cpe->ch[0];
SingleChannelElement *sce1 = &cpe->ch[1]; SingleChannelElement *sce1 = &cpe->ch[1];
float *L = use_pcoeffs ? sce0->pcoeffs : sce0->coeffs; float *L = sce0->coeffs;
float *R = use_pcoeffs ? sce1->pcoeffs : sce1->coeffs; float *R = sce1->coeffs;
float *L34 = &s->scoefs[256*0], *R34 = &s->scoefs[256*1]; float *L34 = &s->scoefs[256*0], *R34 = &s->scoefs[256*1];
float *IS = &s->scoefs[256*2], *I34 = &s->scoefs[256*3]; float *IS = &s->scoefs[256*2], *I34 = &s->scoefs[256*3];
float dist1 = 0.0f, dist2 = 0.0f; float dist1 = 0.0f, dist2 = 0.0f;
@@ -128,10 +139,10 @@ void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElemen
ener01p += (coef0 - coef1)*(coef0 - coef1); ener01p += (coef0 - coef1)*(coef0 - coef1);
} }
} }
ph_err1 = ff_aac_is_encoding_err(s, cpe, start, w, g, ph_err1 = aac_is_encoding_err(s, cpe, start, w, g,
ener0, ener1, ener01p, 0, -1); ener0, ener1, ener01p, -1);
ph_err2 = ff_aac_is_encoding_err(s, cpe, start, w, g, ph_err2 = aac_is_encoding_err(s, cpe, start, w, g,
ener0, ener1, ener01, 0, +1); ener0, ener1, ener01, +1);
best = (ph_err1.pass && ph_err1.error < ph_err2.error) ? &ph_err1 : &ph_err2; best = (ph_err1.pass && ph_err1.error < ph_err2.error) ? &ph_err1 : &ph_err2;
if (best->pass) { if (best->pass) {
cpe->is_mask[w*16+g] = 1; cpe->is_mask[w*16+g] = 1;

16
libavcodec/aacenc_is.h
View File

@@ -30,22 +30,6 @@
#include "aacenc.h" #include "aacenc.h"
/** Frequency in Hz for lower limit of intensity stereo **/
#define INT_STEREO_LOW_LIMIT 6100
struct AACISError {
int pass; /* 1 if dist2 <= dist1 */
int phase; /* -1 or +1 */
float error; /* fabs(dist1 - dist2) */
float dist1; /* From original coeffs */
float dist2; /* From IS'd coeffs */
float ener01;
};
struct AACISError ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
int start, int w, int g, float ener0,
float ener1, float ener01,
int use_pcoeffs, int phase);
void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe); void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe);
#endif /* AVCODEC_AACENC_IS_H */ #endif /* AVCODEC_AACENC_IS_H */