Mercurial > libavformat.hg
comparison movenc.c @ 4825:b2eef653b7e4 libavformat
cosmetics, reindent, add empty lines
| author | bcoudurier |
|---|---|
| date | Tue, 07 Apr 2009 22:21:43 +0000 |
| parents | ef55a8830c20 |
| children | 5630bd03a01d |
comparison
equal
deleted
inserted
replaced
| 4824:ef55a8830c20 | 4825:b2eef653b7e4 |
|---|---|
| 581 }; | 581 }; |
| 582 | 582 |
| 583 static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) | 583 static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) |
| 584 { | 584 { |
| 585 int tag = track->enc->codec_tag; | 585 int tag = track->enc->codec_tag; |
| 586 if (!codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)) | 586 |
| 587 return 0; | 587 if (!codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)) |
| 588 if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1'); | 588 return 0; |
| 589 else if (track->enc->codec_id == CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); | 589 |
| 590 else if (track->enc->codec_id == CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); | 590 if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1'); |
| 591 else if (track->enc->codec_id == CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); | 591 else if (track->enc->codec_id == CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); |
| 592 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); | 592 else if (track->enc->codec_id == CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); |
| 593 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); | 593 else if (track->enc->codec_id == CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); |
| 594 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); | |
| 595 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); | |
| 594 | 596 |
| 595 return tag; | 597 return tag; |
| 596 } | 598 } |
| 597 | 599 |
| 598 static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track) | 600 static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track) |
| 599 { | 601 { |
| 600 int tag = track->enc->codec_tag; | 602 int tag = track->enc->codec_tag; |
| 601 | 603 |
| 602 if (track->enc->codec_type == CODEC_TYPE_SUBTITLE && | 604 if (track->enc->codec_type == CODEC_TYPE_SUBTITLE && |
| 603 (tag == MKTAG('t','x','3','g') || | 605 (tag == MKTAG('t','x','3','g') || |
| 604 tag == MKTAG('t','e','x','t'))) | 606 tag == MKTAG('t','e','x','t'))) |
| 605 track->tag = tag; // keep original tag | 607 track->tag = tag; // keep original tag |
| 606 else | 608 else |
| 607 tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id); | 609 tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id); |
| 608 if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v")) | 610 if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v")) |
| 609 av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " | 611 av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " |
| 610 "Quicktime/Ipod might not play the file\n"); | 612 "Quicktime/Ipod might not play the file\n"); |
| 611 | 613 |
| 612 return tag; | 614 return tag; |
| 613 } | 615 } |
| 614 | 616 |
| 615 static int mov_get_dv_codec_tag(AVFormatContext *s, MOVTrack *track) | 617 static int mov_get_dv_codec_tag(AVFormatContext *s, MOVTrack *track) |
| 616 { | 618 { |
| 617 int tag; | 619 int tag; |
| 618 | 620 |
| 619 if (track->enc->height == 480) /* NTSC */ | 621 if (track->enc->height == 480) /* NTSC */ |
| 620 if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); | 622 if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); |
| 621 else tag = MKTAG('d','v','c',' '); | 623 else tag = MKTAG('d','v','c',' '); |
| 622 else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p'); | 624 else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p'); |
| 623 else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p'); | 625 else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p'); |
| 624 else tag = MKTAG('d','v','p','p'); | 626 else tag = MKTAG('d','v','p','p'); |
| 625 | 627 |
| 626 return tag; | 628 return tag; |
| 627 } | 629 } |
| 628 | 630 |
| 629 static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track) | 631 static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track) |
| 630 { | 632 { |
| 631 int tag = track->enc->codec_tag; | 633 int tag = track->enc->codec_tag; |
| 632 int i; | 634 int i; |
| 633 for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); i++) { | 635 |
| 634 if (track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) { | 636 for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); i++) { |
| 635 tag = mov_pix_fmt_tags[i].tag; | 637 if (track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) { |
| 636 track->enc->bits_per_coded_sample = mov_pix_fmt_tags[i].bps; | 638 tag = mov_pix_fmt_tags[i].tag; |
| 637 break; | 639 track->enc->bits_per_coded_sample = mov_pix_fmt_tags[i].bps; |
| 638 } | 640 break; |
| 639 } | 641 } |
| 640 if (!tag) // restore tag | 642 } |
| 641 tag = track->enc->codec_tag; | 643 if (!tag) // restore tag |
| 644 tag = track->enc->codec_tag; | |
| 642 | 645 |
| 643 return tag; | 646 return tag; |
| 644 } | 647 } |
| 645 | 648 |
| 646 static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) | 649 static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) |
| 677 } else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) { | 680 } else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) { |
| 678 tag = codec_get_tag(ff_codec_movsubtitle_tags, track->enc->codec_id); | 681 tag = codec_get_tag(ff_codec_movsubtitle_tags, track->enc->codec_id); |
| 679 } | 682 } |
| 680 } | 683 } |
| 681 } | 684 } |
| 685 | |
| 682 return tag; | 686 return tag; |
| 683 } | 687 } |
| 684 | 688 |
| 685 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) | 689 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) |
| 686 { | 690 { |