Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 7482:1056d2dc4f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed 'detected fileformat' messages to a message with %s
author jaf
date Sun, 22 Sep 2002 14:28:29 +0000
parents f53f1f126a05
children b645204ea527
comparison
equal deleted inserted replaced
7481:c26108047eec 7482:1056d2dc4f3a
592 int id=stream_read_dword_le(demuxer->stream); // "RIFF" 592 int id=stream_read_dword_le(demuxer->stream); // "RIFF"
593 if(id==mmioFOURCC('R','I','F','F')){ 593 if(id==mmioFOURCC('R','I','F','F')){
594 stream_read_dword_le(demuxer->stream); //filesize 594 stream_read_dword_le(demuxer->stream); //filesize
595 id=stream_read_dword_le(demuxer->stream); // "AVI " 595 id=stream_read_dword_le(demuxer->stream); // "AVI "
596 if(id==formtypeAVI){ 596 if(id==formtypeAVI){
597 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAVIfile); 597 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI");
598 file_format=DEMUXER_TYPE_AVI; 598 file_format=DEMUXER_TYPE_AVI;
599 } else { 599 } else {
600 free_demuxer(demuxer); 600 free_demuxer(demuxer);
601 demuxer = NULL; 601 demuxer = NULL;
602 } 602 }
605 } 605 }
606 //=============== Try to open as Y4M file: ================= 606 //=============== Try to open as Y4M file: =================
607 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){ 607 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
608 demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id); 608 demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
609 if(y4m_check_file(demuxer)){ 609 if(y4m_check_file(demuxer)){
610 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedYUV4MPEG2file); 610 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"YUV4MPEG2");
611 file_format=DEMUXER_TYPE_Y4M; 611 file_format=DEMUXER_TYPE_Y4M;
612 } else { 612 } else {
613 free_demuxer(demuxer); 613 free_demuxer(demuxer);
614 demuxer = NULL; 614 demuxer = NULL;
615 } 615 }
616 } 616 }
617 //=============== Try to open as ASF file: ================= 617 //=============== Try to open as ASF file: =================
618 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){ 618 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
619 demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id); 619 demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
620 if(asf_check_header(demuxer)){ 620 if(asf_check_header(demuxer)){
621 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedASFfile); 621 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ASF");
622 file_format=DEMUXER_TYPE_ASF; 622 file_format=DEMUXER_TYPE_ASF;
623 } else { 623 } else {
624 free_demuxer(demuxer); 624 free_demuxer(demuxer);
625 demuxer = NULL; 625 demuxer = NULL;
626 } 626 }
627 } 627 }
628 //=============== Try to open as NUV file: ================= 628 //=============== Try to open as NUV file: =================
629 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){ 629 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){
630 demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id); 630 demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id);
631 if(nuv_check_file(demuxer)){ 631 if(nuv_check_file(demuxer)){
632 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedNuppelVideofile); 632 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"NuppelVideo");
633 file_format=DEMUXER_TYPE_NUV; 633 file_format=DEMUXER_TYPE_NUV;
634 } else { 634 } else {
635 free_demuxer(demuxer); 635 free_demuxer(demuxer);
636 demuxer = NULL; 636 demuxer = NULL;
637 } 637 }
638 } 638 }
639 //=============== Try to open as MOV file: ================= 639 //=============== Try to open as MOV file: =================
640 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ 640 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
641 demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); 641 demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
642 if(mov_check_file(demuxer)){ 642 if(mov_check_file(demuxer)){
643 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedQTMOVfile); 643 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"QuickTime/MOV");
644 file_format=DEMUXER_TYPE_MOV; 644 file_format=DEMUXER_TYPE_MOV;
645 } else { 645 } else {
646 free_demuxer(demuxer); 646 free_demuxer(demuxer);
647 demuxer = NULL; 647 demuxer = NULL;
648 } 648 }
649 } 649 }
650 //=============== Try to open as VIVO file: ================= 650 //=============== Try to open as VIVO file: =================
651 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ 651 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){
652 demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); 652 demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id);
653 if(vivo_check_file(demuxer)){ 653 if(vivo_check_file(demuxer)){
654 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedVIVOfile); 654 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat, "VIVO");
655 file_format=DEMUXER_TYPE_VIVO; 655 file_format=DEMUXER_TYPE_VIVO;
656 } else { 656 } else {
657 free_demuxer(demuxer); 657 free_demuxer(demuxer);
658 demuxer = NULL; 658 demuxer = NULL;
659 } 659 }
660 } 660 }
661 //=============== Try to open as REAL file: ================= 661 //=============== Try to open as REAL file: =================
662 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){ 662 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){
663 demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id); 663 demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id);
664 if(real_check_file(demuxer)){ 664 if(real_check_file(demuxer)){
665 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedREALfile); 665 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"REAL");
666 file_format=DEMUXER_TYPE_REAL; 666 file_format=DEMUXER_TYPE_REAL;
667 } else { 667 } else {
668 free_demuxer(demuxer); 668 free_demuxer(demuxer);
669 demuxer = NULL; 669 demuxer = NULL;
670 } 670 }
676 int id; 676 int id;
677 stream_seek(demuxer->stream, 4); 677 stream_seek(demuxer->stream, 4);
678 id=stream_read_word_le(demuxer->stream); 678 id=stream_read_word_le(demuxer->stream);
679 // check for the FLI file magic number 679 // check for the FLI file magic number
680 if((id==0xAF11) || (id==0xAF12)){ 680 if((id==0xAF11) || (id==0xAF12)){
681 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile); 681 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FLI");
682 file_format=DEMUXER_TYPE_FLI; 682 file_format=DEMUXER_TYPE_FLI;
683 } else { 683 } else {
684 free_demuxer(demuxer); 684 free_demuxer(demuxer);
685 demuxer = NULL; 685 demuxer = NULL;
686 } 686 }
691 demuxer=new_demuxer(stream,DEMUXER_TYPE_FILM,audio_id,video_id,dvdsub_id); 691 demuxer=new_demuxer(stream,DEMUXER_TYPE_FILM,audio_id,video_id,dvdsub_id);
692 { 692 {
693 int signature=stream_read_fourcc(demuxer->stream); 693 int signature=stream_read_fourcc(demuxer->stream);
694 // check for the FLI file magic number 694 // check for the FLI file magic number
695 if(signature==mmioFOURCC('F', 'I', 'L', 'M')){ 695 if(signature==mmioFOURCC('F', 'I', 'L', 'M')){
696 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFILMfile); 696 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FILM");
697 file_format=DEMUXER_TYPE_FILM; 697 file_format=DEMUXER_TYPE_FILM;
698 } else { 698 } else {
699 free_demuxer(demuxer); 699 free_demuxer(demuxer);
700 demuxer = NULL; 700 demuxer = NULL;
701 } 701 }
703 } 703 }
704 //=============== Try to open as RoQ file: ================= 704 //=============== Try to open as RoQ file: =================
705 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){ 705 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){
706 demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id); 706 demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id);
707 if(roq_check_file(demuxer)){ 707 if(roq_check_file(demuxer)){
708 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedROQfile); 708 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ROQ");
709 file_format=DEMUXER_TYPE_ROQ; 709 file_format=DEMUXER_TYPE_ROQ;
710 } else { 710 } else {
711 free_demuxer(demuxer); 711 free_demuxer(demuxer);
712 demuxer = NULL; 712 demuxer = NULL;
713 } 713 }
714 } 714 }
715 //=============== Try to open as BMP file: ================= 715 //=============== Try to open as BMP file: =================
716 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_BMP){ 716 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_BMP){
717 demuxer=new_demuxer(stream,DEMUXER_TYPE_BMP,audio_id,video_id,dvdsub_id); 717 demuxer=new_demuxer(stream,DEMUXER_TYPE_BMP,audio_id,video_id,dvdsub_id);
718 if(bmp_check_file(demuxer)){ 718 if(bmp_check_file(demuxer)){
719 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedBMPfile); 719 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"BMP");
720 file_format=DEMUXER_TYPE_BMP; 720 file_format=DEMUXER_TYPE_BMP;
721 } else { 721 } else {
722 free_demuxer(demuxer); 722 free_demuxer(demuxer);
723 demuxer = NULL; 723 demuxer = NULL;
724 } 724 }
725 } 725 }
726 //=============== Try to open as SMJPEG file: ================= 726 //=============== Try to open as SMJPEG file: =================
727 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_SMJPEG){ 727 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_SMJPEG){
728 demuxer=new_demuxer(stream,DEMUXER_TYPE_SMJPEG,audio_id,video_id,dvdsub_id); 728 demuxer=new_demuxer(stream,DEMUXER_TYPE_SMJPEG,audio_id,video_id,dvdsub_id);
729 if(smjpeg_check_file(demuxer)){ 729 if(smjpeg_check_file(demuxer)){
730 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected SMJPEG file!\n"); 730 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"SMJPEG");
731 file_format=DEMUXER_TYPE_SMJPEG; 731 file_format=DEMUXER_TYPE_SMJPEG;
732 } else { 732 } else {
733 free_demuxer(demuxer); 733 free_demuxer(demuxer);
734 demuxer = NULL; 734 demuxer = NULL;
735 } 735 }
737 #ifdef HAVE_OGGVORBIS 737 #ifdef HAVE_OGGVORBIS
738 //=============== Try to open as Ogg file: ================= 738 //=============== Try to open as Ogg file: =================
739 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){ 739 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){
740 demuxer=new_demuxer(stream,DEMUXER_TYPE_OGG,audio_id,video_id,dvdsub_id); 740 demuxer=new_demuxer(stream,DEMUXER_TYPE_OGG,audio_id,video_id,dvdsub_id);
741 if(demux_ogg_open(demuxer)){ 741 if(demux_ogg_open(demuxer)){
742 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedOGGfile); 742 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"OGG");
743 file_format=DEMUXER_TYPE_OGG; 743 file_format=DEMUXER_TYPE_OGG;
744 } else { 744 } else {
745 free_demuxer(demuxer); 745 free_demuxer(demuxer);
746 demuxer = NULL; 746 demuxer = NULL;
747 } 747 }
749 #endif 749 #endif
750 //=============== Try to open as PVA file: ================= 750 //=============== Try to open as PVA file: =================
751 if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){ 751 if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){
752 demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id); 752 demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id);
753 if(pva_check_file(demuxer)) { 753 if(pva_check_file(demuxer)) {
754 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected PVA file...\n"); 754 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"PVA");
755 file_format=DEMUXER_TYPE_PVA; 755 file_format=DEMUXER_TYPE_PVA;
756 } else { 756 } else {
757 free_demuxer(demuxer); 757 free_demuxer(demuxer);
758 demuxer=NULL; 758 demuxer=NULL;
759 } 759 }
783 num_elementary_packetsPES=0; 783 num_elementary_packetsPES=0;
784 num_mp3audio_packets=0; 784 num_mp3audio_packets=0;
785 785
786 if(ds_fill_buffer(demuxer->video)){ 786 if(ds_fill_buffer(demuxer->video)){
787 if(!pes) 787 if(!pes)
788 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPESfile); 788 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PES");
789 else 789 else
790 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPSfile); 790 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PS");
791 file_format=DEMUXER_TYPE_MPEG_PS; 791 file_format=DEMUXER_TYPE_MPEG_PS;
792 } else { 792 } else {
793 mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d PES: %d MP3: %d \n", 793 mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d PES: %d MP3: %d \n",
794 num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES,num_mp3audio_packets); 794 num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES,num_mp3audio_packets);
795 //MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v) 795 //MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v)
822 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_InvalidMPEGES); 822 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_InvalidMPEGES);
823 file_format=DEMUXER_TYPE_UNKNOWN; 823 file_format=DEMUXER_TYPE_UNKNOWN;
824 free_demuxer(demuxer); 824 free_demuxer(demuxer);
825 demuxer = NULL; 825 demuxer = NULL;
826 } else { 826 } else {
827 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile); 827 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-ES");
828 } 828 }
829 } 829 }
830 #ifdef HAVE_LIBDV095 830 #ifdef HAVE_LIBDV095
831 //=============== Try to open raw DV file, as produced by dvgrab --format raw ================= 831 //=============== Try to open raw DV file, as produced by dvgrab --format raw =================
832 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_RAWDV) 832 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_RAWDV)
833 { 833 {
834 demuxer=new_demuxer(stream,DEMUXER_TYPE_RAWDV,audio_id,video_id,dvdsub_id); 834 demuxer=new_demuxer(stream,DEMUXER_TYPE_RAWDV,audio_id,video_id,dvdsub_id);
835 if(check_file_rawdv(demuxer)) 835 if(check_file_rawdv(demuxer))
836 { 836 {
837 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedRAWDVfile); 837 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"RAWDV");
838 file_format=DEMUXER_TYPE_RAWDV; 838 file_format=DEMUXER_TYPE_RAWDV;
839 } 839 }
840 else 840 else
841 free_demuxer(demuxer); 841 free_demuxer(demuxer);
842 } 842 }