From 7508a0995e3b61d6bc60627ffb951a1ae62bfa05 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Mon, 26 Jun 2017 17:49:36 +0900 Subject: [PATCH] Disable unused GSM610 / G72X Change-Id: Ic625333d83c9f226da66d807b314e76670459519 --- packaging/libsndfile.spec | 2 +- src/Makefile.am | 28 ++++++---------------------- src/aiff.c | 6 ------ src/au.c | 14 -------------- src/common.h | 2 -- src/raw.c | 4 ---- src/w64.c | 4 ---- src/wav.c | 7 ------- 8 files changed, 7 insertions(+), 60 deletions(-) diff --git a/packaging/libsndfile.spec b/packaging/libsndfile.spec index 780a17c..6b706f3 100644 --- a/packaging/libsndfile.spec +++ b/packaging/libsndfile.spec @@ -1,6 +1,6 @@ Name: libsndfile Version: 1.0.28 -Release: 1 +Release: 2 License: LGPL-2.1+ Summary: C library for reading and writing sound files Group: Multimedia/Audio diff --git a/src/Makefile.am b/src/Makefile.am index ac79be8..ac722e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,26 +8,24 @@ lib_LTLIBRARIES = libsndfile.la include_HEADERS = sndfile.hh nodist_include_HEADERS = sndfile.h -noinst_LTLIBRARIES = GSM610/libgsm.la G72x/libg72x.la libcommon.la +noinst_LTLIBRARIES = libcommon.la SYMBOL_FILES = Symbols.gnu-binutils Symbols.darwin libsndfile-1.def Symbols.os2 Symbols.static EXTRA_DIST = sndfile.h.in config.h.in test_endswap.c test_endswap.tpl test_endswap.def \ $(SYMBOL_FILES) create_symbols_file.py binheader_writef_check.py \ - GSM610/README GSM610/COPYRIGHT GSM610/ChangeLog \ - G72x/README G72x/README.original G72x/ChangeLog \ make-static-lib-hidden-privates.sh noinst_HEADERS = common.h sfconfig.h sfendian.h wavlike.h sf_unistd.h ogg.h chanmap.h -check_PROGRAMS = test_main G72x/g72x_test +check_PROGRAMS = test_main -FILESPECIFIC = sndfile.c aiff.c au.c avr.c dwd.c flac.c g72x.c htk.c ircam.c \ +FILESPECIFIC = sndfile.c aiff.c au.c avr.c dwd.c flac.c htk.c ircam.c \ macos.c mat4.c mat5.c nist.c paf.c pvf.c raw.c rx2.c sd2.c \ sds.c svx.c txw.c voc.c wve.c w64.c wavlike.c wav.c xi.c mpc2k.c rf64.c \ ogg_vorbis.c ogg_speex.c ogg_pcm.c ogg_opus.c -CLEANFILES = *~ *.exe G72x/*.exe error.dat +CLEANFILES = *~ *.exe error.dat if USE_WIN_VERSION_FILE WIN_VERSION_FILE = version-metadata.rc @@ -43,13 +41,12 @@ libsndfile_la_CPPFLAGS = -DSNDFILE_EXPORTS libsndfile_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG) libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS) nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS) -libsndfile_la_LIBADD = GSM610/libgsm.la G72x/libg72x.la \ - libcommon.la $(EXTERNAL_XIPH_LIBS) -lm +libsndfile_la_LIBADD = libcommon.la $(EXTERNAL_XIPH_LIBS) -lm EXTRA_libsndfile_la_DEPENDENCIES = $(SYMBOL_FILES) libcommon_la_SOURCES = common.c file_io.c command.c pcm.c ulaw.c alaw.c \ - float32.c double64.c ima_adpcm.c ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c \ + float32.c double64.c ima_adpcm.c ms_adpcm.c dwvw.c vox_adpcm.c \ interleave.c strings.c dither.c cart.c broadcast.c audio_detect.c \ ima_oki_adpcm.c ima_oki_adpcm.h chunk.c ogg.c chanmap.c \ windows.c id3.c $(WIN_VERSION_FILE) @@ -58,15 +55,6 @@ libcommon_la_SOURCES = common.c file_io.c command.c pcm.c ulaw.c alaw.c \ #====================================================================== # Subdir libraries. -GSM610_libgsm_la_SOURCES = GSM610/config.h GSM610/gsm.h GSM610/gsm610_priv.h \ - GSM610/add.c GSM610/code.c GSM610/decode.c GSM610/gsm_create.c \ - GSM610/gsm_decode.c GSM610/gsm_destroy.c GSM610/gsm_encode.c \ - GSM610/gsm_option.c GSM610/long_term.c GSM610/lpc.c GSM610/preprocess.c \ - GSM610/rpe.c GSM610/short_term.c GSM610/table.c - -G72x_libg72x_la_SOURCES = G72x/g72x.h G72x/g72x_priv.h \ - G72x/g721.c G72x/g723_16.c G72x/g723_24.c G72x/g723_40.c G72x/g72x.c - #=============================================================================== # Test programs. @@ -76,9 +64,6 @@ test_main_SOURCES = test_main.c test_main.h test_conversions.c test_float.c test test_binheader_writef.c test_main_LDADD = libcommon.la -G72x_g72x_test_SOURCES = G72x/g72x_test.c -G72x_g72x_test_LDADD = G72x/libg72x.la - SUFFIXES = .def .tpl .def.c: @@ -86,7 +71,6 @@ SUFFIXES = .def .tpl check : @if [ -x /usr/bin/python ]; then $(srcdir)/binheader_writef_check.py $(srcdir)/*.c ; fi - G72x/g72x_test$(EXEEXT) all ./test_main$(EXEEXT) # Need this target to force building of test programs. diff --git a/src/aiff.c b/src/aiff.c index d0911a0..faf2e11 100644 --- a/src/aiff.c +++ b/src/aiff.c @@ -359,12 +359,6 @@ aiff_open (SF_PRIVATE *psf) break ; /* Lite remove end */ - case SF_FORMAT_GSM610 : - error = gsm610_init (psf) ; - if (psf->sf.frames > comm_fmt.numSampleFrames) - psf->sf.frames = comm_fmt.numSampleFrames ; - break ; - default : return SFE_UNIMPLEMENTED ; } ; diff --git a/src/au.c b/src/au.c index 57b8b5f..fd0072e 100644 --- a/src/au.c +++ b/src/au.c @@ -161,20 +161,6 @@ au_open (SF_PRIVATE *psf) error = double64_init (psf) ; break ; - case SF_FORMAT_G721_32 : - error = g72x_init (psf) ; - psf->sf.seekable = SF_FALSE ; - break ; - - case SF_FORMAT_G723_24 : - error = g72x_init (psf) ; - psf->sf.seekable = SF_FALSE ; - break ; - - case SF_FORMAT_G723_40 : - error = g72x_init (psf) ; - psf->sf.seekable = SF_FALSE ; - break ; /* Lite remove end */ default : break ; diff --git a/src/common.h b/src/common.h index 8a13b1d..8e01e25 100644 --- a/src/common.h +++ b/src/common.h @@ -916,10 +916,8 @@ int alaw_init (SF_PRIVATE *psf) ; int float32_init (SF_PRIVATE *psf) ; int double64_init (SF_PRIVATE *psf) ; int dwvw_init (SF_PRIVATE *psf, int bitwidth) ; -int gsm610_init (SF_PRIVATE *psf) ; int vox_adpcm_init (SF_PRIVATE *psf) ; int flac_init (SF_PRIVATE *psf) ; -int g72x_init (SF_PRIVATE * psf) ; int dither_init (SF_PRIVATE *psf, int mode) ; diff --git a/src/raw.c b/src/raw.c index e5dc49e..d640075 100644 --- a/src/raw.c +++ b/src/raw.c @@ -67,10 +67,6 @@ raw_open (SF_PRIVATE *psf) error = alaw_init (psf) ; break ; - case SF_FORMAT_GSM610 : - error = gsm610_init (psf) ; - break ; - /* Lite remove start */ case SF_FORMAT_FLOAT : error = float32_init (psf) ; diff --git a/src/w64.c b/src/w64.c index 1b84dd6..824ef83 100644 --- a/src/w64.c +++ b/src/w64.c @@ -206,10 +206,6 @@ w64_open (SF_PRIVATE *psf) break ; /* Lite remove end */ - case SF_FORMAT_GSM610 : - error = gsm610_init (psf) ; - break ; - default : return SFE_UNIMPLEMENTED ; } ; diff --git a/src/wav.c b/src/wav.c index 4b943dc..7452ae2 100644 --- a/src/wav.c +++ b/src/wav.c @@ -258,15 +258,8 @@ wav_open (SF_PRIVATE *psf) error = wavlike_msadpcm_init (psf, blockalign, framesperblock) ; break ; - case SF_FORMAT_G721_32 : - error = g72x_init (psf) ; - break ; /* Lite remove end */ - case SF_FORMAT_GSM610 : - error = gsm610_init (psf) ; - break ; - default : return SFE_UNIMPLEMENTED ; } ; -- 2.7.4