har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacenc_is: rename struct to follow guidelines

Browse Source 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2015-08-22 06:47:14 +01:00
parent e8279880dc
commit 2c94e45fad
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/aacenc_is.c
View File

@ -30,15 +30,15 @@
#include "aacenc_is.h" #include "aacenc_is.h"
#include "aacenc_quantization.h" #include "aacenc_quantization.h"
struct ff_aac_is_error ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe, struct AACISError ff_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, int phase) float ener1, float ener01, int phase)
{ {
int i, w2; int i, w2;
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;
struct ff_aac_is_error is_error = {0}; struct AACISError is_error = {0};
SingleChannelElement *sce0 = &cpe->ch[0]; SingleChannelElement *sce0 = &cpe->ch[0];
SingleChannelElement *sce1 = &cpe->ch[1]; SingleChannelElement *sce1 = &cpe->ch[1];
@ -106,7 +106,7 @@ void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElemen
cpe->ch[0].band_type[w*16+g] != NOISE_BT && !cpe->ch[0].zeroes[w*16+g] && cpe->ch[0].band_type[w*16+g] != NOISE_BT && !cpe->ch[0].zeroes[w*16+g] &&
cpe->ch[1].band_type[w*16+g] != NOISE_BT && !cpe->ch[1].zeroes[w*16+g]) { cpe->ch[1].band_type[w*16+g] != NOISE_BT && !cpe->ch[1].zeroes[w*16+g]) {
float ener0 = 0.0f, ener1 = 0.0f, ener01 = 0.0f; float ener0 = 0.0f, ener1 = 0.0f, ener01 = 0.0f;
struct ff_aac_is_error ph_err1, ph_err2, *erf; struct AACISError ph_err1, ph_err2, *erf;
for (w2 = 0; w2 < sce0->ics.group_len[w]; w2++) { for (w2 = 0; w2 < sce0->ics.group_len[w]; w2++) {
for (i = 0; i < sce0->ics.swb_sizes[g]; i++) { for (i = 0; i < sce0->ics.swb_sizes[g]; i++) {
float coef0 = sce0->pcoeffs[start+(w+w2)*128+i]; float coef0 = sce0->pcoeffs[start+(w+w2)*128+i];

8
libavcodec/aacenc_is.h
View File

@ -31,7 +31,7 @@
/** Frequency in Hz for lower limit of intensity stereo **/ /** Frequency in Hz for lower limit of intensity stereo **/
#define INT_STEREO_LOW_LIMIT 6100 #define INT_STEREO_LOW_LIMIT 6100
struct ff_aac_is_error { struct AACISError {
int pass; /* 1 if dist2 <= dist1 */ int pass; /* 1 if dist2 <= dist1 */
int phase; /* -1 or +1 */ int phase; /* -1 or +1 */
float error; /* fabs(dist1 - dist2) */ float error; /* fabs(dist1 - dist2) */
@ -39,9 +39,9 @@ struct ff_aac_is_error {
float dist2; /* From IS'd coeffs */ float dist2; /* From IS'd coeffs */
}; };
struct ff_aac_is_error ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe, struct AACISError ff_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, int phase); float ener1, float ener01, 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 */