aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@xbmc.org>2011-02-06 02:27:01 +0200
committerAnssi Hannula <anssi@xbmc.org>2011-02-06 02:55:56 +0200
commitfb850073ae9b314f95534f62a58885c5e0d413e1 (patch)
treef901e54331a3a06e7112f7e0e9a74863d42f15ed /lib
parentb596936debdc9c36e367d186332aae2259390e46 (diff)
removed: use of deprecated libdts
libdts hasn't been used by default for a while. Remove the use of it completely in favor of ffmpeg.
Diffstat (limited to 'lib')
-rw-r--r--lib/DllDCACodec.h126
-rw-r--r--lib/Makefile.in28
2 files changed, 0 insertions, 154 deletions
diff --git a/lib/DllDCACodec.h b/lib/DllDCACodec.h
deleted file mode 100644
index 15927613c5..0000000000
--- a/lib/DllDCACodec.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#pragma once
-
-/*
- * Copyright (C) 2005-2008 Team XBMC
- * http://www.xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#if (defined HAVE_CONFIG_H) && (!defined WIN32)
- #include "config.h"
-#endif
-extern "C" {
-#if (defined USE_EXTERNAL_LIBDTS)
- #include <dts.h>
-#else
- #include "cores/dvdplayer/DVDCodecs/Audio/libdts/dts.h"
-#endif
-}
-#include "DynamicDll.h"
-#include "utils/log.h"
-
-#ifdef USE_LIBDTS_DECODER
-#ifndef _LINUX
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int8 uint8_t;
-typedef __int32 int32_t;
-typedef __int16 int16_t;
-#endif
-
-#ifdef LIBDTS_DOUBLE
-typedef float convert_t;
-#else
-typedef sample_t convert_t;
-#endif
-
-
-class DllDCACodecInterface
-{
-public:
- virtual ~DllDCACodecInterface() {}
- virtual dts_state_t * dts_init (uint32_t mm_accel)=0;
- virtual int dts_syncinfo (dts_state_t *state, uint8_t * buf, int * flags, int * sample_rate, int * bit_rate, int *frame_length)=0;
- virtual int dts_frame (dts_state_t * state, uint8_t * buf, int * flags, level_t * level, sample_t bias)=0;
- virtual void dts_dynrng (dts_state_t * state, level_t (* call) (level_t, void *), void * data)=0;
- virtual int dts_blocks_num (dts_state_t * state)=0;
- virtual int dts_block (dts_state_t * state)=0;
- virtual sample_t * dts_samples (dts_state_t * state)=0;
- virtual void dts_free (dts_state_t * state)=0;
-};
-
-#if (defined USE_EXTERNAL_LIBDTS)
-
-class DllDCACodec : public DllDynamic, DllDCACodecInterface
-{
-public:
- virtual ~DllDCACodec() {}
- virtual dts_state_t * dts_init (uint32_t mm_accel)
- { return ::dts_init (mm_accel); }
- virtual int dts_syncinfo (dts_state_t *state, uint8_t * buf, int * flags, int * sample_rate, int * bit_rate, int *frame_length)
- { return ::dts_syncinfo (state, buf, flags, sample_rate, bit_rate, frame_length); }
- virtual int dts_frame (dts_state_t * state, uint8_t * buf, int * flags, level_t * level, sample_t bias)
- { return ::dts_frame (state, buf, flags, level, bias); }
- virtual void dts_dynrng (dts_state_t * state, level_t (* call) (level_t, void *), void * data)
- { return ::dts_dynrng (state, call, data); }
- virtual int dts_blocks_num (dts_state_t * state)
- { return ::dts_blocks_num (state); }
- virtual int dts_block (dts_state_t * state)
- { return ::dts_block (state); }
- virtual sample_t * dts_samples (dts_state_t * state)
- { return ::dts_samples (state); }
- virtual void dts_free (dts_state_t * state)
- { return ::dts_free (state); }
-
- // DLL faking.
- virtual bool ResolveExports() { return true; }
- virtual bool Load() {
- CLog::Log(LOGDEBUG, "DllDCACodec: Using libdts system library");
- return true;
- }
- virtual void Unload() {}
-};
-
-#else
-
-class DllDCACodec : public DllDynamic, DllDCACodecInterface
-{
- DECLARE_DLL_WRAPPER(DllDCACodec, DLL_PATH_LIBDTS )
- DEFINE_METHOD1(dts_state_t *, dts_init, (uint32_t p1))
- DEFINE_METHOD6(int, dts_syncinfo, (dts_state_t *p1, uint8_t * p2, int * p3, int * p4, int * p5, int *p6))
- DEFINE_METHOD5(int, dts_frame, (dts_state_t * p1, uint8_t * p2, int * p3, level_t * p4, sample_t p5))
- DEFINE_METHOD3(void, dts_dynrng, (dts_state_t * p1, level_t (* p2) (level_t, void *), void * p3))
- DEFINE_METHOD1(int, dts_blocks_num ,(dts_state_t * p1))
- DEFINE_METHOD1(int, dts_block, (dts_state_t * p1))
- DEFINE_METHOD1(sample_t *, dts_samples, (dts_state_t * p1))
- DEFINE_METHOD1(void, dts_free, (dts_state_t * p1))
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD(dts_init)
- RESOLVE_METHOD(dts_syncinfo)
- RESOLVE_METHOD(dts_frame )
- RESOLVE_METHOD(dts_dynrng)
- RESOLVE_METHOD(dts_blocks_num)
- RESOLVE_METHOD(dts_block)
- RESOLVE_METHOD(dts_samples)
- RESOLVE_METHOD(dts_free)
- END_METHOD_RESOLVE()
-};
-
-#endif /* (defined USE_EXTERNAL_LIBDTS) */
-
-#endif /* USE_LIBDTS_DECODER */
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3cb090356c..970dc5265e 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -10,9 +10,6 @@ DIRS=
ifneq (@USE_EXTERNAL_FFMPEG@,1)
DIRS+=ffmpeg
endif
-ifeq (@USE_INTERNAL_LIBDTS@,1)
- DIRS+=libdts
-endif
LIBS=
ifneq (@USE_EXTERNAL_FFMPEG@,1)
@@ -23,9 +20,6 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1)
postproc-51-$(ARCH).so \
swscale-0.6.1-$(ARCH).so
endif
-ifeq (@USE_INTERNAL_LIBDTS@,1)
- LIBS+=libdts-$(ARCH).so
-endif
ifeq ($(findstring osx,$(ARCH)),osx)
DIRS+=libmad
@@ -101,14 +95,6 @@ ffmpeg/libpostproc/libpostproc.dylib : ffmpeg;
ffmpeg:
$(MAKE) -C $@
-$(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER_OSX) libdts/libdts/libdts.a
- $(CC) -bundle -flat_namespace -undefined suppress \
- -o $@ libdts/libdts/bitstream.o \
- libdts/libdts/downmix.o \
- libdts/libdts/parse.o
- $(WRAPPER_OSX) $@;mv output.so $@
- chmod +x $@
-
$(SYSDIR)/libfaad-$(ARCH).so: $(WRAPPER_OSX) libfaad2/libfaad/libfaad.la
ld -bundle -flat_namespace -undefined suppress -o $@ \
libfaad2/libfaad/*.o $(BUNDLE1_O)
@@ -119,10 +105,6 @@ $(SYSDIR)/libmad-$(ARCH).so: $(WRAPPER_OSX) libmad/libmad.la
libmad/.libs/*.o $(BUNDLE1_O)
$(WRAPPER_OSX) $@;mv output.so $@
-libdts/libdts/libdts.a : libdts;
-libdts:
- $(MAKE) -C $@
-
libfaad2/libfaad/libfaad.la: libfaad2;
libfaad2:
$(MAKE) -C $@
@@ -167,16 +149,6 @@ ffmpeg/libpostproc/libpostproc.so : ffmpeg;
ffmpeg:
$(MAKE) -C $@
-$(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
- libdts/libdts/bitstream.o \
- libdts/libdts/downmix.o libdts/libdts/parse.o \
- `cat $(WRAPPER:.o=.def)` $(WRAPPER)
-
-libdts/libdts/libdts.a : libdts;
-libdts:
- $(MAKE) -C $@
-
endif
clean: