Mercurial > libavformat.hg

comparison movenc.c @ 2992:0cdcc2b1a272 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support rawvideo in mov
author bcoudurier
date Thu, 31 Jan 2008 11:31:56 +0000
parents 721d236e04d6
children 147a3d574e95
comparison
equal deleted inserted replaced
2991:4591452ec78c 2992:0cdcc2b1a272
481 { CODEC_ID_AAC, MKTAG('m','p','4','a') }, 481 { CODEC_ID_AAC, MKTAG('m','p','4','a') },
482 { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, 482 { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') },
483 { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, 483 { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') },
484 }; 484 };
485 485
486 static const AVCodecTag mov_pix_fmt_tags[] = {
487 { PIX_FMT_YUYV422, MKTAG('y','u','v','s') },
488 { PIX_FMT_YUYV422, MKTAG('2','v','u','y') },
489 { PIX_FMT_BGR555, MKTAG('r','a','w',' ') },
490 { PIX_FMT_RGB24, MKTAG('r','a','w',' ') },
491 { PIX_FMT_BGR32_1, MKTAG('r','a','w',' ') },
492 };
493
486 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) 494 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
487 { 495 {
488 int tag = track->enc->codec_tag; 496 int tag = track->enc->codec_tag;
489 if (track->mode == MODE_MP4 || track->mode == MODE_PSP) { 497 if (track->mode == MODE_MP4 || track->mode == MODE_PSP) {
490 if (!codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)) 498 if (!codec_get_tag(ff_mp4_obj_type, track->enc->codec_id))
493 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); 501 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
494 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); 502 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
495 } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) { 503 } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) {
496 tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id); 504 tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id);
497 } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && 505 } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
498 tag == MKTAG('d','v','c','p'))) { 506 (tag == MKTAG('d','v','c','p') ||
507 track->enc->codec_id == CODEC_ID_RAWVIDEO))) {
499 if (track->enc->codec_id == CODEC_ID_DVVIDEO) { 508 if (track->enc->codec_id == CODEC_ID_DVVIDEO) {
500 if (track->enc->height == 480) /* NTSC */ 509 if (track->enc->height == 480) /* NTSC */
501 if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); 510 if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n');
502 else tag = MKTAG('d','v','c',' '); 511 else tag = MKTAG('d','v','c',' ');
503 else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p'); 512 else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p');
504 else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p'); 513 else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p');
505 else tag = MKTAG('d','v','p','p'); 514 else tag = MKTAG('d','v','p','p');
515 } else if (track->enc->codec_id == CODEC_ID_RAWVIDEO) {
516 tag = codec_get_tag(mov_pix_fmt_tags, track->enc->pix_fmt);
517 if (!tag) // restore tag
518 tag = track->enc->codec_tag;
506 } else { 519 } else {
507 if (track->enc->codec_type == CODEC_TYPE_VIDEO) { 520 if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
508 tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id); 521 tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
509 if (!tag) { // if no mac fcc found, try with Microsoft tags 522 if (!tag) { // if no mac fcc found, try with Microsoft tags
510 tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id); 523 tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id);
567 if (track->mode == MODE_MOV && track->enc->codec && track->enc->codec->name) 580 if (track->mode == MODE_MOV && track->enc->codec && track->enc->codec->name)
568 strncpy(compressor_name,track->enc->codec->name,31); 581 strncpy(compressor_name,track->enc->codec->name,31);
569 put_byte(pb, strlen(compressor_name)); 582 put_byte(pb, strlen(compressor_name));
570 put_buffer(pb, compressor_name, 31); 583 put_buffer(pb, compressor_name, 31);
571 584
572 put_be16(pb, 0x18); /* Reserved */ 585 if (track->mode == MODE_MOV && track->enc->bits_per_sample)
586 put_be16(pb, track->enc->bits_per_sample);
587 else
588 put_be16(pb, 0x18); /* Reserved */
573 put_be16(pb, 0xffff); /* Reserved */ 589 put_be16(pb, 0xffff); /* Reserved */
574 if(track->tag == MKTAG('m','p','4','v')) 590 if(track->tag == MKTAG('m','p','4','v'))
575 mov_write_esds_tag(pb, track); 591 mov_write_esds_tag(pb, track);
576 else if(track->enc->codec_id == CODEC_ID_H263) 592 else if(track->enc->codec_id == CODEC_ID_H263)
577 mov_write_d263_tag(pb); 593 mov_write_d263_tag(pb);