summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2016-11-23 12:40:46 -0500
committerJean-Marc Valin <jmvalin@jmvalin.ca>2016-11-23 12:40:46 -0500
commita6d541d83680a09424546a12fa49d4092db0f5c8 (patch)
tree3c7037e0755bf039808265a46ad2a4af54651d21
parentab9d01ee1d886a584957aaaf4b4d43ae5180e0ce (diff)
downloadopus-a6d541d83680a09424546a12fa49d4092db0f5c8.tar.gz
MLP_TRAINING instead of manual comments
-rw-r--r--src/analysis.c6
-rw-r--r--src/analysis.h3
-rw-r--r--src/opus_encoder.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/src/analysis.c b/src/analysis.c
index 262b76f6..29970927 100644
--- a/src/analysis.c
+++ b/src/analysis.c
@@ -718,9 +718,11 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
#else
info->music_prob = 0;
#endif
- /*for (i=0;i<25;i++)
+#ifdef MLP_TRAINING
+ for (i=0;i<25;i++)
printf("%f ", features[i]);
- printf("\n");*/
+ printf("\n");
+#endif
info->bandwidth = bandwidth;
/*printf("%d %d\n", info->bandwidth, info->opus_bandwidth);*/
diff --git a/src/analysis.h b/src/analysis.h
index 1ad6c53a..ce9a989f 100644
--- a/src/analysis.h
+++ b/src/analysis.h
@@ -38,6 +38,9 @@
#define DETECT_SIZE 200
+/* Uncomment this to print the MLP features on stdout. */
+/*#define MLP_TRAINING*/
+
typedef struct {
int arch;
#define TONALITY_ANALYSIS_RESET_START angle
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 03714f01..8f228093 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -932,7 +932,9 @@ static int is_digital_silence(const opus_val16* pcm, int frame_size, int channel
{
int silence = 0;
opus_val32 sample_max = 0;
-
+#ifdef MLP_TRAINING
+ return 0;
+#endif
sample_max = celt_maxabs16(pcm, frame_size*channels);
#ifdef FIXED_POINT