Quoting Alex Converse (2015-01-22 20:04:40) > From: espes <[email protected]> > > --- > libavcodec/aactab.c | 494 > +++++++++++++++++++++++++++++++++++++++++++++++++++- > libavcodec/aactab.h | 6 +- > 2 files changed, 498 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c > index ee9a735..9f1e8af 100644 > --- a/libavcodec/aactab.c > +++ b/libavcodec/aactab.c > @@ -44,6 +44,10 @@ const uint8_t ff_aac_num_swb_512[] = { > 0, 0, 0, 36, 36, 37, 31, 31, 0, 0, 0, 0, 0 > }; > > +const uint8_t ff_aac_num_swb_480[] = { > + 0, 0, 0, 35, 35, 37, 30, 30, 0, 0, 0, 0, 0 > +}; > + > const uint8_t ff_aac_num_swb_128[] = { > 12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15 > }; > @@ -1126,6 +1130,14 @@ static const uint16_t swb_offset_512_48[] = { > 364, 396, 428, 460, 512 > }; > > +static const uint16_t swb_offset_480_48[] = { > + 0, 4, 8, 12, 16, 20, 24, 28, > + 32, 36, 40, 44, 48, 52, 56, 64, > + 72, 80, 88, 96, 108, 120, 132, 144, > + 156, 172, 188, 212, 240, 272, 304, 336, > + 368, 400, 432, 480 > +}; > + > static const uint16_t swb_offset_128_48[] = { > 0, 4, 8, 12, 16, 20, 28, 36, > 44, 56, 68, 80, 96, 112, 128 > @@ -1149,6 +1161,14 @@ static const uint16_t swb_offset_512_32[] = { > 352, 384, 416, 448, 480, 512 > }; > > +static const uint16_t swb_offset_480_32[] = { > + 0, 4, 8, 12, 16, 20, 24, 28, > + 32, 36, 40, 44, 48, 52, 56, 60, > + 64, 72, 80, 88, 96, 104, 112, 124, > + 136, 148, 164, 180, 200, 224, 256, 288, > + 320, 352, 384, 416, 448, 480 > + }; > + > static const uint16_t swb_offset_1024_24[] = { > 0, 4, 8, 12, 16, 20, 24, 28, > 32, 36, 40, 44, 52, 60, 68, 76, > @@ -1165,6 +1185,13 @@ static const uint16_t swb_offset_512_24[] = { > 288, 320, 352, 384, 416, 448, 480, 512, > }; > > +static const uint16_t swb_offset_480_24[] = { > + 0, 4, 8, 12, 16, 20, 24, 28, > + 32, 36, 40, 44, 52, 60, 68, 80, > + 92, 104, 120, 140, 164, 192, 224, 256, > + 288, 320, 352, 384, 416, 448, 480 > +}; > + > static const uint16_t swb_offset_128_24[] = { > 0, 4, 8, 12, 16, 20, 24, 28, > 36, 44, 52, 64, 76, 92, 108, 128 > @@ -1214,6 +1241,14 @@ const uint16_t * const ff_swb_offset_512[] = { > NULL > }; > > +const uint16_t * const ff_swb_offset_480[] = { > + NULL, NULL, NULL, > + swb_offset_480_48, swb_offset_480_48, swb_offset_480_32, > + swb_offset_480_24, swb_offset_480_24, NULL, > + NULL, NULL, NULL, > + NULL > +}; > + > const uint16_t * const ff_swb_offset_128[] = { > /* The last entry on the following row is swb_offset_128_64 but is a > duplicate of swb_offset_128_96. */ > @@ -1240,12 +1275,16 @@ const uint8_t ff_tns_max_bands_512[] = { > 0, 0, 0, 31, 32, 37, 31, 31, 0, 0, 0, 0, 0 > }; > > +const uint8_t ff_tns_max_bands_480[] = { > + 0, 0, 0, 31, 32, 37, 30, 30, 0, 0, 0, 0, 0 > +}; > + > const uint8_t ff_tns_max_bands_128[] = { > 9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14 > }; > // @} > > -const DECLARE_ALIGNED(32, float, ff_aac_eld_window)[1920] = { > +const DECLARE_ALIGNED(32, float, ff_aac_eld_window_512)[1920] = {
This is missing a matching rename in aacdec.c, so it probably won't compile. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
