diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-26 19:17:04 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-26 19:17:04 +0000 |
commit | ccf75d67117745e3ed868d0f1c956f078f13a4fa (patch) | |
tree | b5a87e723273c61279c39b1491b685519d4a2086 /libmpdemux/demux_ogg.c | |
parent | 8b4274d71f055c9c1354413933c4ba071bfac288 (diff) | |
download | mpv-ccf75d67117745e3ed868d0f1c956f078f13a4fa.tar.bz2 mpv-ccf75d67117745e3ed868d0f1c956f078f13a4fa.tar.xz |
Get rid of demux_aid_vid_mismatch mess.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
-rw-r--r-- | libmpdemux/demux_ogg.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index aa0b8bf351..586267bdf2 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -162,7 +162,6 @@ extern int index_mode; extern char *dvdsub_lang, *audio_lang; extern int dvdsub_id; -extern int demux_aid_vid_mismatch; //-------- subtitle support - should be moved to decoder layer, and queue // - subtitles up in demuxer buffer... @@ -919,20 +918,18 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_a = NULL; sh_v = NULL; - demux_aid_vid_mismatch = 1; // don't identify in new_sh_* since ids don't match ogg_d->subs[ogg_d->num_sub].ogg_d = ogg_d; // Check for Vorbis if(pack.bytes >= 7 && ! strncmp(&pack.packet[1],"vorbis", 6) ) { - sh_a = new_sh_audio(demuxer,ogg_d->num_sub); + sh_a = new_sh_audio_aid(demuxer,ogg_d->num_sub, n_audio); sh_a->format = FOURCC_VORBIS; ogg_d->subs[ogg_d->num_sub].vorbis = 1; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio); ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Vorbis), -aid %d\n",ogg_d->num_sub,n_audio-1); } else if (pack.bytes >= 80 && !strncmp(pack.packet,"Speex", 5)) { - sh_a = new_sh_audio(demuxer, ogg_d->num_sub); + sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio); sh_a->wf = calloc(1, sizeof(WAVEFORMATEX) + pack.bytes); sh_a->format = FOURCC_SPEEX; sh_a->samplerate = sh_a->wf->nSamplesPerSec = get_uint32(&pack.packet[36]); @@ -947,7 +944,6 @@ int demux_ogg_open(demuxer_t* demuxer) { ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; ogg_d->subs[ogg_d->num_sub].speex = 1; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio); ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Speex), -aid %d\n",ogg_d->num_sub,n_audio-1); @@ -968,7 +964,7 @@ int demux_ogg_open(demuxer_t* demuxer) { errorCode); else { - sh_v = new_sh_video(demuxer,ogg_d->num_sub); + sh_v = new_sh_video_vid(demuxer,ogg_d->num_sub, n_video); sh_v->context = NULL; sh_v->bih = calloc(1,sizeof(BITMAPINFOHEADER)); @@ -986,7 +982,6 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_v->bih->biWidth*sh_v->bih->biHeight); ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps; ogg_d->subs[ogg_d->num_sub].theora = 1; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video); ogg_d->subs[ogg_d->num_sub].id = n_video; n_video++; mp_msg(MSGT_DEMUX,MSGL_INFO, @@ -1001,9 +996,8 @@ int demux_ogg_open(demuxer_t* demuxer) { # endif /* HAVE_OGGTHEORA */ # ifdef HAVE_FLAC } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) { - sh_a = new_sh_audio(demuxer,ogg_d->num_sub); + sh_a = new_sh_audio_aid(demuxer,ogg_d->num_sub, n_audio); sh_a->format = mmioFOURCC('f', 'L', 'a', 'C'); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio); ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; ogg_d->subs[ogg_d->num_sub].flac = 1; @@ -1016,7 +1010,7 @@ int demux_ogg_open(demuxer_t* demuxer) { // Old video header if(get_uint32 (pack.packet+96) == 0x05589f80 && pack.bytes >= 184) { - sh_v = new_sh_video(demuxer,ogg_d->num_sub); + sh_v = new_sh_video_vid(demuxer,ogg_d->num_sub, n_video); sh_v->bih = calloc(1,sizeof(BITMAPINFOHEADER)); sh_v->bih->biSize=sizeof(BITMAPINFOHEADER); sh_v->bih->biCompression= @@ -1032,7 +1026,6 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight; ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video); ogg_d->subs[ogg_d->num_sub].id = n_video; n_video++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n", @@ -1041,7 +1034,7 @@ int demux_ogg_open(demuxer_t* demuxer) { // Old audio header } else if(get_uint32(pack.packet+96) == 0x05589F81) { unsigned int extra_size; - sh_a = new_sh_audio(demuxer,ogg_d->num_sub); + sh_a = new_sh_audio_aid(demuxer,ogg_d->num_sub, n_audio); extra_size = get_uint16(pack.packet+140); sh_a->wf = calloc(1,sizeof(WAVEFORMATEX)+extra_size); sh_a->format = sh_a->wf->wFormatTag = get_uint16(pack.packet+124); @@ -1056,7 +1049,6 @@ int demux_ogg_open(demuxer_t* demuxer) { memcpy(((char *)sh_a->wf)+sizeof(WAVEFORMATEX),pack.packet+142,extra_size); ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio); ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (format 0x%04x), -aid %d\n",ogg_d->num_sub,sh_a->format,n_audio-1); @@ -1070,7 +1062,7 @@ int demux_ogg_open(demuxer_t* demuxer) { stream_header *st = (stream_header*)(pack.packet+1); /// New video header if(strncmp(st->streamtype,"video",5) == 0) { - sh_v = new_sh_video(demuxer,ogg_d->num_sub); + sh_v = new_sh_video_vid(demuxer,ogg_d->num_sub, n_video); sh_v->bih = calloc(1,sizeof(BITMAPINFOHEADER)); sh_v->bih->biSize=sizeof(BITMAPINFOHEADER); sh_v->bih->biCompression= @@ -1086,7 +1078,6 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight; ogg_d->subs[ogg_d->num_sub].samplerate= sh_v->fps; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video); ogg_d->subs[ogg_d->num_sub].id = n_video; n_video++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n", @@ -1111,7 +1102,7 @@ int demux_ogg_open(demuxer_t* demuxer) { extra_offset = 4; } - sh_a = new_sh_audio(demuxer,ogg_d->num_sub); + sh_a = new_sh_audio_aid(demuxer,ogg_d->num_sub, n_audio); sh_a->wf = calloc(1,sizeof(WAVEFORMATEX)+extra_size); sh_a->format = sh_a->wf->wFormatTag = strtol(buffer, NULL, 16); sh_a->channels = sh_a->wf->nChannels = get_uint16(&st->sh.audio.channels); @@ -1125,7 +1116,6 @@ int demux_ogg_open(demuxer_t* demuxer) { memcpy(((char *)sh_a->wf)+sizeof(WAVEFORMATEX),((char *)(st+1))+extra_offset,extra_size); ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio); ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (format 0x%04x), -aid %d\n",ogg_d->num_sub,sh_a->format,n_audio-1); |