1 files changed, 9 insertions, 8 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.h b/apps/plugins/mpegplayer/mpegplayer.h
index 11bc1ea669..b92af38e6c 100644
--- a/apps/plugins/mpegplayer/mpegplayer.h
+++ b/apps/plugins/mpegplayer/mpegplayer.h
@@ -53,18 +53,19 @@ enum mpeg_malloc_reason_t
 #define AUDIOBUF_ALLOC_SIZE (AUDIOBUF_SIZE+AUDIOBUF_GUARD_SIZE)
 /** PCM buffer **/
-#define CLOCK_RATE 44100 /* Our clock rate in ticks/second (samplerate) */
+#define CLOCK_RATE NATIVE_FREQUENCY /* Our clock rate in ticks/second (samplerate) */
 /* Define this as "1" to have a test tone instead of silence clip */
 #define SILENCE_TEST_TONE 0
-#define PCMOUT_BUFSIZE    (CLOCK_RATE) /* 1s */
+#define PCMOUT_BUFSIZE       (CLOCK_RATE/2*4) /* 1/2s */
-#define PCMOUT_GUARD_SIZE (1152*4 + sizeof (struct pcm_frame_header))
+#define PCMOUT_GUARD_SAMPLES ((CLOCK_RATE*576+7999)/8000) /* Worst upsampling case */
-#define PCMOUT_ALLOC_SIZE (PCMOUT_BUFSIZE + PCMOUT_GUARD_SIZE)
+#define PCMOUT_GUARD_SIZE    (PCMOUT_GUARD_SAMPLES*4 + sizeof (struct pcm_frame_header))
-                          /* Start pcm playback @ 25% full */
+#define PCMOUT_ALLOC_SIZE    (PCMOUT_BUFSIZE + PCMOUT_GUARD_SIZE)
-#define PCMOUT_PLAY_WM    (PCMOUT_BUFSIZE/4)
+                             /* Start pcm playback @ 25% full */
-                          /* No valid audio frame is smaller */
+#define PCMOUT_PLAY_WM       (PCMOUT_BUFSIZE/4)
-#define PCMOUT_LOW_WM     (sizeof (struct pcm_frame_header))
+                             /* No valid audio frame is smaller */
+#define PCMOUT_LOW_WM        (sizeof (struct pcm_frame_header))
 /** disk buffer **/
 #define DISK_BUF_LOW_WATERMARK (1024*1024)

diff --git a/apps/plugins/mpegplayer/mpegplayer.h b/apps/plugins/mpegplayer/mpegplayer.h index 11bc1ea669..b92af38e6c 100644 --- a/apps/plugins/mpegplayer/mpegplayer.h +++ b/apps/plugins/mpegplayer/mpegplayer.h
@@ -53,18 +53,19 @@ enum mpeg_malloc_reason_t
53	#define AUDIOBUF_ALLOC_SIZE (AUDIOBUF_SIZE+AUDIOBUF_GUARD_SIZE)	53	#define AUDIOBUF_ALLOC_SIZE (AUDIOBUF_SIZE+AUDIOBUF_GUARD_SIZE)
54		54
55	/ PCM buffer /	55	/ PCM buffer /
56	#define CLOCK_RATE 44100 /* Our clock rate in ticks/second (samplerate) */	56	#define CLOCK_RATE NATIVE_FREQUENCY /* Our clock rate in ticks/second (samplerate) */
57		57
58	/* Define this as "1" to have a test tone instead of silence clip */	58	/* Define this as "1" to have a test tone instead of silence clip */
59	#define SILENCE_TEST_TONE 0	59	#define SILENCE_TEST_TONE 0
60		60
61	#define PCMOUT_BUFSIZE (CLOCK_RATE) /* 1s */	61	#define PCMOUT_BUFSIZE (CLOCK_RATE/24) / 1/2s */
62	#define PCMOUT_GUARD_SIZE (1152*4 + sizeof (struct pcm_frame_header))	62	#define PCMOUT_GUARD_SAMPLES ((CLOCK_RATE576+7999)/8000) / Worst upsampling case */
63	#define PCMOUT_ALLOC_SIZE (PCMOUT_BUFSIZE + PCMOUT_GUARD_SIZE)	63	#define PCMOUT_GUARD_SIZE (PCMOUT_GUARD_SAMPLES*4 + sizeof (struct pcm_frame_header))
64	/* Start pcm playback @ 25% full */	64	#define PCMOUT_ALLOC_SIZE (PCMOUT_BUFSIZE + PCMOUT_GUARD_SIZE)
65	#define PCMOUT_PLAY_WM (PCMOUT_BUFSIZE/4)	65	/* Start pcm playback @ 25% full */
66	/* No valid audio frame is smaller */	66	#define PCMOUT_PLAY_WM (PCMOUT_BUFSIZE/4)
67	#define PCMOUT_LOW_WM (sizeof (struct pcm_frame_header))	67	/* No valid audio frame is smaller */
		68	#define PCMOUT_LOW_WM (sizeof (struct pcm_frame_header))
68		69
69	/ disk buffer /	70	/ disk buffer /
70	#define DISK_BUF_LOW_WATERMARK (1024*1024)	71	#define DISK_BUF_LOW_WATERMARK (1024*1024)