summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-05-07 20:20:13 +0300
committerUoti Urpala <uau@mplayer2.org>2011-05-07 22:17:51 +0300
commitb21e7dc7a94448066bdcc66287d6c5a68a3e1978 (patch)
tree40b81be806f10b0b9be597353e5fadbb436ed533 /mplayer.c
parentdaafc5a368266dc2206b7da0c107b98e0ca042d6 (diff)
downloadmpv-b21e7dc7a94448066bdcc66287d6c5a68a3e1978.tar.bz2
mpv-b21e7dc7a94448066bdcc66287d6c5a68a3e1978.tar.xz
audio: disallow partial samples, fix ad_pcm to comply
Add some asserts to check that decoders/filters produce complete samples (byte amounts must be multiples of channels*datatype_size) and that audio output drivers also accept input in complete units. Fix ad_pcm which was known to violate this if its last input packet didn't stop at a sample boundary.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index af3ad127eb..0e519d20a6 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <math.h>
+#include <assert.h>
#include "config.h"
#include "talloc.h"
@@ -2454,6 +2455,7 @@ static int fill_audio_out_buffers(struct MPContext *mpctx)
}
}
+ assert(sh_audio->a_out_buffer_len % unitsize == 0);
if (playsize > sh_audio->a_out_buffer_len) {
partial_fill = true;
playsize = sh_audio->a_out_buffer_len;
@@ -2472,6 +2474,7 @@ static int fill_audio_out_buffers(struct MPContext *mpctx)
// would not having access to this make them more broken?
ao->pts = ((mpctx->sh_video?mpctx->sh_video->timer:0)+mpctx->delay)*90000.0;
playsize = ao_play(ao, sh_audio->a_out_buffer, playsize, playflags);
+ assert(playsize % unitsize == 0);
if (playsize > 0) {
sh_audio->a_out_buffer_len -= playsize;