From: Philip de N. <ph...@us...> - 2008-11-07 14:13:10
|
Update of /cvsroot/ingex/ingex/libMXF/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3074/lib Modified Files: Makefile Log Message: replaced the opaque Avid meta-dictionary blob with explicit creation in the source code using a meta-dictionary generated by Avid Media Composer 3.0 added an Avid dictionary (Preface::Dictionary) containing taggedvalue, container and data definitions added properties to Preface and MaterialPackage to better match Avid generated files filtering out the meta-dictionary and dictionary (except data definitions) when reading Avid MXF files simplify the log function calls by including the level in the function name fix reading aes3 audio in d10 by allowing the channel count set in the mxf metadata to be less than the channel count set in the aes3 audio data added function to write both the item's local tag and length make clear in code that mxf_read_set() returns 0,1 or 2 and not just 0 or 1; only process the set returned by mxf_read_and_return_set if the result == 1 speed up subclass check (and therefore reading and writing files) by utilising the dereferenced parentclassdef when the data model was finalised change libMXF version to 1.0 Index: Makefile =================================================================== RCS file: /cvsroot/ingex/ingex/libMXF/lib/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 8 Oct 2008 09:39:52 -0000 1.5 --- Makefile 7 Nov 2008 14:12:59 -0000 1.6 *************** *** 24,28 **** $(MXF_DIR)/mxf_header_metadata.o \ $(PRODUCTS_DIR)/mxf_avid.o \ ! $(PRODUCTS_DIR)/mxf_avid_metadict_blob.o \ $(PRODUCTS_DIR)/mxf_p2.o \ $(UTILS_DIR)/mxf_uu_metadata.o \ --- 24,29 ---- $(MXF_DIR)/mxf_header_metadata.o \ $(PRODUCTS_DIR)/mxf_avid.o \ ! $(PRODUCTS_DIR)/mxf_avid_metadictionary.o \ ! $(PRODUCTS_DIR)/mxf_avid_dictionary.o \ $(PRODUCTS_DIR)/mxf_p2.o \ $(UTILS_DIR)/mxf_uu_metadata.o \ *************** *** 45,49 **** $(INCLUDES_DIR)/mxf/mxf_types.h \ $(INCLUDES_DIR)/mxf/mxf_avid.h \ ! $(INCLUDES_DIR)/mxf/mxf_avid_metadict_blob.h \ $(INCLUDES_DIR)/mxf/mxf_avid_extensions_data_model.h \ $(INCLUDES_DIR)/mxf/mxf_avid_labels_and_keys.h \ --- 46,51 ---- $(INCLUDES_DIR)/mxf/mxf_types.h \ $(INCLUDES_DIR)/mxf/mxf_avid.h \ ! $(INCLUDES_DIR)/mxf/mxf_avid_metadictionary.h \ ! $(INCLUDES_DIR)/mxf/mxf_avid_dictionary.h \ $(INCLUDES_DIR)/mxf/mxf_avid_extensions_data_model.h \ $(INCLUDES_DIR)/mxf/mxf_avid_labels_and_keys.h \ *************** *** 54,57 **** --- 56,60 ---- + .PHONY: all all: libMXF.a *************** *** 99,106 **** ! $(PRODUCTS_DIR)/mxf_avid_metadict_blob.o: $(PRODUCTS_DIR)/mxf_avid_metadict_blob.c $(INCLUDE_FILES) ! $(CC) -c -I$(INCLUDES_DIR) $(PRODUCTS_DIR)/mxf_avid_metadict_blob.c -o $(PRODUCTS_DIR)/mxf_avid_metadict_blob.o ! $(PRODUCTS_DIR)/mxf_avid.o: $(PRODUCTS_DIR)/mxf_avid.c $(INCLUDE_FILES) $(CC) -c -I$(INCLUDES_DIR) $(PRODUCTS_DIR)/mxf_avid.c -o $(PRODUCTS_DIR)/mxf_avid.o --- 102,112 ---- ! $(PRODUCTS_DIR)/mxf_avid_dictionary.o: $(PRODUCTS_DIR)/mxf_avid_dictionary.c $(INCLUDE_FILES) $(PRODUCTS_DIR)/mxf_avid_dictionary_data.h ! $(CC) -c -I$(INCLUDES_DIR) $(PRODUCTS_DIR)/mxf_avid_dictionary.c -o $(PRODUCTS_DIR)/mxf_avid_dictionary.o ! $(PRODUCTS_DIR)/mxf_avid_metadictionary.o: $(PRODUCTS_DIR)/mxf_avid_metadictionary.c $(INCLUDE_FILES) $(PRODUCTS_DIR)/mxf_avid_metadictionary_data.h ! $(CC) -c -I$(INCLUDES_DIR) $(PRODUCTS_DIR)/mxf_avid_metadictionary.c -o $(PRODUCTS_DIR)/mxf_avid_metadictionary.o ! ! $(PRODUCTS_DIR)/mxf_avid.o: $(PRODUCTS_DIR)/mxf_avid.c $(INCLUDE_FILES) $(AVID_INTERNAL_INCLUDE_FILES) $(CC) -c -I$(INCLUDES_DIR) $(PRODUCTS_DIR)/mxf_avid.c -o $(PRODUCTS_DIR)/mxf_avid.o |