ffmpeg | branch: master | Lynne <d...@lynne.ee> | Wed Jun 12 03:25:07 2024 
+0200| [d79fbad366896873d9d4d219cce9578797944dea] | committer: Lynne

aacdec_usac: rename spectrum decode function and remove unused arg

The LC part of the decoder combines scalefactor application with
spectrum decoding, and this was the plan here, but that's not possible,
so change the function name.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d79fbad366896873d9d4d219cce9578797944dea
---

 libavcodec/aac/aacdec_usac.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
index 100203ff71..81aba5ddf4 100644
--- a/libavcodec/aac/aacdec_usac.c
+++ b/libavcodec/aac/aacdec_usac.c
@@ -560,10 +560,9 @@ static int decode_usac_scale_factors(AACDecContext *ac,
  *
  * @return  Returns error status. 0 - OK, !0 - error
  */
-static int decode_spectrum_and_dequant_ac(AACDecContext *s, float coef[1024],
-                                          GetBitContext *gb, const float 
sf[120],
-                                          AACArithState *state, int reset,
-                                          uint16_t len, uint16_t N)
+static int decode_spectrum_ac(AACDecContext *s, float coef[1024],
+                              GetBitContext *gb, AACArithState *state,
+                              int reset, uint16_t len, uint16_t N)
 {
     AACArith ac;
     int i, a, b;
@@ -1396,10 +1395,8 @@ static int decode_usac_core_coder(AACDecContext *ac, 
AACUSACConfig *usac,
             else
                 N = usac->core_frame_len;
 
-            ret = decode_spectrum_and_dequant_ac(ac, sce->coeffs + win*128, gb,
-                                                 sce->sf, &ue->ac,
-                                                 arith_reset_flag && (win == 
0),
-                                                 lg, N);
+            ret = decode_spectrum_ac(ac, sce->coeffs + win*128, gb, &ue->ac,
+                                     arith_reset_flag && (win == 0), lg, N);
             if (ret < 0)
                 return ret;
         }

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to