Permalink
Browse files

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.


git-svn-id: svn://svn.ffmpeg.org/ffmpeg/trunk/libavcodec@20026 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
  • Loading branch information...
reimar
reimar committed Sep 26, 2009
1 parent ddf0c47 commit a1fdeb7f4fb8a116a043bf387f71dac28e70cc2d
Showing with 5 additions and 3 deletions.
  1. +5 −3 mlp.h
View
8 mlp.h
@@ -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

0 comments on commit a1fdeb7

Please sign in to comment.