Mercurial > libavformat.hg
comparison raw.c @ 1167:d89d7ef290da libavformat
give AVInput/OutputFormat structs consistent names
author | mru |
---|---|
date | Sun, 09 Jul 2006 23:40:53 +0000 |
parents | 787a70a8b867 |
children | d18cc9a1fd02 |
comparison
equal
deleted
inserted
replaced
1166:e89500dd9064 | 1167:d89d7ef290da |
---|---|
387 return 50; | 387 return 50; |
388 } | 388 } |
389 return 0; | 389 return 0; |
390 } | 390 } |
391 | 391 |
392 AVInputFormat shorten_iformat = { | 392 AVInputFormat shorten_demuxer = { |
393 "shn", | 393 "shn", |
394 "raw shorten", | 394 "raw shorten", |
395 0, | 395 0, |
396 NULL, | 396 NULL, |
397 shorten_read_header, | 397 shorten_read_header, |
398 raw_read_partial_packet, | 398 raw_read_partial_packet, |
399 raw_read_close, | 399 raw_read_close, |
400 .extensions = "shn", | 400 .extensions = "shn", |
401 }; | 401 }; |
402 | 402 |
403 AVInputFormat flac_iformat = { | 403 AVInputFormat flac_demuxer = { |
404 "flac", | 404 "flac", |
405 "raw flac", | 405 "raw flac", |
406 0, | 406 0, |
407 NULL, | 407 NULL, |
408 flac_read_header, | 408 flac_read_header, |
410 raw_read_close, | 410 raw_read_close, |
411 .extensions = "flac", | 411 .extensions = "flac", |
412 }; | 412 }; |
413 | 413 |
414 #ifdef CONFIG_MUXERS | 414 #ifdef CONFIG_MUXERS |
415 AVOutputFormat flac_oformat = { | 415 AVOutputFormat flac_muxer = { |
416 "flac", | 416 "flac", |
417 "raw flac", | 417 "raw flac", |
418 "audio/x-flac", | 418 "audio/x-flac", |
419 "flac", | 419 "flac", |
420 0, | 420 0, |
424 raw_write_packet, | 424 raw_write_packet, |
425 raw_write_trailer, | 425 raw_write_trailer, |
426 }; | 426 }; |
427 #endif //CONFIG_MUXERS | 427 #endif //CONFIG_MUXERS |
428 | 428 |
429 AVInputFormat ac3_iformat = { | 429 AVInputFormat ac3_demuxer = { |
430 "ac3", | 430 "ac3", |
431 "raw ac3", | 431 "raw ac3", |
432 0, | 432 0, |
433 NULL, | 433 NULL, |
434 ac3_read_header, | 434 ac3_read_header, |
436 raw_read_close, | 436 raw_read_close, |
437 .extensions = "ac3", | 437 .extensions = "ac3", |
438 }; | 438 }; |
439 | 439 |
440 #ifdef CONFIG_MUXERS | 440 #ifdef CONFIG_MUXERS |
441 AVOutputFormat ac3_oformat = { | 441 AVOutputFormat ac3_muxer = { |
442 "ac3", | 442 "ac3", |
443 "raw ac3", | 443 "raw ac3", |
444 "audio/x-ac3", | 444 "audio/x-ac3", |
445 "ac3", | 445 "ac3", |
446 0, | 446 0, |
450 raw_write_packet, | 450 raw_write_packet, |
451 raw_write_trailer, | 451 raw_write_trailer, |
452 }; | 452 }; |
453 #endif //CONFIG_MUXERS | 453 #endif //CONFIG_MUXERS |
454 | 454 |
455 AVInputFormat dts_iformat = { | 455 AVInputFormat dts_demuxer = { |
456 "dts", | 456 "dts", |
457 "raw dts", | 457 "raw dts", |
458 0, | 458 0, |
459 NULL, | 459 NULL, |
460 dts_read_header, | 460 dts_read_header, |
461 raw_read_partial_packet, | 461 raw_read_partial_packet, |
462 raw_read_close, | 462 raw_read_close, |
463 .extensions = "dts", | 463 .extensions = "dts", |
464 }; | 464 }; |
465 | 465 |
466 AVInputFormat aac_iformat = { | 466 AVInputFormat aac_demuxer = { |
467 "aac", | 467 "aac", |
468 "ADTS AAC", | 468 "ADTS AAC", |
469 0, | 469 0, |
470 NULL, | 470 NULL, |
471 aac_read_header, | 471 aac_read_header, |
472 raw_read_partial_packet, | 472 raw_read_partial_packet, |
473 raw_read_close, | 473 raw_read_close, |
474 .extensions = "aac", | 474 .extensions = "aac", |
475 }; | 475 }; |
476 | 476 |
477 AVInputFormat h261_iformat = { | 477 AVInputFormat h261_demuxer = { |
478 "h261", | 478 "h261", |
479 "raw h261", | 479 "raw h261", |
480 0, | 480 0, |
481 h261_probe, | 481 h261_probe, |
482 video_read_header, | 482 video_read_header, |
485 .extensions = "h261", | 485 .extensions = "h261", |
486 .value = CODEC_ID_H261, | 486 .value = CODEC_ID_H261, |
487 }; | 487 }; |
488 | 488 |
489 #ifdef CONFIG_MUXERS | 489 #ifdef CONFIG_MUXERS |
490 AVOutputFormat h261_oformat = { | 490 AVOutputFormat h261_muxer = { |
491 "h261", | 491 "h261", |
492 "raw h261", | 492 "raw h261", |
493 "video/x-h261", | 493 "video/x-h261", |
494 "h261", | 494 "h261", |
495 0, | 495 0, |
499 raw_write_packet, | 499 raw_write_packet, |
500 raw_write_trailer, | 500 raw_write_trailer, |
501 }; | 501 }; |
502 #endif //CONFIG_MUXERS | 502 #endif //CONFIG_MUXERS |
503 | 503 |
504 AVInputFormat h263_iformat = { | 504 AVInputFormat h263_demuxer = { |
505 "h263", | 505 "h263", |
506 "raw h263", | 506 "raw h263", |
507 0, | 507 0, |
508 h263_probe, | 508 h263_probe, |
509 video_read_header, | 509 video_read_header, |
512 // .extensions = "h263", //FIXME remove after writing mpeg4_probe | 512 // .extensions = "h263", //FIXME remove after writing mpeg4_probe |
513 .value = CODEC_ID_H263, | 513 .value = CODEC_ID_H263, |
514 }; | 514 }; |
515 | 515 |
516 #ifdef CONFIG_MUXERS | 516 #ifdef CONFIG_MUXERS |
517 AVOutputFormat h263_oformat = { | 517 AVOutputFormat h263_muxer = { |
518 "h263", | 518 "h263", |
519 "raw h263", | 519 "raw h263", |
520 "video/x-h263", | 520 "video/x-h263", |
521 "h263", | 521 "h263", |
522 0, | 522 0, |
526 raw_write_packet, | 526 raw_write_packet, |
527 raw_write_trailer, | 527 raw_write_trailer, |
528 }; | 528 }; |
529 #endif //CONFIG_MUXERS | 529 #endif //CONFIG_MUXERS |
530 | 530 |
531 AVInputFormat m4v_iformat = { | 531 AVInputFormat m4v_demuxer = { |
532 "m4v", | 532 "m4v", |
533 "raw MPEG4 video format", | 533 "raw MPEG4 video format", |
534 0, | 534 0, |
535 NULL /*mpegvideo_probe*/, | 535 NULL /*mpegvideo_probe*/, |
536 video_read_header, | 536 video_read_header, |
539 .extensions = "m4v", //FIXME remove after writing mpeg4_probe | 539 .extensions = "m4v", //FIXME remove after writing mpeg4_probe |
540 .value = CODEC_ID_MPEG4, | 540 .value = CODEC_ID_MPEG4, |
541 }; | 541 }; |
542 | 542 |
543 #ifdef CONFIG_MUXERS | 543 #ifdef CONFIG_MUXERS |
544 AVOutputFormat m4v_oformat = { | 544 AVOutputFormat m4v_muxer = { |
545 "m4v", | 545 "m4v", |
546 "raw MPEG4 video format", | 546 "raw MPEG4 video format", |
547 NULL, | 547 NULL, |
548 "m4v", | 548 "m4v", |
549 0, | 549 0, |
553 raw_write_packet, | 553 raw_write_packet, |
554 raw_write_trailer, | 554 raw_write_trailer, |
555 }; | 555 }; |
556 #endif //CONFIG_MUXERS | 556 #endif //CONFIG_MUXERS |
557 | 557 |
558 AVInputFormat h264_iformat = { | 558 AVInputFormat h264_demuxer = { |
559 "h264", | 559 "h264", |
560 "raw H264 video format", | 560 "raw H264 video format", |
561 0, | 561 0, |
562 NULL /*mpegvideo_probe*/, | 562 NULL /*mpegvideo_probe*/, |
563 video_read_header, | 563 video_read_header, |
566 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe | 566 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe |
567 .value = CODEC_ID_H264, | 567 .value = CODEC_ID_H264, |
568 }; | 568 }; |
569 | 569 |
570 #ifdef CONFIG_MUXERS | 570 #ifdef CONFIG_MUXERS |
571 AVOutputFormat h264_oformat = { | 571 AVOutputFormat h264_muxer = { |
572 "h264", | 572 "h264", |
573 "raw H264 video format", | 573 "raw H264 video format", |
574 NULL, | 574 NULL, |
575 "h264", | 575 "h264", |
576 0, | 576 0, |
580 raw_write_packet, | 580 raw_write_packet, |
581 raw_write_trailer, | 581 raw_write_trailer, |
582 }; | 582 }; |
583 #endif //CONFIG_MUXERS | 583 #endif //CONFIG_MUXERS |
584 | 584 |
585 AVInputFormat mpegvideo_iformat = { | 585 AVInputFormat mpegvideo_demuxer = { |
586 "mpegvideo", | 586 "mpegvideo", |
587 "MPEG video", | 587 "MPEG video", |
588 0, | 588 0, |
589 mpegvideo_probe, | 589 mpegvideo_probe, |
590 video_read_header, | 590 video_read_header, |
592 raw_read_close, | 592 raw_read_close, |
593 .value = CODEC_ID_MPEG1VIDEO, | 593 .value = CODEC_ID_MPEG1VIDEO, |
594 }; | 594 }; |
595 | 595 |
596 #ifdef CONFIG_MUXERS | 596 #ifdef CONFIG_MUXERS |
597 AVOutputFormat mpeg1video_oformat = { | 597 AVOutputFormat mpeg1video_muxer = { |
598 "mpeg1video", | 598 "mpeg1video", |
599 "MPEG video", | 599 "MPEG video", |
600 "video/x-mpeg", | 600 "video/x-mpeg", |
601 "mpg,mpeg,m1v", | 601 "mpg,mpeg,m1v", |
602 0, | 602 0, |
607 raw_write_trailer, | 607 raw_write_trailer, |
608 }; | 608 }; |
609 #endif //CONFIG_MUXERS | 609 #endif //CONFIG_MUXERS |
610 | 610 |
611 #ifdef CONFIG_MUXERS | 611 #ifdef CONFIG_MUXERS |
612 AVOutputFormat mpeg2video_oformat = { | 612 AVOutputFormat mpeg2video_muxer = { |
613 "mpeg2video", | 613 "mpeg2video", |
614 "MPEG2 video", | 614 "MPEG2 video", |
615 NULL, | 615 NULL, |
616 "m2v", | 616 "m2v", |
617 0, | 617 0, |
621 raw_write_packet, | 621 raw_write_packet, |
622 raw_write_trailer, | 622 raw_write_trailer, |
623 }; | 623 }; |
624 #endif //CONFIG_MUXERS | 624 #endif //CONFIG_MUXERS |
625 | 625 |
626 AVInputFormat mjpeg_iformat = { | 626 AVInputFormat mjpeg_demuxer = { |
627 "mjpeg", | 627 "mjpeg", |
628 "MJPEG video", | 628 "MJPEG video", |
629 0, | 629 0, |
630 NULL, | 630 NULL, |
631 video_read_header, | 631 video_read_header, |
633 raw_read_close, | 633 raw_read_close, |
634 .extensions = "mjpg,mjpeg", | 634 .extensions = "mjpg,mjpeg", |
635 .value = CODEC_ID_MJPEG, | 635 .value = CODEC_ID_MJPEG, |
636 }; | 636 }; |
637 | 637 |
638 AVInputFormat ingenient_iformat = { | 638 AVInputFormat ingenient_demuxer = { |
639 "ingenient", | 639 "ingenient", |
640 "Ingenient MJPEG", | 640 "Ingenient MJPEG", |
641 0, | 641 0, |
642 NULL, | 642 NULL, |
643 video_read_header, | 643 video_read_header, |
646 .extensions = "cgi", // FIXME | 646 .extensions = "cgi", // FIXME |
647 .value = CODEC_ID_MJPEG, | 647 .value = CODEC_ID_MJPEG, |
648 }; | 648 }; |
649 | 649 |
650 #ifdef CONFIG_MUXERS | 650 #ifdef CONFIG_MUXERS |
651 AVOutputFormat mjpeg_oformat = { | 651 AVOutputFormat mjpeg_muxer = { |
652 "mjpeg", | 652 "mjpeg", |
653 "MJPEG video", | 653 "MJPEG video", |
654 "video/x-mjpeg", | 654 "video/x-mjpeg", |
655 "mjpg,mjpeg", | 655 "mjpg,mjpeg", |
656 0, | 656 0, |
663 #endif //CONFIG_MUXERS | 663 #endif //CONFIG_MUXERS |
664 | 664 |
665 /* pcm formats */ | 665 /* pcm formats */ |
666 | 666 |
667 #define PCMINPUTDEF(name, long_name, ext, codec) \ | 667 #define PCMINPUTDEF(name, long_name, ext, codec) \ |
668 AVInputFormat pcm_ ## name ## _iformat = {\ | 668 AVInputFormat pcm_ ## name ## _demuxer = {\ |
669 #name,\ | 669 #name,\ |
670 long_name,\ | 670 long_name,\ |
671 0,\ | 671 0,\ |
672 NULL,\ | 672 NULL,\ |
673 raw_read_header,\ | 673 raw_read_header,\ |
677 .extensions = ext,\ | 677 .extensions = ext,\ |
678 .value = codec,\ | 678 .value = codec,\ |
679 }; | 679 }; |
680 | 680 |
681 #define PCMOUTPUTDEF(name, long_name, ext, codec) \ | 681 #define PCMOUTPUTDEF(name, long_name, ext, codec) \ |
682 AVOutputFormat pcm_ ## name ## _oformat = {\ | 682 AVOutputFormat pcm_ ## name ## _muxer = {\ |
683 #name,\ | 683 #name,\ |
684 long_name,\ | 684 long_name,\ |
685 NULL,\ | 685 NULL,\ |
686 ext,\ | 686 ext,\ |
687 0,\ | 687 0,\ |
760 } else { | 760 } else { |
761 return 0; | 761 return 0; |
762 } | 762 } |
763 } | 763 } |
764 | 764 |
765 AVInputFormat rawvideo_iformat = { | 765 AVInputFormat rawvideo_demuxer = { |
766 "rawvideo", | 766 "rawvideo", |
767 "raw video format", | 767 "raw video format", |
768 0, | 768 0, |
769 NULL, | 769 NULL, |
770 raw_read_header, | 770 raw_read_header, |
773 .extensions = "yuv,cif,qcif", | 773 .extensions = "yuv,cif,qcif", |
774 .value = CODEC_ID_RAWVIDEO, | 774 .value = CODEC_ID_RAWVIDEO, |
775 }; | 775 }; |
776 | 776 |
777 #ifdef CONFIG_MUXERS | 777 #ifdef CONFIG_MUXERS |
778 AVOutputFormat rawvideo_oformat = { | 778 AVOutputFormat rawvideo_muxer = { |
779 "rawvideo", | 779 "rawvideo", |
780 "raw video format", | 780 "raw video format", |
781 NULL, | 781 NULL, |
782 "yuv", | 782 "yuv", |
783 0, | 783 0, |
793 static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) | 793 static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
794 { | 794 { |
795 return 0; | 795 return 0; |
796 } | 796 } |
797 | 797 |
798 AVOutputFormat null_oformat = { | 798 AVOutputFormat null_muxer = { |
799 "null", | 799 "null", |
800 "null video format", | 800 "null video format", |
801 NULL, | 801 NULL, |
802 NULL, | 802 NULL, |
803 0, | 803 0, |
822 #endif | 822 #endif |
823 | 823 |
824 int raw_init(void) | 824 int raw_init(void) |
825 { | 825 { |
826 | 826 |
827 av_register_input_format(&shorten_iformat); | 827 av_register_input_format(&shorten_demuxer); |
828 av_register_input_format(&flac_iformat); | 828 av_register_input_format(&flac_demuxer); |
829 av_register_output_format(&flac_oformat); | 829 av_register_output_format(&flac_muxer); |
830 | 830 |
831 av_register_input_format(&ac3_iformat); | 831 av_register_input_format(&ac3_demuxer); |
832 av_register_output_format(&ac3_oformat); | 832 av_register_output_format(&ac3_muxer); |
833 | 833 |
834 av_register_input_format(&aac_iformat); | 834 av_register_input_format(&aac_demuxer); |
835 | 835 |
836 av_register_input_format(&dts_iformat); | 836 av_register_input_format(&dts_demuxer); |
837 | 837 |
838 av_register_input_format(&h261_iformat); | 838 av_register_input_format(&h261_demuxer); |
839 av_register_output_format(&h261_oformat); | 839 av_register_output_format(&h261_muxer); |
840 | 840 |
841 av_register_input_format(&h263_iformat); | 841 av_register_input_format(&h263_demuxer); |
842 av_register_output_format(&h263_oformat); | 842 av_register_output_format(&h263_muxer); |
843 | 843 |
844 av_register_input_format(&m4v_iformat); | 844 av_register_input_format(&m4v_demuxer); |
845 av_register_output_format(&m4v_oformat); | 845 av_register_output_format(&m4v_muxer); |
846 | 846 |
847 av_register_input_format(&h264_iformat); | 847 av_register_input_format(&h264_demuxer); |
848 av_register_output_format(&h264_oformat); | 848 av_register_output_format(&h264_muxer); |
849 | 849 |
850 av_register_input_format(&mpegvideo_iformat); | 850 av_register_input_format(&mpegvideo_demuxer); |
851 av_register_output_format(&mpeg1video_oformat); | 851 av_register_output_format(&mpeg1video_muxer); |
852 | 852 |
853 av_register_output_format(&mpeg2video_oformat); | 853 av_register_output_format(&mpeg2video_muxer); |
854 | 854 |
855 av_register_input_format(&mjpeg_iformat); | 855 av_register_input_format(&mjpeg_demuxer); |
856 av_register_output_format(&mjpeg_oformat); | 856 av_register_output_format(&mjpeg_muxer); |
857 | 857 |
858 av_register_input_format(&ingenient_iformat); | 858 av_register_input_format(&ingenient_demuxer); |
859 | 859 |
860 av_register_input_format(&pcm_s16le_iformat); | 860 av_register_input_format(&pcm_s16le_demuxer); |
861 av_register_output_format(&pcm_s16le_oformat); | 861 av_register_output_format(&pcm_s16le_muxer); |
862 av_register_input_format(&pcm_s16be_iformat); | 862 av_register_input_format(&pcm_s16be_demuxer); |
863 av_register_output_format(&pcm_s16be_oformat); | 863 av_register_output_format(&pcm_s16be_muxer); |
864 av_register_input_format(&pcm_u16le_iformat); | 864 av_register_input_format(&pcm_u16le_demuxer); |
865 av_register_output_format(&pcm_u16le_oformat); | 865 av_register_output_format(&pcm_u16le_muxer); |
866 av_register_input_format(&pcm_u16be_iformat); | 866 av_register_input_format(&pcm_u16be_demuxer); |
867 av_register_output_format(&pcm_u16be_oformat); | 867 av_register_output_format(&pcm_u16be_muxer); |
868 av_register_input_format(&pcm_s8_iformat); | 868 av_register_input_format(&pcm_s8_demuxer); |
869 av_register_output_format(&pcm_s8_oformat); | 869 av_register_output_format(&pcm_s8_muxer); |
870 av_register_input_format(&pcm_u8_iformat); | 870 av_register_input_format(&pcm_u8_demuxer); |
871 av_register_output_format(&pcm_u8_oformat); | 871 av_register_output_format(&pcm_u8_muxer); |
872 av_register_input_format(&pcm_mulaw_iformat); | 872 av_register_input_format(&pcm_mulaw_demuxer); |
873 av_register_output_format(&pcm_mulaw_oformat); | 873 av_register_output_format(&pcm_mulaw_muxer); |
874 av_register_input_format(&pcm_alaw_iformat); | 874 av_register_input_format(&pcm_alaw_demuxer); |
875 av_register_output_format(&pcm_alaw_oformat); | 875 av_register_output_format(&pcm_alaw_muxer); |
876 | 876 |
877 av_register_input_format(&rawvideo_iformat); | 877 av_register_input_format(&rawvideo_demuxer); |
878 av_register_output_format(&rawvideo_oformat); | 878 av_register_output_format(&rawvideo_muxer); |
879 | 879 |
880 av_register_output_format(&null_oformat); | 880 av_register_output_format(&null_muxer); |
881 return 0; | 881 return 0; |
882 } | 882 } |