Mercurial > libavformat.hg

comparison mxfenc.c @ 4322:0d40ba62d7d7 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
write best effort video line map
author bcoudurier
date Sat, 31 Jan 2009 09:23:50 +0000
parents 68de70aa392b
children 982d24f6d8f6
comparison
equal deleted inserted replaced
4321:68de70aa392b 4322:0d40ba62d7d7
172 { 0x3006, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x06,0x01,0x01,0x03,0x05,0x00,0x00,0x00}}, /* Linked Track ID */ 172 { 0x3006, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x06,0x01,0x01,0x03,0x05,0x00,0x00,0x00}}, /* Linked Track ID */
173 { 0x3001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x00,0x00,0x00,0x00}}, /* SampleRate */ 173 { 0x3001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x00,0x00,0x00,0x00}}, /* SampleRate */
174 { 0x3004, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x01,0x02,0x00,0x00}}, /* Essence Container */ 174 { 0x3004, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x01,0x02,0x00,0x00}}, /* Essence Container */
175 // Generic Picture Essence Descriptor 175 // Generic Picture Essence Descriptor
176 { 0x320C, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Frame Layout */ 176 { 0x320C, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Frame Layout */
177 { 0x320D, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x03,0x02,0x05,0x00,0x00,0x00}}, /* Video Line Map */
177 { 0x3203, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x02,0x00,0x00,0x00}}, /* Stored Width */ 178 { 0x3203, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x02,0x00,0x00,0x00}}, /* Stored Width */
178 { 0x3202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x01,0x00,0x00,0x00}}, /* Stored Height */ 179 { 0x3202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x01,0x00,0x00,0x00}}, /* Stored Height */
179 { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */ 180 { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */
180 { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */ 181 { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */
181 // Generic Sound Essence Descriptor 182 // Generic Sound Essence Descriptor
587 { 588 {
588 MXFStreamContext *sc = st->priv_data; 589 MXFStreamContext *sc = st->priv_data;
589 ByteIOContext *pb = s->pb; 590 ByteIOContext *pb = s->pb;
590 int stored_height = (st->codec->height+15)/16*16; 591 int stored_height = (st->codec->height+15)/16*16;
591 AVRational dar; 592 AVRational dar;
592 593 int f1, f2;
593 mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key, 113); 594
595 mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key, 133);
594 596
595 mxf_write_local_tag(pb, 4, 0x3203); 597 mxf_write_local_tag(pb, 4, 0x3203);
596 put_be32(pb, st->codec->width); 598 put_be32(pb, st->codec->width);
597 599
598 mxf_write_local_tag(pb, 4, 0x3202); 600 mxf_write_local_tag(pb, 4, 0x3202);
599 put_be32(pb, stored_height>>sc->interlaced); 601 put_be32(pb, stored_height>>sc->interlaced);
600 602
601 // frame layout 603 // frame layout
602 mxf_write_local_tag(pb, 1, 0x320C); 604 mxf_write_local_tag(pb, 1, 0x320C);
603 put_byte(pb, sc->interlaced); 605 put_byte(pb, sc->interlaced);
606
607 // video line map
608 mxf_write_local_tag(pb, 16, 0x320D);
609 put_be32(pb, 2);
610 put_be32(pb, 4);
611 switch (st->codec->height) {
612 case 576: f1 = 23; f2 = 336; break;
613 case 608: f1 = 7; f2 = 320; break;
614 case 480: f1 = 20; f2 = 283; break;
615 case 512: f1 = 7; f2 = 270; break;
616 case 720: f1 = 26; f2 = 0; break; // progressive
617 case 1080: f1 = 21; f2 = 584; break;
618 default: f1 = 0; f2 = 0; break;
619 }
620
621 if (!sc->interlaced) {
622 f2 = 0;
623 f1 *= 2;
624 }
625
626 put_be32(pb, f1);
627 put_be32(pb, f2);
604 628
605 av_reduce(&dar.num, &dar.den, 629 av_reduce(&dar.num, &dar.den,
606 st->codec->width*st->codec->sample_aspect_ratio.num, 630 st->codec->width*st->codec->sample_aspect_ratio.num,
607 st->codec->height*st->codec->sample_aspect_ratio.den, 631 st->codec->height*st->codec->sample_aspect_ratio.den,
608 1024*1024); 632 1024*1024);