summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-02-05 15:30:40 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-02-05 15:30:40 +0100
commit9cbc128a740105ffb0289e0bf2ea2cd788d132ae (patch)
tree66035870cadf2c73b4321bf85433b509e79cfab1
parent04439446eec8ba884addc7ab3a1ba816ee42f223 (diff)
downloadODR-AudioEnc-9cbc128a740105ffb0289e0bf2ea2cd788d132ae.tar.gz
ODR-AudioEnc-9cbc128a740105ffb0289e0bf2ea2cd788d132ae.tar.bz2
ODR-AudioEnc-9cbc128a740105ffb0289e0bf2ea2cd788d132ae.zip
Remove toolame downmix as it is unused
-rw-r--r--TODO6
-rw-r--r--libtoolame-dab.sym1
-rw-r--r--libtoolame-dab/options.h1
-rw-r--r--libtoolame-dab/toolame.c9
-rw-r--r--libtoolame-dab/toolame.h1
5 files changed, 0 insertions, 18 deletions
diff --git a/TODO b/TODO
index 70ef965..20ff30b 100644
--- a/TODO
+++ b/TODO
@@ -11,9 +11,3 @@ Insert drift compensation statistics into ZeroMQ metadata. This would maybe
need a new protocol version and adaptations in ODR-DabMux, but ideally should
be done in a backward-compatible way.
-
-DAB stereo downmix
-------------------
-
-There is no cmdline option to call the toolame_enable_downmix_stereo()
-function.
diff --git a/libtoolame-dab.sym b/libtoolame-dab.sym
index 13d6fa0..ec437fa 100644
--- a/libtoolame-dab.sym
+++ b/libtoolame-dab.sym
@@ -1,6 +1,5 @@
toolame_init
toolame_finish
-toolame_enable_downmix_stereo
toolame_enable_byteswap
toolame_set_channel_mode
toolame_set_psy_model
diff --git a/libtoolame-dab/options.h b/libtoolame-dab/options.h
index ea4d0e4..497f304 100644
--- a/libtoolame-dab/options.h
+++ b/libtoolame-dab/options.h
@@ -11,7 +11,6 @@ typedef struct
int usepadbit; /* TRUE by default, use a padding bit */
int quickmode; /* FALSE calculate psy model for every frame */
int quickcount; /* 10 when quickmode = TRUE, calculate psymodel every 10th frame */
- int downmix; /* FALSE downmix from stereo to mono */
int byteswap; /* FALSE swap the bytes */
int dab; /* FALSE DAB extensions */
int vbr; /* FALSE switch for VBR mode */
diff --git a/libtoolame-dab/toolame.c b/libtoolame-dab/toolame.c
index 4e0c7d8..1f874e3 100644
--- a/libtoolame-dab/toolame.c
+++ b/libtoolame-dab/toolame.c
@@ -35,7 +35,6 @@ void global_init (void)
glopts.usepadbit = TRUE;
glopts.quickmode = FALSE;
glopts.quickcount = 10;
- glopts.downmix = FALSE;
glopts.byteswap = FALSE;
glopts.vbr = FALSE;
glopts.vbrlevel = 0;
@@ -166,14 +165,6 @@ int toolame_finish(
return bs.output_buffer_written;
}
-int toolame_enable_downmix_stereo(void)
-{
- glopts.downmix = TRUE;
- header.mode = MPG_MD_MONO;
- header.mode_ext = 0;
- return 0;
-}
-
int toolame_enable_byteswap(void)
{
glopts.byteswap = TRUE;
diff --git a/libtoolame-dab/toolame.h b/libtoolame-dab/toolame.h
index 998ac4f..e80f209 100644
--- a/libtoolame-dab/toolame.h
+++ b/libtoolame-dab/toolame.h
@@ -20,7 +20,6 @@ int toolame_finish(
unsigned char *output_buffer,
size_t output_buffer_size);
-int toolame_enable_downmix_stereo(void);
int toolame_enable_byteswap(void);
/*! Set channel mode. Allowed values: