diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-09-05 21:34:43 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-09-05 21:37:08 -0400 |
commit | 91904a4c91eb19abcebe843045f4599ee67adbee (patch) | |
tree | 22931316399218cc887be421e473260fe4840e7d /src/analysis.h | |
parent | 0f68696a97ca2e42ec452fef1dc421faa3aa2092 (diff) | |
download | libopus-91904a4c91eb19abcebe843045f4599ee67adbee.tar.gz |
Moves the analysis back to opus_encode_native() to it runs for all streams.
I checked that it's not *completely* busted, but it probably needs more testing.
Diffstat (limited to 'src/analysis.h')
-rw-r--r-- | src/analysis.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/analysis.h b/src/analysis.h index 8cd78883..4371a577 100644 --- a/src/analysis.h +++ b/src/analysis.h @@ -79,12 +79,12 @@ typedef struct { } TonalityAnalysisState; void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info, - const CELTMode *celt_mode, const void *x, int len, int offset, int C, int lsb_depth, downmix_func downmix); + const CELTMode *celt_mode, const void *x, int len, int offset, int c1, int c2, int C, int lsb_depth, downmix_func downmix); void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len); -int run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *pcm, - const void *analysis_pcm, int frame_size, int variable_duration, int C, opus_int32 Fs, int bitrate_bps, +int run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const opus_val16 *pcm, + const void *analysis_pcm, int frame_size, int variable_duration, int c1, int c2, int C, opus_int32 Fs, int bitrate_bps, int delay_compensation, int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info); #endif |