[FFmpeg-cvslog] aac: Simplify decode_mid_side_stereo

Luca Barbato git at videolan.org
Tue Dec 2 21:37:27 CET 2014


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Nov 21 12:57:36 2014 +0000| [7464e98f74c03d3efa0cdc8d7abad06e4c3c277a] | committer: Vittorio Giovara

aac: Simplify decode_mid_side_stereo

Might spare few cycles if the compiler is naive and
makes the function more readable.

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

 libavcodec/aacdec.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 76190e2..9c0a46d 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -1419,13 +1419,12 @@ static void decode_mid_side_stereo(ChannelElement *cpe, GetBitContext *gb,
                                    int ms_present)
 {
     int idx;
+    int max_idx = cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb;
     if (ms_present == 1) {
-        for (idx = 0;
-             idx < cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb;
-             idx++)
+        for (idx = 0; idx < max_idx; idx++)
             cpe->ms_mask[idx] = get_bits1(gb);
     } else if (ms_present == 2) {
-        memset(cpe->ms_mask, 1, cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb * sizeof(cpe->ms_mask[0]));
+        memset(cpe->ms_mask, 1, max_idx * sizeof(cpe->ms_mask[0]));
     }
 }
 



More information about the ffmpeg-cvslog mailing list