diff options
author | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-13 22:33:19 +0000 |
---|---|---|
committer | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-13 22:33:19 +0000 |
commit | 2a08792ee821a6e7b69b10211556f7d1e00f68da (patch) | |
tree | a5c40ac12dfc7e52e1c4403afb87921e7ba288ca /libmpdemux/demux_mkv.c | |
parent | 09c84ff34dac4272cdcdaf62d09e239bd8b67106 (diff) | |
download | mpv-2a08792ee821a6e7b69b10211556f7d1e00f68da.tar.bz2 mpv-2a08792ee821a6e7b69b10211556f7d1e00f68da.tar.xz |
Online audio switching now supports Matroska too. Patch by Michael Behrisch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15155 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r-- | libmpdemux/demux_mkv.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 89975c052a..6ea34ecd18 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -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); 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: return DEMUXER_CTRL_NOTIMPL; } |