History

avcodec/lpc: Don't use AAC defines directly

It leads to defines for the AAC decoder being included outside of the AAC decoder.

Andreas Rheinhardt committed 2 years ago

Commit 08aa7911 parent 0aaee474 files · +29 −13Browse files

Showing the changes to libavcodec (4 of 4 files). Show all

Unified · Split

4 files
  1. libavcodec/aac_defines.h +9 −2
  2. libavcodec/aacdec_fixed.c +1 −1
  3. libavcodec/aacdec_template.c +1 −1
  4. libavcodec/lpc.h +18 −9
libavcodec/aac_defines.h+9−2
@@ -71,7 +71,15 @@ typedef int AAC_SIGNE; · 70 unmodified lines
71 ((int64_t)(y) * (z)) + \71 ((int64_t)(y) * (z)) + \
72 0x40000000) >> 31)72 0x40000000) >> 31)
73#define AAC_HALF_SUM(x, y) (((x) >> 1) + ((y) >> 1))73#define AAC_HALF_SUM(x, y) (((x) >> 1) + ((y) >> 1))
74#define AAC_SRA_R(x, y) (int)(((x) + (1 << ((y) - 1))) >> (y))74
75#ifdef LPC_USE_FIXED
76#error aac_defines.h must be included before lpc.h for fixed point decoder
77#endif
78
79#define LPC_USE_FIXED 1
80#define LPC_MUL26(x, y) AAC_MUL26((x), (y))
81#define LPC_FIXR(x) FIXR(x)
82#define LPC_SRA_R(x, y) (int)(((x) + (1 << ((y) - 1))) >> (y))
75 83
76#else84#else
77 85
@@ -103,7 +111,6 @@ typedef unsigned AAC_SIGNE; · 25 unmodified lines
103 (c) * (d) - (e) * (f))111 (c) * (d) - (e) * (f))
104#define AAC_MSUB31_V3(x, y, z) ((x) - (y)) * (z)112#define AAC_MSUB31_V3(x, y, z) ((x) - (y)) * (z)
105#define AAC_HALF_SUM(x, y) ((x) + (y)) * 0.5f113#define AAC_HALF_SUM(x, y) ((x) + (y)) * 0.5f
106#define AAC_SRA_R(x, y) (x)
107 114
108#endif /* USE_FIXED */115#endif /* USE_FIXED */
109 116
libavcodec/aacdec_fixed.c+1−1
@@ -66,7 +66,6 @@ · 65 unmodified lines
66#include "avcodec.h"66#include "avcodec.h"
67#include "codec_internal.h"67#include "codec_internal.h"
68#include "get_bits.h"68#include "get_bits.h"
69#include "lpc.h"
70#include "kbdwin.h"69#include "kbdwin.h"
71#include "sinewin_fixed_tablegen.h"70#include "sinewin_fixed_tablegen.h"
72 71
@@ -76,6 +75,7 @@ · 3 unmodified lines
76#include "aacdectab.h"75#include "aacdectab.h"
77#include "adts_header.h"76#include "adts_header.h"
78#include "cbrt_data.h"77#include "cbrt_data.h"
78#include "lpc.h"
79#include "sbr.h"79#include "sbr.h"
80#include "aacsbr.h"80#include "aacsbr.h"
81#include "mpeg4audio.h"81#include "mpeg4audio.h"
libavcodec/aacdec_template.c+1−1
@@ -2516,7 +2516,7 @@ static void apply_tns(INTFLOAT coef_param[1024], TemporalNoiseShaping *tns, · 2515 unmodified lines
2516 continue;2516 continue;
2517 2517
2518 // tns_decode_coef2518 // tns_decode_coef
2519 AAC_RENAME(compute_lpc_coefs)(tns->coef[w][filt], order, lpc, 0, 0, 0);2519 compute_lpc_coefs(tns->coef[w][filt], order, lpc, 0, 0, 0);
2520 2520
2521 start = ics->swb_offset[FFMIN(bottom, mmm)];2521 start = ics->swb_offset[FFMIN(bottom, mmm)];
2522 end = ics->swb_offset[FFMIN( top, mmm)];2522 end = ics->swb_offset[FFMIN( top, mmm)];
libavcodec/lpc.h+18−9
@@ -26,7 +26,6 @@ · 25 unmodified lines
26#include <stddef.h>26#include <stddef.h>
27#include "libavutil/avassert.h"27#include "libavutil/avassert.h"
28#include "libavutil/lls.h"28#include "libavutil/lls.h"
29#include "aac_defines.h"
30 29
31#define ORDER_METHOD_EST 030#define ORDER_METHOD_EST 0
32#define ORDER_METHOD_2LEVEL 131#define ORDER_METHOD_2LEVEL 1
@@ -117,10 +116,20 @@ void ff_lpc_init_x86(LPCContext *s); · 84 unmodified lines
117 */116 */
118void ff_lpc_end(LPCContext *s);117void ff_lpc_end(LPCContext *s);
119 118
120#if USE_FIXED119#ifndef LPC_USE_FIXED
120#define LPC_USE_FIXED 0
121#endif
122
123#if LPC_USE_FIXED
121typedef int LPC_TYPE;124typedef int LPC_TYPE;
122typedef unsigned LPC_TYPE_U;125typedef unsigned LPC_TYPE_U;
123#else126#else
127#ifndef LPC_SRA_R
128#define LPC_SRA_R(x, y) (x)
129#define LPC_MUL26(x, y) ((x) * (y))
130#define LPC_FIXR(x) ((float)(x))
131#endif
132
124#ifdef LPC_USE_DOUBLE133#ifdef LPC_USE_DOUBLE
125typedef double LPC_TYPE;134typedef double LPC_TYPE;
126typedef double LPC_TYPE_U;135typedef double LPC_TYPE_U;
@@ -145,7 +154,7 @@ static inline void compute_ref_coefs(const LPC_TYPE *autoc, int max_order, · 18 unmodified lines
145 gen0[i] = gen1[i] = autoc[i + 1];154 gen0[i] = gen1[i] = autoc[i + 1];
146 155
147 err = autoc[0];156 err = autoc[0];
148 ref[0] = -gen1[0] / ((USE_FIXED || err) ? err : 1);157 ref[0] = -gen1[0] / ((LPC_USE_FIXED || err) ? err : 1);
149 err += gen1[0] * ref[0];158 err += gen1[0] * ref[0];
150 if (error)159 if (error)
151 error[0] = err;160 error[0] = err;
@@ -154,7 +163,7 @@ static inline void compute_ref_coefs(const LPC_TYPE *autoc, int max_order, · 2 unmodified lines
154 gen1[j] = gen1[j + 1] + ref[i - 1] * gen0[j];163 gen1[j] = gen1[j + 1] + ref[i - 1] * gen0[j];
155 gen0[j] = gen1[j + 1] * ref[i - 1] + gen0[j];164 gen0[j] = gen1[j + 1] * ref[i - 1] + gen0[j];
156 }165 }
157 ref[i] = -gen1[0] / ((USE_FIXED || err) ? err : 1);166 ref[i] = -gen1[0] / ((LPC_USE_FIXED || err) ? err : 1);
158 err += gen1[0] * ref[i];167 err += gen1[0] * ref[i];
159 if (error)168 if (error)
160 error[i] = err;169 error[i] = err;
@@ -165,7 +174,7 @@ static inline void compute_ref_coefs(const LPC_TYPE *autoc, int max_order, · 4 unmodified lines
165 * Levinson-Durbin recursion.174 * Levinson-Durbin recursion.
166 * Produce LPC coefficients from autocorrelation data.175 * Produce LPC coefficients from autocorrelation data.
167 */176 */
168static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_order,177static inline int compute_lpc_coefs(const LPC_TYPE *autoc, int max_order,
169 LPC_TYPE *lpc, int lpc_stride, int fail,178 LPC_TYPE *lpc, int lpc_stride, int fail,
170 int normalize)179 int normalize)
171{180{
@@ -182,7 +191,7 @@ static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_o · 10 unmodified lines
182 return -1;191 return -1;
183 192
184 for(i=0; i<max_order; i++) {193 for(i=0; i<max_order; i++) {
185 LPC_TYPE r = AAC_SRA_R(-autoc[i], 5);194 LPC_TYPE r = LPC_SRA_R(-autoc[i], 5);
186 195
187 if (normalize) {196 if (normalize) {
188 for(j=0; j<i; j++)197 for(j=0; j<i; j++)
@@ -190,7 +199,7 @@ static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_o · 1 unmodified line
190 199
191 if (err)200 if (err)
192 r /= err;201 r /= err;
193 err *= FIXR(1.0) - (r * r);202 err *= LPC_FIXR(1.0) - (r * r);
194 }203 }
195 204
196 lpc[i] = r;205 lpc[i] = r;
@@ -198,8 +207,8 @@ static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_o · 1 unmodified line
198 for(j=0; j < (i+1)>>1; j++) {207 for(j=0; j < (i+1)>>1; j++) {
199 LPC_TYPE f = lpc_last[ j];208 LPC_TYPE f = lpc_last[ j];
200 LPC_TYPE b = lpc_last[i-1-j];209 LPC_TYPE b = lpc_last[i-1-j];
201 lpc[ j] = f + (LPC_TYPE_U)AAC_MUL26(r, b);210 lpc[ j] = f + (LPC_TYPE_U)LPC_MUL26(r, b);
202 lpc[i-1-j] = b + (LPC_TYPE_U)AAC_MUL26(r, f);211 lpc[i-1-j] = b + (LPC_TYPE_U)LPC_MUL26(r, f);
203 }212 }
204 213
205 if (fail && err < 0)214 if (fail && err < 0)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t