From 9b925784829206498f45a6eb373561b85d69c63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Wed, 4 Jul 2012 22:26:43 +0300
Subject: [PATCH] Volume mixer: drop FI32
---
modules/LIST | 2 +-
modules/audio_mixer/Modules.am | 4 +--
modules/audio_mixer/{fixed32.c => integer.c} | 26 ++------------------
po/POTFILES.in | 2 +-
4 files changed, 6 insertions(+), 28 deletions(-)
rename modules/audio_mixer/{fixed32.c => integer.c} (79%)
diff --git a/modules/LIST b/modules/LIST
index 69ed75bc4a66..f0ce593e2eda 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -120,7 +120,6 @@ $Id$
* faad: AAC decoder using libfaad2
* fb: video output module for the Linux framebuffer
* filesystem: Filesystem access module
- * fixed32_mixer: Fixed-point audio mixer
* flac: Flac decoder using libflac
* flacsys: FLAC demuxer
* float32_mixer: Precise float32 audio mixer
@@ -163,6 +162,7 @@ $Id$
* idummy: dummy input
* image: Image file video output
* inhibit: preventing the computer from suspending
+ * integer_mixer: Integer audio mixer
* invert: inverse video filter
* iomx: IPC/OpenMaxIL for Android
* jack: jack server audio output
diff --git a/modules/audio_mixer/Modules.am b/modules/audio_mixer/Modules.am
index fe1051cd15df..e04197c2102d 100644
--- a/modules/audio_mixer/Modules.am
+++ b/modules/audio_mixer/Modules.am
@@ -1,6 +1,6 @@
SOURCES_float32_mixer = float32.c
-SOURCES_fixed32_mixer = fixed32.c
+SOURCES_integer_mixer = integer.c
libvlc_LTLIBRARIES += \
libfloat32_mixer_plugin.la \
- libfixed32_mixer_plugin.la
+ libinteger_mixer_plugin.la
diff --git a/modules/audio_mixer/fixed32.c b/modules/audio_mixer/integer.c
similarity index 79%
rename from modules/audio_mixer/fixed32.c
rename to modules/audio_mixer/integer.c
index 4075edae6989..8d2c3fc8282e 100644
--- a/modules/audio_mixer/fixed32.c
+++ b/modules/audio_mixer/integer.c
@@ -1,5 +1,5 @@
/*****************************************************************************
- * fixed32.c : fixed-point software volume
+ * integer.c: integer software volume
*****************************************************************************
* Copyright (C) 2011 Rémi Denis-Courmont
*
@@ -32,12 +32,11 @@ static int Activate (vlc_object_t *);
vlc_module_begin ()
set_category (CAT_AUDIO)
set_subcategory (SUBCAT_AUDIO_MISC)
- set_description (N_("Fixed-point audio mixer"))
+ set_description (N_("Integer audio mixer"))
set_capability ("audio mixer", 9)
set_callbacks (Activate, NULL)
vlc_module_end ()
-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)
@@ -46,9 +45,6 @@ static int Activate (vlc_object_t *obj)
switch (mixer->format)
{
- case VLC_CODEC_FI32:
- mixer->mix = FilterFI32;
- break;
case VLC_CODEC_S16N:
mixer->mix = FilterS16N;
break;
@@ -58,24 +54,6 @@ static int Activate (vlc_object_t *obj)
return 0;
}
-static void FilterFI32 (audio_mixer_t *mixer, block_t *block, float volume)
-{
- const int64_t mult = volume * 0x1.p32;
-
- 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) >> INT64_C(32);
- p++;
- }
-
- (void) mixer;
-}
-
static void FilterS16N (audio_mixer_t *mixer, block_t *block, float volume)
{
int32_t mult = volume * 0x1.p16;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cbac103d9762..f8a2bb97aaa5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -319,8 +319,8 @@ modules/audio_filter/spatializer/revmodel.cpp
modules/audio_filter/spatializer/revmodel.hpp
modules/audio_filter/spatializer/spatializer.cpp
modules/audio_filter/spatializer/tuning.h
-modules/audio_mixer/fixed32.c
modules/audio_mixer/float32.c
+modules/audio_mixer/integer.c
modules/audio_output/adummy.c
modules/audio_output/alsa.c
modules/audio_output/amem.c
--
GitLab