github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-20 21:07:29 +01:00
Code Releases Activity

Online audio switching now supports Matroska too. Patch by Michael Behrisch

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15155 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
gpoirier 2005-04-13 22:33:19 +00:00
parent 09c84ff34d
commit 2a08792ee8
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libmpdemux/demux_mkv.c
View File

@ -3340,6 +3340,32 @@ demux_mkv_control (demuxer_t *demuxer, int cmd, void *arg)
*((int *) arg) = (int) (100 * mkv_d->last_pts / mkv_d->duration); *((int *) arg) = (int) (100 * mkv_d->last_pts / mkv_d->duration);
return DEMUXER_CTRL_OK; return DEMUXER_CTRL_OK;
case DEMUXER_CTRL_SWITCH_AUDIO:
if (demuxer->audio && demuxer->audio->sh) {
int i;
demux_stream_t *d_audio = demuxer->audio;
sh_audio_t *sh_audio = d_audio->sh;
int idx = d_audio->id - 1; // track ids are 1 based
int num = mkv_d->num_tracks;
mkv_track_t *otrack = mkv_d->tracks[idx];
for (i = 1; i < num; i++) {
mkv_track_t *track = mkv_d->tracks[(idx+i)%num];
if ((track->type == MATROSKA_TRACK_AUDIO) &&
!strcmp(track->codec_id, otrack->codec_id) &&
(track->a_channels == otrack->a_channels) &&
(track->a_bps == otrack->a_bps) &&
(track->a_sfreq == otrack->a_sfreq)) {
break;
}
}
if (i < num) {
d_audio->id = (idx+i)%num + 1;
ds_free_packs(d_audio);
}
*((int *)arg)=(int)d_audio->id;
}
return DEMUXER_CTRL_OK;
default: default:
return DEMUXER_CTRL_NOTIMPL; return DEMUXER_CTRL_NOTIMPL;
} }