Mercurial > libavformat.hg

comparison raw.c @ 3484:31a0f3b99ef7 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove useless close funcs
author bcoudurier
date Thu, 19 Jun 2008 23:25:04 +0000
parents b0936b8a0337
children 1d8d52ca1e54
comparison
equal deleted inserted replaced
3483:e85a3d8478c1 3484:31a0f3b99ef7
186 } 186 }
187 pkt->size = ret; 187 pkt->size = ret;
188 return ret; 188 return ret;
189 } 189 }
190 190
191 static int raw_read_close(AVFormatContext *s)
192 {
193 return 0;
194 }
195
196 int pcm_read_seek(AVFormatContext *s, 191 int pcm_read_seek(AVFormatContext *s,
197 int stream_index, int64_t timestamp, int flags) 192 int stream_index, int64_t timestamp, int flags)
198 { 193 {
199 AVStream *st; 194 AVStream *st;
200 int block_align, byte_rate; 195 int block_align, byte_rate;
434 NULL_IF_CONFIG_SMALL("raw Shorten"), 429 NULL_IF_CONFIG_SMALL("raw Shorten"),
435 0, 430 0,
436 NULL, 431 NULL,
437 audio_read_header, 432 audio_read_header,
438 raw_read_partial_packet, 433 raw_read_partial_packet,
439 raw_read_close,
440 .flags= AVFMT_GENERIC_INDEX, 434 .flags= AVFMT_GENERIC_INDEX,
441 .extensions = "shn", 435 .extensions = "shn",
442 .value = CODEC_ID_SHORTEN, 436 .value = CODEC_ID_SHORTEN,
443 }; 437 };
444 438
447 NULL_IF_CONFIG_SMALL("raw MLP"), 441 NULL_IF_CONFIG_SMALL("raw MLP"),
448 0, 442 0,
449 NULL, 443 NULL,
450 audio_read_header, 444 audio_read_header,
451 raw_read_partial_packet, 445 raw_read_partial_packet,
452 raw_read_close,
453 .flags= AVFMT_GENERIC_INDEX, 446 .flags= AVFMT_GENERIC_INDEX,
454 .extensions = "mlp", 447 .extensions = "mlp",
455 .value = CODEC_ID_MLP, 448 .value = CODEC_ID_MLP,
456 }; 449 };
457 450
460 NULL_IF_CONFIG_SMALL("raw FLAC"), 453 NULL_IF_CONFIG_SMALL("raw FLAC"),
461 0, 454 0,
462 flac_probe, 455 flac_probe,
463 audio_read_header, 456 audio_read_header,
464 raw_read_partial_packet, 457 raw_read_partial_packet,
465 raw_read_close,
466 .flags= AVFMT_GENERIC_INDEX, 458 .flags= AVFMT_GENERIC_INDEX,
467 .extensions = "flac", 459 .extensions = "flac",
468 .value = CODEC_ID_FLAC, 460 .value = CODEC_ID_FLAC,
469 }; 461 };
470 462
489 NULL_IF_CONFIG_SMALL("raw AC-3"), 481 NULL_IF_CONFIG_SMALL("raw AC-3"),
490 0, 482 0,
491 ac3_probe, 483 ac3_probe,
492 audio_read_header, 484 audio_read_header,
493 raw_read_partial_packet, 485 raw_read_partial_packet,
494 raw_read_close,
495 .flags= AVFMT_GENERIC_INDEX, 486 .flags= AVFMT_GENERIC_INDEX,
496 .extensions = "ac3", 487 .extensions = "ac3",
497 .value = CODEC_ID_AC3, 488 .value = CODEC_ID_AC3,
498 }; 489 };
499 #endif 490 #endif
532 NULL_IF_CONFIG_SMALL("raw Dirac"), 523 NULL_IF_CONFIG_SMALL("raw Dirac"),
533 0, 524 0,
534 dirac_probe, 525 dirac_probe,
535 video_read_header, 526 video_read_header,
536 raw_read_partial_packet, 527 raw_read_partial_packet,
537 raw_read_close,
538 .flags= AVFMT_GENERIC_INDEX, 528 .flags= AVFMT_GENERIC_INDEX,
539 .value = CODEC_ID_DIRAC, 529 .value = CODEC_ID_DIRAC,
540 }; 530 };
541 531
542 #ifdef CONFIG_MUXERS 532 #ifdef CONFIG_MUXERS
559 NULL_IF_CONFIG_SMALL("raw DTS"), 549 NULL_IF_CONFIG_SMALL("raw DTS"),
560 0, 550 0,
561 dts_probe, 551 dts_probe,
562 audio_read_header, 552 audio_read_header,
563 raw_read_partial_packet, 553 raw_read_partial_packet,
564 raw_read_close,
565 .flags= AVFMT_GENERIC_INDEX, 554 .flags= AVFMT_GENERIC_INDEX,
566 .extensions = "dts", 555 .extensions = "dts",
567 .value = CODEC_ID_DTS, 556 .value = CODEC_ID_DTS,
568 }; 557 };
569 558
572 NULL_IF_CONFIG_SMALL("ADTS AAC"), 561 NULL_IF_CONFIG_SMALL("ADTS AAC"),
573 0, 562 0,
574 NULL, 563 NULL,
575 audio_read_header, 564 audio_read_header,
576 raw_read_partial_packet, 565 raw_read_partial_packet,
577 raw_read_close,
578 .flags= AVFMT_GENERIC_INDEX, 566 .flags= AVFMT_GENERIC_INDEX,
579 .extensions = "aac", 567 .extensions = "aac",
580 .value = CODEC_ID_AAC, 568 .value = CODEC_ID_AAC,
581 }; 569 };
582 570
585 NULL_IF_CONFIG_SMALL("GSM"), 573 NULL_IF_CONFIG_SMALL("GSM"),
586 0, 574 0,
587 NULL, 575 NULL,
588 audio_read_header, 576 audio_read_header,
589 raw_read_partial_packet, 577 raw_read_partial_packet,
590 raw_read_close,
591 .flags= AVFMT_GENERIC_INDEX, 578 .flags= AVFMT_GENERIC_INDEX,
592 .extensions = "gsm", 579 .extensions = "gsm",
593 .value = CODEC_ID_GSM, 580 .value = CODEC_ID_GSM,
594 }; 581 };
595 582
613 NULL_IF_CONFIG_SMALL("raw H.261"), 600 NULL_IF_CONFIG_SMALL("raw H.261"),
614 0, 601 0,
615 h261_probe, 602 h261_probe,
616 video_read_header, 603 video_read_header,
617 raw_read_partial_packet, 604 raw_read_partial_packet,
618 raw_read_close,
619 .flags= AVFMT_GENERIC_INDEX, 605 .flags= AVFMT_GENERIC_INDEX,
620 .extensions = "h261", 606 .extensions = "h261",
621 .value = CODEC_ID_H261, 607 .value = CODEC_ID_H261,
622 }; 608 };
623 609
641 NULL_IF_CONFIG_SMALL("raw H.263"), 627 NULL_IF_CONFIG_SMALL("raw H.263"),
642 0, 628 0,
643 h263_probe, 629 h263_probe,
644 video_read_header, 630 video_read_header,
645 raw_read_partial_packet, 631 raw_read_partial_packet,
646 raw_read_close,
647 .flags= AVFMT_GENERIC_INDEX, 632 .flags= AVFMT_GENERIC_INDEX,
648 // .extensions = "h263", //FIXME remove after writing mpeg4_probe 633 // .extensions = "h263", //FIXME remove after writing mpeg4_probe
649 .value = CODEC_ID_H263, 634 .value = CODEC_ID_H263,
650 }; 635 };
651 636
669 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), 654 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
670 0, 655 0,
671 mpeg4video_probe, /** probing for mpeg4 data */ 656 mpeg4video_probe, /** probing for mpeg4 data */
672 video_read_header, 657 video_read_header,
673 raw_read_partial_packet, 658 raw_read_partial_packet,
674 raw_read_close,
675 .flags= AVFMT_GENERIC_INDEX, 659 .flags= AVFMT_GENERIC_INDEX,
676 .extensions = "m4v", //FIXME remove after writing mpeg4_probe 660 .extensions = "m4v", //FIXME remove after writing mpeg4_probe
677 .value = CODEC_ID_MPEG4, 661 .value = CODEC_ID_MPEG4,
678 }; 662 };
679 663
697 NULL_IF_CONFIG_SMALL("raw H.264 video format"), 681 NULL_IF_CONFIG_SMALL("raw H.264 video format"),
698 0, 682 0,
699 NULL /*mpegvideo_probe*/, 683 NULL /*mpegvideo_probe*/,
700 video_read_header, 684 video_read_header,
701 raw_read_partial_packet, 685 raw_read_partial_packet,
702 raw_read_close,
703 .flags= AVFMT_GENERIC_INDEX, 686 .flags= AVFMT_GENERIC_INDEX,
704 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe 687 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
705 .value = CODEC_ID_H264, 688 .value = CODEC_ID_H264,
706 }; 689 };
707 690
725 NULL_IF_CONFIG_SMALL("MPEG video"), 708 NULL_IF_CONFIG_SMALL("MPEG video"),
726 0, 709 0,
727 mpegvideo_probe, 710 mpegvideo_probe,
728 video_read_header, 711 video_read_header,
729 raw_read_partial_packet, 712 raw_read_partial_packet,
730 raw_read_close,
731 .flags= AVFMT_GENERIC_INDEX, 713 .flags= AVFMT_GENERIC_INDEX,
732 .value = CODEC_ID_MPEG1VIDEO, 714 .value = CODEC_ID_MPEG1VIDEO,
733 }; 715 };
734 716
735 #ifdef CONFIG_MUXERS 717 #ifdef CONFIG_MUXERS
767 NULL_IF_CONFIG_SMALL("MJPEG video"), 749 NULL_IF_CONFIG_SMALL("MJPEG video"),
768 0, 750 0,
769 NULL, 751 NULL,
770 video_read_header, 752 video_read_header,
771 raw_read_partial_packet, 753 raw_read_partial_packet,
772 raw_read_close,
773 .flags= AVFMT_GENERIC_INDEX, 754 .flags= AVFMT_GENERIC_INDEX,
774 .extensions = "mjpg,mjpeg", 755 .extensions = "mjpg,mjpeg",
775 .value = CODEC_ID_MJPEG, 756 .value = CODEC_ID_MJPEG,
776 }; 757 };
777 758
780 NULL_IF_CONFIG_SMALL("Ingenient MJPEG"), 761 NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
781 0, 762 0,
782 NULL, 763 NULL,
783 video_read_header, 764 video_read_header,
784 ingenient_read_packet, 765 ingenient_read_packet,
785 raw_read_close,
786 .flags= AVFMT_GENERIC_INDEX, 766 .flags= AVFMT_GENERIC_INDEX,
787 .extensions = "cgi", // FIXME 767 .extensions = "cgi", // FIXME
788 .value = CODEC_ID_MJPEG, 768 .value = CODEC_ID_MJPEG,
789 }; 769 };
790 770
808 NULL_IF_CONFIG_SMALL("raw VC-1"), 788 NULL_IF_CONFIG_SMALL("raw VC-1"),
809 0, 789 0,
810 NULL /* vc1_probe */, 790 NULL /* vc1_probe */,
811 video_read_header, 791 video_read_header,
812 raw_read_partial_packet, 792 raw_read_partial_packet,
813 raw_read_close,
814 .extensions = "vc1", 793 .extensions = "vc1",
815 .value = CODEC_ID_VC1, 794 .value = CODEC_ID_VC1,
816 }; 795 };
817 796
818 /* pcm formats */ 797 /* pcm formats */
823 NULL_IF_CONFIG_SMALL(long_name),\ 802 NULL_IF_CONFIG_SMALL(long_name),\
824 0,\ 803 0,\
825 NULL,\ 804 NULL,\
826 raw_read_header,\ 805 raw_read_header,\
827 raw_read_packet,\ 806 raw_read_packet,\
828 raw_read_close,\ 807 NULL,\
829 pcm_read_seek,\ 808 pcm_read_seek,\
830 .flags= AVFMT_GENERIC_INDEX,\ 809 .flags= AVFMT_GENERIC_INDEX,\
831 .extensions = ext,\ 810 .extensions = ext,\
832 .value = codec,\ 811 .value = codec,\
833 }; 812 };
923 NULL_IF_CONFIG_SMALL("raw video format"), 902 NULL_IF_CONFIG_SMALL("raw video format"),
924 0, 903 0,
925 NULL, 904 NULL,
926 raw_read_header, 905 raw_read_header,
927 rawvideo_read_packet, 906 rawvideo_read_packet,
928 raw_read_close,
929 .flags= AVFMT_GENERIC_INDEX, 907 .flags= AVFMT_GENERIC_INDEX,
930 .extensions = "yuv,cif,qcif,rgb", 908 .extensions = "yuv,cif,qcif,rgb",
931 .value = CODEC_ID_RAWVIDEO, 909 .value = CODEC_ID_RAWVIDEO,
932 }; 910 };
933 911