From 8cb555460ff79e636a7907fb2589e16db98c8600 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Fri, 17 Jul 2020 00:01:32 -0400
Subject: [3/4]  Completely remove HWCODEC support

'swcodec' is now always set (and recording_swcodec for recording-capable
units) in feature.txt so the manual and language strings don't need to
all be fixed up.

Change-Id: Ib2c9d5d157af8d33653e2d4b4a12881b9aa6ddb0
---
 lib/rbcodec/codecs/codecs.h    | 10 ++++------
 lib/rbcodec/codecs/lib/SOURCES |  3 +--
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib/rbcodec/codecs')

diff --git a/lib/rbcodec/codecs/codecs.h b/lib/rbcodec/codecs/codecs.h
index e04727fea8..6048e5012c 100644
--- a/lib/rbcodec/codecs/codecs.h
+++ b/lib/rbcodec/codecs/codecs.h
@@ -34,14 +34,12 @@
 #include "profile.h"
 #include "thread.h"
 #endif
-#if (CONFIG_CODEC == SWCODEC)
 #ifdef HAVE_RECORDING
 #include "enc_base.h"
 #endif
 #include "dsp_core.h"
 #include "dsp_misc.h"
 #include "dsp-util.h"
-#endif
 
 #include "gcc_extensions.h"
 #include "load_code.h"
@@ -281,18 +279,18 @@ int codec_load_buf(int hid, struct codec_api *api);
 int codec_load_file(const char* codec, struct codec_api *api);
 int codec_run_proc(void);
 int codec_close(void);
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_RECORDING)
+#if defined(HAVE_RECORDING)
 enc_callback_t codec_get_enc_callback(void);
-#else
-#define codec_get_enc_callback()  NULL
 #endif
 
 /* defined by the codec */
 enum codec_status codec_start(enum codec_entry_call_reason reason);
 enum codec_status codec_main(enum codec_entry_call_reason reason);
 enum codec_status codec_run(void);
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_RECORDING)
+#if defined(HAVE_RECORDING)
 int enc_callback(enum enc_callback_reason reason, void *params);
+#else
+#define codec_get_enc_callback()  NULL
 #endif
 
 #endif /* _CODECS_H_ */
diff --git a/lib/rbcodec/codecs/lib/SOURCES b/lib/rbcodec/codecs/lib/SOURCES
index f4b951a5eb..ffa7184019 100644
--- a/lib/rbcodec/codecs/lib/SOURCES
+++ b/lib/rbcodec/codecs/lib/SOURCES
@@ -1,4 +1,3 @@
-#if CONFIG_CODEC == SWCODEC /* software codec platforms */
 codeclib.c
 ffmpeg_bitstream.c
 
@@ -6,6 +5,6 @@ mdct_lookup.c
 fft-ffmpeg.c
 mdct.c
 
-#elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__)
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__)
 osx.dummy.c
 #endif
-- 
cgit v1.2.3