Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 4735:21eca91fece7
ehh, i forgot to commit this...
author | arpi |
---|---|
date | Sun, 17 Feb 2002 02:11:14 +0000 |
parents | 629429644de7 |
children | d0c2c8af46b4 |
comparison
equal
deleted
inserted
replaced
4734:cc375edb5eda | 4735:21eca91fece7 |
---|---|
371 // feed-back from demuxers: | 371 // feed-back from demuxers: |
372 extern int num_elementary_packets100; // for MPEG-ES fileformat detection | 372 extern int num_elementary_packets100; // for MPEG-ES fileformat detection |
373 extern int num_elementary_packets101; | 373 extern int num_elementary_packets101; |
374 extern int num_elementary_packetsPES; | 374 extern int num_elementary_packetsPES; |
375 extern int num_elementary_packets1B6; | 375 extern int num_elementary_packets1B6; |
376 extern int num_mp3audio_packets; | |
376 | 377 |
377 // commandline options, flags: | 378 // commandline options, flags: |
378 //extern int seek_to_byte; | 379 //extern int seek_to_byte; |
379 extern int force_ni; | 380 extern int force_ni; |
380 extern int pts_from_bps; | 381 extern int pts_from_bps; |
564 | 565 |
565 num_elementary_packets100=0; | 566 num_elementary_packets100=0; |
566 num_elementary_packets101=0; | 567 num_elementary_packets101=0; |
567 num_elementary_packets1B6=0; | 568 num_elementary_packets1B6=0; |
568 num_elementary_packetsPES=0; | 569 num_elementary_packetsPES=0; |
570 num_mp3audio_packets=0; | |
569 | 571 |
570 if(ds_fill_buffer(demuxer->video)){ | 572 if(ds_fill_buffer(demuxer->video)){ |
571 if(!pes) | 573 if(!pes) |
572 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPESfile); | 574 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPESfile); |
573 else | 575 else |
574 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPSfile); | 576 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPSfile); |
575 file_format=DEMUXER_TYPE_MPEG_PS; | 577 file_format=DEMUXER_TYPE_MPEG_PS; |
576 } else { | 578 } else { |
577 printf("MPEG packet stats: p100: %d p101: %d PES: %d \n", | 579 printf("MPEG packet stats: p100: %d p101: %d PES: %d MP3: %d \n", |
578 num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES); | 580 num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES,num_mp3audio_packets); |
579 // some hack to get meaningfull error messages to our unhappy users: | 581 // some hack to get meaningfull error messages to our unhappy users: |
580 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 && | 582 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 && |
581 abs(num_elementary_packets101+8-num_elementary_packets100)<16){ | 583 abs(num_elementary_packets101+8-num_elementary_packets100)<16){ |
582 if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4){ | 584 if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4){ |
583 --pes;continue; // tricky... | 585 --pes;continue; // tricky... |