From d441d65f3411402a367e24cd70b606c579ef356e Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 1 Dec 2006 17:57:29 +0000 Subject: Implement stream switching for AVI demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_avi.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'libmpdemux/demux_avi.c') diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index b2e9556dc7..d6053e878b 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -762,6 +762,31 @@ static int demux_avi_control(demuxer_t *demuxer,int cmd, void *arg){ if (sh_video->video.dwLength<=1) return DEMUXER_CTRL_GUESS; return DEMUXER_CTRL_OK; + case DEMUXER_CTRL_SWITCH_AUDIO: + case DEMUXER_CTRL_SWITCH_VIDEO: { + int audio = (cmd == DEMUXER_CTRL_SWITCH_AUDIO); + demux_stream_t *ds = audio ? demuxer->audio : demuxer->video; + void **streams = audio ? demuxer->a_streams : demuxer->v_streams; + int maxid = FFMAX(99, audio ? MAX_A_STREAMS : MAX_V_STREAMS); + int chunkid; + if (ds->id < -1) + return DEMUXER_CTRL_NOTIMPL; + + if (*(int *)arg >= 0) + ds->id = *(int *)arg; + else { + do { + if (++ds->id >= maxid) ds->id = 0; + } while (!streams[ds->id]); + } + + chunkid = (ds->id / 10 + '0') | (ds->id % 10 + '0') << 8; + ds->sh = NULL; + demux_avi_select_stream(demuxer, chunkid); + *(int *)arg = ds->id; + return DEMUXER_CTRL_OK; + } + default: return DEMUXER_CTRL_NOTIMPL; } -- cgit v1.2.3