| Message ID | 20201230233157.1055287-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | 768418292194a82821f92b782ad50e5fe53121f1 |
| Headers | show |
| Series | [FFmpeg-devel,01/30] avcodec/opustab: Make array static | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavcodec/opustab.c | 12 ++++++------ > libavcodec/opustab.h | 1 - > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/opustab.c b/libavcodec/opustab.c > index 64070f8299..7276dad793 100644 > --- a/libavcodec/opustab.c > +++ b/libavcodec/opustab.c > @@ -950,7 +950,7 @@ const uint16_t ff_celt_qn_exp2[] = { > 16384, 17866, 19483, 21247, 23170, 25267, 27554, 30048 > }; > > -const uint32_t ff_celt_pvq_u[1272] = { > +static const uint32_t celt_pvq_u[1272] = { > /* N = 0, K = 0...176 */ > 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > @@ -1153,9 +1153,9 @@ const float ff_celt_window2[120] = { > }; > > const uint32_t * const ff_celt_pvq_u_row[15] = { > - ff_celt_pvq_u + 0, ff_celt_pvq_u + 176, ff_celt_pvq_u + 351, > - ff_celt_pvq_u + 525, ff_celt_pvq_u + 698, ff_celt_pvq_u + 870, > - ff_celt_pvq_u + 1041, ff_celt_pvq_u + 1131, ff_celt_pvq_u + 1178, > - ff_celt_pvq_u + 1207, ff_celt_pvq_u + 1226, ff_celt_pvq_u + 1240, > - ff_celt_pvq_u + 1248, ff_celt_pvq_u + 1254, ff_celt_pvq_u + 1257 > + celt_pvq_u + 0, celt_pvq_u + 176, celt_pvq_u + 351, > + celt_pvq_u + 525, celt_pvq_u + 698, celt_pvq_u + 870, > + celt_pvq_u + 1041, celt_pvq_u + 1131, celt_pvq_u + 1178, > + celt_pvq_u + 1207, celt_pvq_u + 1226, celt_pvq_u + 1240, > + celt_pvq_u + 1248, celt_pvq_u + 1254, celt_pvq_u + 1257 > }; > diff --git a/libavcodec/opustab.h b/libavcodec/opustab.h > index 892126bb23..cdd0456e3c 100644 > --- a/libavcodec/opustab.h > +++ b/libavcodec/opustab.h > @@ -152,7 +152,6 @@ extern const uint8_t ff_celt_bit_deinterleave[]; > extern const uint8_t ff_celt_hadamard_order[]; > > extern const uint16_t ff_celt_qn_exp2[]; > -extern const uint32_t ff_celt_pvq_u[1272]; > > extern const float ff_celt_postfilter_taps[3][3]; > > Lynne has approved the opus/aac/dirac and mlp patches on IRC. I am therefore apply 1-4, 9-12, 15-20, 23 and 29 later today (10 and 11 with cosmetic changes requested by Lynne, 29 with the changes requested by Michael). - Andreas
diff --git a/libavcodec/opustab.c b/libavcodec/opustab.c index 64070f8299..7276dad793 100644 --- a/libavcodec/opustab.c +++ b/libavcodec/opustab.c @@ -950,7 +950,7 @@ const uint16_t ff_celt_qn_exp2[] = { 16384, 17866, 19483, 21247, 23170, 25267, 27554, 30048 }; -const uint32_t ff_celt_pvq_u[1272] = { +static const uint32_t celt_pvq_u[1272] = { /* N = 0, K = 0...176 */ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1153,9 +1153,9 @@ const float ff_celt_window2[120] = { }; const uint32_t * const ff_celt_pvq_u_row[15] = { - ff_celt_pvq_u + 0, ff_celt_pvq_u + 176, ff_celt_pvq_u + 351, - ff_celt_pvq_u + 525, ff_celt_pvq_u + 698, ff_celt_pvq_u + 870, - ff_celt_pvq_u + 1041, ff_celt_pvq_u + 1131, ff_celt_pvq_u + 1178, - ff_celt_pvq_u + 1207, ff_celt_pvq_u + 1226, ff_celt_pvq_u + 1240, - ff_celt_pvq_u + 1248, ff_celt_pvq_u + 1254, ff_celt_pvq_u + 1257 + celt_pvq_u + 0, celt_pvq_u + 176, celt_pvq_u + 351, + celt_pvq_u + 525, celt_pvq_u + 698, celt_pvq_u + 870, + celt_pvq_u + 1041, celt_pvq_u + 1131, celt_pvq_u + 1178, + celt_pvq_u + 1207, celt_pvq_u + 1226, celt_pvq_u + 1240, + celt_pvq_u + 1248, celt_pvq_u + 1254, celt_pvq_u + 1257 }; diff --git a/libavcodec/opustab.h b/libavcodec/opustab.h index 892126bb23..cdd0456e3c 100644 --- a/libavcodec/opustab.h +++ b/libavcodec/opustab.h @@ -152,7 +152,6 @@ extern const uint8_t ff_celt_bit_deinterleave[]; extern const uint8_t ff_celt_hadamard_order[]; extern const uint16_t ff_celt_qn_exp2[]; -extern const uint32_t ff_celt_pvq_u[1272]; extern const float ff_celt_postfilter_taps[3][3];
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavcodec/opustab.c | 12 ++++++------ libavcodec/opustab.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-)