The granule position of pages contining Vorbis audio is in units of

PCM audio samples (per channel; a stereo stream's granule position does
no increment at twice the speed of a mono stream).
patch by Moritz Bunkus <moritz@bunkus.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7397 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-09-14 23:21:22 +00:00
parent fb28479daf
commit 424831f651
1 changed files with 2 additions and 2 deletions

View File

@ -529,7 +529,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
if(extra_size > 0) if(extra_size > 0)
memcpy(sh_a->wf+sizeof(WAVEFORMATEX),pack.packet+142,extra_size); memcpy(sh_a->wf+sizeof(WAVEFORMATEX),pack.packet+142,extra_size);
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate * sh_a->channels; ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
n_audio++; n_audio++;
mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (old hdr)\n",ogg_d->num_sub); mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (old hdr)\n",ogg_d->num_sub);
if(verbose) print_wave_header(sh_a->wf); if(verbose) print_wave_header(sh_a->wf);
@ -580,7 +580,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
if(extra_size) if(extra_size)
memcpy(sh_a->wf+sizeof(WAVEFORMATEX),st+1,extra_size); memcpy(sh_a->wf+sizeof(WAVEFORMATEX),st+1,extra_size);
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate * sh_a->channels; ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
n_audio++; n_audio++;
mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (new hdr)\n",ogg_d->num_sub); mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (new hdr)\n",ogg_d->num_sub);
if(verbose) print_wave_header(sh_a->wf); if(verbose) print_wave_header(sh_a->wf);