Mercurial > mplayer.hg

comparison libmpdemux/asfheader.c @ 31609:cd81fce1f010

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the stream language an argument to the stream creation function so that some code can be shared.
author reimar
date Sat, 10 Jul 2010 18:47:59 +0000
parents df6c41f16b40
children b52f89b55334
comparison
equal deleted inserted replaced
31608:ad007a37ae4e 31609:cd81fce1f010
438 audio_pos = pos - 16 - 8; 438 audio_pos = pos - 16 - 8;
439 streamh = (ASF_stream_header_t *)&hdr[sh_pos]; 439 streamh = (ASF_stream_header_t *)&hdr[sh_pos];
440 le2me_ASF_stream_header_t(streamh); 440 le2me_ASF_stream_header_t(streamh);
441 audio_pos += 64; //16+16+4+4+4+16+4; 441 audio_pos += 64; //16+16+4+4+4+16+4;
442 buffer = &hdr[audio_pos]; 442 buffer = &hdr[audio_pos];
443 sh_audio=new_sh_audio(demuxer,streamh->stream_no & 0x7F); 443 sh_audio=new_sh_audio(demuxer,streamh->stream_no & 0x7F, NULL);
444 sh_audio->needs_parsing = 1; 444 sh_audio->needs_parsing = 1;
445 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "asfheader", streamh->stream_no & 0x7F); 445 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "asfheader", streamh->stream_no & 0x7F);
446 ++audio_streams; 446 ++audio_streams;
447 if (!asf_init_audio_stream(demuxer, asf, sh_audio, streamh, &audio_pos, &buffer, hdr, hdr_len)) 447 if (!asf_init_audio_stream(demuxer, asf, sh_audio, streamh, &audio_pos, &buffer, hdr, hdr_len))
448 goto len_err_out; 448 goto len_err_out;
476 buffer = &hdr[pos]; 476 buffer = &hdr[pos];
477 pos += streamh->type_size; 477 pos += streamh->type_size;
478 if (pos > hdr_len) goto len_err_out; 478 if (pos > hdr_len) goto len_err_out;
479 switch(ASF_LOAD_GUID_PREFIX(streamh->type)){ 479 switch(ASF_LOAD_GUID_PREFIX(streamh->type)){
480 case ASF_GUID_PREFIX_audio_stream: { 480 case ASF_GUID_PREFIX_audio_stream: {
481 sh_audio_t* sh_audio=new_sh_audio(demuxer,streamh->stream_no & 0x7F); 481 sh_audio_t* sh_audio=new_sh_audio(demuxer,streamh->stream_no & 0x7F, NULL);
482 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "asfheader", streamh->stream_no & 0x7F); 482 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "asfheader", streamh->stream_no & 0x7F);
483 ++audio_streams; 483 ++audio_streams;
484 if (!asf_init_audio_stream(demuxer, asf, sh_audio, streamh, &pos, &buffer, hdr, hdr_len)) 484 if (!asf_init_audio_stream(demuxer, asf, sh_audio, streamh, &pos, &buffer, hdr, hdr_len))
485 goto len_err_out; 485 goto len_err_out;
486 //if(demuxer->audio->id==-1) demuxer->audio->id=streamh.stream_no & 0x7F; 486 //if(demuxer->audio->id==-1) demuxer->audio->id=streamh.stream_no & 0x7F;