Mercurial > mplayer.hg
comparison libmpdemux/demux_ogg.c @ 10397:6180d7558f75
output typo fixes: unknow --> unknown
author | diego |
---|---|
date | Wed, 09 Jul 2003 01:30:24 +0000 |
parents | 3c7db8070985 |
children | 2cae82f2ab02 |
comparison
equal
deleted
inserted
replaced
10396:71709106a44a | 10397:6180d7558f75 |
---|---|
598 // Header parsing end here, we need to get the page otherwise it will be lost | 598 // Header parsing end here, we need to get the page otherwise it will be lost |
599 int id = demux_ogg_get_page_stream(ogg_d,NULL); | 599 int id = demux_ogg_get_page_stream(ogg_d,NULL); |
600 if(id >= 0) | 600 if(id >= 0) |
601 ogg_stream_pagein(&ogg_d->subs[id].stream,page); | 601 ogg_stream_pagein(&ogg_d->subs[id].stream,page); |
602 else | 602 else |
603 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG : Warning found none bos page from unknow stream %d\n",ogg_page_serialno(page)); | 603 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG : Warning found none bos page from unknown stream %d\n",ogg_page_serialno(page)); |
604 break; | 604 break; |
605 } | 605 } |
606 | 606 |
607 /// Init the data structure needed for a logical stream | 607 /// Init the data structure needed for a logical stream |
608 ogg_d->subs = (ogg_stream_t*)realloc(ogg_d->subs,(ogg_d->num_sub+1)*sizeof(ogg_stream_t)); | 608 ogg_d->subs = (ogg_stream_t*)realloc(ogg_d->subs,(ogg_d->num_sub+1)*sizeof(ogg_stream_t)); |
714 ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels; | 714 ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels; |
715 n_audio++; | 715 n_audio++; |
716 mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (old hdr)\n",ogg_d->num_sub); | 716 mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (old hdr)\n",ogg_d->num_sub); |
717 if(verbose>0) print_wave_header(sh_a->wf); | 717 if(verbose>0) print_wave_header(sh_a->wf); |
718 } else | 718 } else |
719 mp_msg(MSGT_DEMUX,MSGL_WARN,"OGG stream %d contain an old header but the header type is unknow\n",ogg_d->num_sub); | 719 mp_msg(MSGT_DEMUX,MSGL_WARN,"OGG stream %d contains an old header but the header type is unknown\n",ogg_d->num_sub); |
720 | 720 |
721 // Check new header | 721 // Check new header |
722 } else if ( (*pack.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER && | 722 } else if ( (*pack.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER && |
723 pack.bytes >= (int)sizeof(stream_header)+1) { | 723 pack.bytes >= (int)sizeof(stream_header)+1) { |
724 stream_header *st = (stream_header*)(pack.packet+1); | 724 stream_header *st = (stream_header*)(pack.packet+1); |
772 mp_msg(MSGT_DEMUX, MSGL_V, "OGG stream %d is text\n", ogg_d->num_sub); | 772 mp_msg(MSGT_DEMUX, MSGL_V, "OGG stream %d is text\n", ogg_d->num_sub); |
773 if(demuxer->sub->id==-1) demuxer->sub->id = ogg_d->num_sub; | 773 if(demuxer->sub->id==-1) demuxer->sub->id = ogg_d->num_sub; |
774 ogg_d->subs[ogg_d->num_sub].samplerate= get_uint64(&st->time_unit)/10; | 774 ogg_d->subs[ogg_d->num_sub].samplerate= get_uint64(&st->time_unit)/10; |
775 n_text++; | 775 n_text++; |
776 demux_ogg_init_sub(); | 776 demux_ogg_init_sub(); |
777 //// Unknow header type | 777 //// Unknown header type |
778 } else | 778 } else |
779 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d has a header marker but is of an unknow type\n",ogg_d->num_sub); | 779 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d has a header marker but is of an unknown type\n",ogg_d->num_sub); |
780 /// Unknow (invalid ?) header | 780 /// Unknow (invalid ?) header |
781 } else | 781 } else |
782 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d is of an unknow type\n",ogg_d->num_sub); | 782 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d is of an unknown type\n",ogg_d->num_sub); |
783 | 783 |
784 if(sh_a || sh_v) { | 784 if(sh_a || sh_v) { |
785 demux_stream_t* ds = NULL; | 785 demux_stream_t* ds = NULL; |
786 if(sh_a) { | 786 if(sh_a) { |
787 // If the audio stream is not defined we took the first one | 787 // If the audio stream is not defined we took the first one |
895 ogg_sync_wrote(sync,len); | 895 ogg_sync_wrote(sync,len); |
896 } /// Page loop | 896 } /// Page loop |
897 ogg_d->last_size = pa; | 897 ogg_d->last_size = pa; |
898 /// Find the page's logical stream | 898 /// Find the page's logical stream |
899 if( (id = demux_ogg_get_page_stream(ogg_d,&os)) < 0) { | 899 if( (id = demux_ogg_get_page_stream(ogg_d,&os)) < 0) { |
900 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG demuxer error : we met an unknow stream\n"); | 900 mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG demuxer error : we met an unknown stream\n"); |
901 return 0; | 901 return 0; |
902 } | 902 } |
903 /// Take the page | 903 /// Take the page |
904 if(ogg_stream_pagein(os,page) == 0) | 904 if(ogg_stream_pagein(os,page) == 0) |
905 break; | 905 break; |