Qt: first attempt at a QMenuView

[vlc] / modules / audio_mixer / fixed32.c

diff --git a/modules/audio_mixer/fixed32.c b/modules/audio_mixer/fixed32.c
index 3c68b5b86d358519a13504970daf6abddc6a9602..4075edae6989fdf13a728bb3aab2cd73e166f8d4 100644 (file)
--- a/modules/audio_mixer/fixed32.c
+++ b/modules/audio_mixer/fixed32.c
@@ -3,19 +3,19 @@
  *****************************************************************************
  * Copyright (C) 2011 Rémi Denis-Courmont
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -37,14 +37,14 @@ vlc_module_begin ()
     set_callbacks (Activate, NULL)
 vlc_module_end ()
 
-static void FilterFI32 (aout_mixer_t *, block_t *, float);
-static void FilterS16N (aout_mixer_t *, block_t *, float);
+static void FilterFI32 (audio_mixer_t *, block_t *, float);
+static void FilterS16N (audio_mixer_t *, block_t *, float);
 
 static int Activate (vlc_object_t *obj)
 {
-    aout_mixer_t *mixer = (aout_mixer_t *)obj;
+    audio_mixer_t *mixer = (audio_mixer_t *)obj;
 
-    switch (mixer->fmt.i_format)
+    switch (mixer->format)
     {
         case VLC_CODEC_FI32:
             mixer->mix = FilterFI32;
@@ -58,34 +58,52 @@ static int Activate (vlc_object_t *obj)
     return 0;
 }
 
-static void FilterFI32 (aout_mixer_t *mixer, block_t *block, float volume)
+static void FilterFI32 (audio_mixer_t *mixer, block_t *block, float volume)
 {
-    const int64_t mult = volume * mixer->input->multiplier * FIXED32_ONE;
+    const int64_t mult = volume * 0x1.p32;
 
-    if (mult == FIXED32_ONE)
+    if (mult == 0x1.p32)
         return;
 
     int32_t *p = (int32_t *)block->p_buffer;
 
     for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
     {
-        *p = (*p * mult) >> 33; // FIXED32_FRACBITS;
+        *p = (*p * mult) >> INT64_C(32);
         p++;
     }
+
+    (void) mixer;
 }
 
-static void FilterS16N (aout_mixer_t *mixer, block_t *block, float volume)
+static void FilterS16N (audio_mixer_t *mixer, block_t *block, float volume)
 {
-    const int32_t mult = volume * mixer->input->multiplier * 0x10000;
+    int32_t mult = volume * 0x1.p16;
 
     if (mult == 0x10000)
         return;
 
     int16_t *p = (int16_t *)block->p_buffer;
 
-    for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
+    if (mult < 0x10000)
     {
-        *p = (*p * mult) >> 16;
-        p++;
+        for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
+        {
+            *p = (*p * mult) >> 16;
+            p++;
+        }
     }
+    else
+    {
+        mult >>= 4;
+        for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
+        {
+            int32_t v = (*p * mult) >> 12;
+            if (abs (v) > 0x7fff)
+                v = 0x8000;
+            *(p++) = v;
+        }
+    }
+
+    (void) mixer;
 }