[aaf-commits] AAF/DevUtils/MXFDump MXFDump.cpp,1.784,1.785

[Phil T. <phi...@us...>]

Update of /cvsroot/aaf/AAF/DevUtils/MXFDump
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2777/DevUtils/MXFDump

Modified Files:
	MXFDump.cpp 
Log Message:
Use valid UL as predefined essence element label.


Index: MXFDump.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/DevUtils/MXFDump/MXFDump.cpp,v
retrieving revision 1.784
retrieving revision 1.785
diff -C2 -d -r1.784 -r1.785
*** MXFDump.cpp	1 Aug 2007 15:14:57 -0000	1.784
--- MXFDump.cpp	3 Aug 2007 16:34:15 -0000	1.785
***************
*** 3751,3755 ****
    // Prefix for MXF predefined MXF essence element labels
    mxfKey pe = {0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01,
!                0x0d, 0x01, 0x03, 0x01, 0xff, 0xff, 0xff, 0xff};
    bool result;
    if (memcmp(&k, &pe, 12) == 0) {
--- 3751,3755 ----
    // Prefix for MXF predefined MXF essence element labels
    mxfKey pe = {0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01,
!                0x0d, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00};
    bool result;
    if (memcmp(&k, &pe, 12) == 0) {
***************
*** 3761,3764 ****
--- 3761,3780 ----
  }
  
+ bool isLegacyPredefinedEssenceElement(mxfKey& k);
+ 
+ bool isLegacyPredefinedEssenceElement(mxfKey& k)
+ {
+   // Legacy Prefix for MXF predefined MXF essence element labels
+   mxfKey lpe = {0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01,
+                0x0d, 0x01, 0x03, 0x01, 0xff, 0xff, 0xff, 0xff};
+   bool result;
+   if (memcmp(&k, &lpe, 12) == 0) {
+     result = true;
+   } else {
+     result = false;
+   }
+   return result;
+ }
+ 
  bool isAvidEssenceElement(mxfKey& k);
  
***************
*** 3782,3785 ****
--- 3798,3803 ----
    if (isPredefinedEssenceElement(k)) {
      result = true;
+   } else if (isLegacyPredefinedEssenceElement(k)) {
+     result = true;
    } else if (isAvidEssenceElement(k)) {
      result = true;