Mercurial > libavcodec.hg

changeset 10273:38147f0f94cc libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Specify maximum sample rate of MLP by defining the factor relative to 48000 instead of directly. This makes clear that the code assumes the maximum sample rate to be a multiple of 48000 and also removes the division from the MAX_BLOCKSIZE macros, which causes an issue with the Solaris assembler where "/" is a comment marker unless the --divide option is used.
author reimar
date Sat, 26 Sep 2009 16:04:35 +0000
parents cc02e912d20e
children bcf5c5551b3c
files mlp.h
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mlp.h	Sat Sep 26 05:48:50 2009 +0000
+++ b/mlp.h	Sat Sep 26 16:04:35 2009 +0000
@@ -47,13 +47,15 @@
  */
 #define MAX_SUBSTREAMS      3
 
+/** which multiple of 48000 the maximum sample rate is */
+#define MAX_RATEFACTOR      4
 /** maximum sample frequency seen in files */
-#define MAX_SAMPLERATE      192000
+#define MAX_SAMPLERATE      (MAX_RATEFACTOR * 48000)
 
 /** maximum number of audio samples within one access unit */
-#define MAX_BLOCKSIZE       (40 * (MAX_SAMPLERATE / 48000))
+#define MAX_BLOCKSIZE       (40 * MAX_RATEFACTOR)
 /** next power of two greater than MAX_BLOCKSIZE */
-#define MAX_BLOCKSIZE_POW2  (64 * (MAX_SAMPLERATE / 48000))
+#define MAX_BLOCKSIZE_POW2  (64 * MAX_RATEFACTOR)
 
 /** number of allowed filters */
 #define NUM_FILTERS         2