diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-04 12:52:16 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-04 12:52:16 +0000 |
commit | e1783b6b919e19b3e00177d9c2c9499fd1f8bd87 (patch) | |
tree | 27a3ed7d3fa8648e5fd3c2c16c18314adb3251be /libmpdemux | |
parent | e1b26346ccb7f0941c158121266760b9bbfe4200 (diff) | |
download | mpv-e1783b6b919e19b3e00177d9c2c9499fd1f8bd87.tar.bz2 mpv-e1783b6b919e19b3e00177d9c2c9499fd1f8bd87.tar.xz |
First half-working avisynth audio support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22438 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_avs.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index be18341fcd..280f99dbdf 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <limits.h> #include "config.h" #include "mp_msg.h" @@ -71,6 +72,7 @@ typedef struct tagAVS #endif HMODULE dll; int frameno; + uint64_t sampleno; int init; imp_avs_create_script_environment avs_create_script_environment; @@ -207,15 +209,22 @@ static int demux_avs_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) if (ds == demuxer->audio) { sh_audio_t *sh_audio = ds->sh; - int l = sh_audio->wf->nAvgBytesPerSec; + int samples = sh_audio->samplerate; + uint64_t l = samples * sh_audio->channels * sh_audio->samplesize; + if (l > INT_MAX) { + mp_msg(MSGT_DEMUX, MSGL_FATAL, "AVS: audio pakcet too big\n"); + return 0; + } dp = new_demux_packet(l); - if (AVS->avs_get_audio(AVS->clip, dp->buffer, AVS->frameno*sh_video->fps*l, l)) + if (AVS->avs_get_audio(AVS->clip, dp->buffer, AVS->sampleno, samples)) { mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_get_audio() failed\n"); return 0; } ds_add_packet(demuxer->audio, dp); + + AVS->sampleno += samples; } return 1; @@ -226,6 +235,7 @@ static demuxer_t* demux_open_avs(demuxer_t* demuxer) int found = 0; AVS_T *AVS = (AVS_T *) demuxer->priv; AVS->frameno = 0; + AVS->sampleno = 0; mp_msg(MSGT_DEMUX, MSGL_V, "AVS: demux_open_avs()\n"); demuxer->seekable = 1; @@ -322,8 +332,9 @@ static demuxer_t* demux_open_avs(demuxer_t* demuxer) sh_audio->wf->nChannels = sh_audio->channels = AVS->video_info->nchannels; sh_audio->wf->nSamplesPerSec = sh_audio->samplerate = AVS->video_info->audio_samples_per_second; sh_audio->wf->nAvgBytesPerSec = AVS->video_info->audio_samples_per_second * 4; - sh_audio->wf->nBlockAlign = 4; - sh_audio->wf->wBitsPerSample = sh_audio->samplesize = 16; // AVS->video_info->sample_type ?? + sh_audio->samplesize = 2; + sh_audio->wf->nBlockAlign = sh_audio->channels * sh_audio->samplesize; + sh_audio->wf->wBitsPerSample = sh_audio->samplesize * 8; sh_audio->wf->cbSize = 0; sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec; sh_audio->o_bps = sh_audio->wf->nAvgBytesPerSec; |