Mercurial > libavformat.hg

comparison mxfenc.c @ 3828:277ae74eac98 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove now useless mxf_essence_element_key array
author bcoudurier
date Sun, 31 Aug 2008 01:37:14 +0000
parents e206d10f28db
children b12626ef1020
comparison
equal deleted inserted replaced
3827:e206d10f28db 3828:277ae74eac98
86 86
87 /** 87 /**
88 * partial key for header metadata 88 * partial key for header metadata
89 */ 89 */
90 static const uint8_t header_metadata_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01 }; 90 static const uint8_t header_metadata_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01 };
91
92 static const MXFCodecUL mxf_essence_element_key[] = {
93 { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, 14, CODEC_ID_MPEG2VIDEO},
94 { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x01,0x00 }, 14, CODEC_ID_PCM_S16LE},
95 { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE},
96 };
97 91
98 static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00 }; 92 static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00 };
99 93
100 /** 94 /**
101 * SMPTE RP210 http://www.smpte-ra.org/mdd/index.html 95 * SMPTE RP210 http://www.smpte-ra.org/mdd/index.html
651 645
652 static void mxf_build_structural_metadata(AVFormatContext *s, enum MXFMetadataSetType type) 646 static void mxf_build_structural_metadata(AVFormatContext *s, enum MXFMetadataSetType type)
653 { 647 {
654 int i; 648 int i;
655 const MXFDescriptorWriteTableEntry *desc = NULL; 649 const MXFDescriptorWriteTableEntry *desc = NULL;
656 int track_number_sign[sizeof(mxf_essence_element_key)/ 650 int track_number_sign[sizeof(mxf_essence_container_uls)/
657 sizeof(*mxf_essence_element_key)] = {0}; 651 sizeof(*mxf_essence_container_uls)] = {0};
658 652
659 mxf_write_package(s, type); 653 mxf_write_package(s, type);
660 if (type == SourcePackage) 654 if (type == SourcePackage)
661 mxf_write_multi_descriptor(s); 655 mxf_write_multi_descriptor(s);
662 656
755 if (!present[index]) { 749 if (!present[index]) {
756 mxf->essence_containers_indices[mxf->essence_container_count++] = index; 750 mxf->essence_containers_indices[mxf->essence_container_count++] = index;
757 present[index] = 1; 751 present[index] = 1;
758 } else 752 } else
759 present[index]++; 753 present[index]++;
760 memcpy(sc->track_essence_element_key, mxf_essence_element_key[index].uid, 15); 754 memcpy(sc->track_essence_element_key, mxf_essence_container_uls[index].element_ul, 15);
761 sc->track_essence_element_key[15] = present[index]; 755 sc->track_essence_element_key[15] = present[index];
762 PRINT_KEY(s, "track essence element key", sc->track_essence_element_key); 756 PRINT_KEY(s, "track essence element key", sc->track_essence_element_key);
763 } 757 }
764 758
765 mxf_write_partition(s, 0, 1, header_partition_key); 759 mxf_write_partition(s, 0, 1, header_partition_key);