[ingex-commits] ingex/libMXF/lib/utils mxf_page_file.c,1.4,1.5

[Philip de N. <ph...@us...>]

Update of /cvsroot/ingex/ingex/libMXF/lib/utils
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3074/lib/utils

Modified Files:
	mxf_page_file.c 
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: mxf_page_file.c
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/lib/utils/mxf_page_file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mxf_page_file.c	22 Oct 2008 09:32:19 -0000	1.4
--- mxf_page_file.c	7 Nov 2008 14:12:59 -0000	1.5
***************
*** 200,204 ****
      if (page->wasRemoved)
      {
!         mxf_log(MXF_WLOG, "Failed to open mxf page file which was removed after truncation\n");
          return 0;
      }
--- 200,204 ----
      if (page->wasRemoved)
      {
!         mxf_log_warn("Failed to open mxf page file which was removed after truncation\n");
          return 0;
      }
***************
*** 321,325 ****
  #endif
      {
!         mxf_log(MXF_ELOG, "Failed to open paged mxf file '%s': %s\n", filename, strerror(errno));
          return 0;
      }
--- 321,325 ----
  #endif
      {
!         mxf_log_error("Failed to open paged mxf file '%s': %s\n", filename, strerror(errno));
          return 0;
      }
***************
*** 705,709 ****
      if (strstr(filenameTemplate, "%d") == NULL)
      {
!         mxf_log(MXF_ELOG, "Filename template '%s' doesn't contain %%d\n", filenameTemplate);
          return 0;
      }
--- 705,709 ----
      if (strstr(filenameTemplate, "%d") == NULL)
      {
!         mxf_log_error("Filename template '%s' doesn't contain %%d\n", filenameTemplate);
          return 0;
      }
***************
*** 758,762 ****
      if (strstr(filenameTemplate, "%d") == NULL)
      {
!         mxf_log(MXF_ELOG, "Filename template '%s' doesn't contain %%d\n", filenameTemplate);
          return 0;
      }
--- 758,762 ----
      if (strstr(filenameTemplate, "%d") == NULL)
      {
!         mxf_log_error("Filename template '%s' doesn't contain %%d\n", filenameTemplate);
          return 0;
      }
***************
*** 812,816 ****
      if (stat(filename, &st) != 0)
      {
!         mxf_log(MXF_ELOG, "Failed to stat file '%s': %s\n", filename, strerror(errno));
          goto fail;
      }
--- 812,816 ----
      if (stat(filename, &st) != 0)
      {
!         mxf_log_error("Failed to stat file '%s': %s\n", filename, strerror(errno));
          goto fail;
      }
***************
*** 833,837 ****
      if (stat(filename, &st) != 0)
      {
!         mxf_log(MXF_ELOG, "Failed to stat file '%s': %s\n", filename, strerror(errno));
          goto fail;
      }
--- 833,837 ----
      if (stat(filename, &st) != 0)
      {
!         mxf_log_error("Failed to stat file '%s': %s\n", filename, strerror(errno));
          goto fail;
      }
***************
*** 862,866 ****
      if (strstr(filenameTemplate, "%d") == NULL)
      {
!         mxf_log(MXF_ELOG, "Filename template '%s' doesn't contain %%d\n", filenameTemplate);
          return 0;
      }
--- 862,866 ----
      if (strstr(filenameTemplate, "%d") == NULL)
      {
!         mxf_log_error("Filename template '%s' doesn't contain %%d\n", filenameTemplate);
          return 0;
      }
***************
*** 892,901 ****
          if (fileSize < 0)
          {
!             mxf_log(MXF_ELOG, "Failed to stat file '%s': %s\n", filename, strerror(errno));
              return 0;
          }
          if (pageSize != fileSize)
          {
!             mxf_log(MXF_ELOG, "Size of first file '%s' (%"PFi64" does not equal page size %"PFi64"\n", filename, fileSize, pageSize);
              return 0;
          }
--- 892,901 ----
          if (fileSize < 0)
          {
!             mxf_log_error("Failed to stat file '%s': %s\n", filename, strerror(errno));
              return 0;
          }
          if (pageSize != fileSize)
          {
!             mxf_log_error("Size of first file '%s' (%"PFi64" does not equal page size %"PFi64"\n", filename, fileSize, pageSize);
              return 0;
          }
***************
*** 946,950 ****
      if (fileSize < 0)
      {
!         mxf_log(MXF_ELOG, "Failed to stat file '%s': %s\n", filename, strerror(errno));
          goto fail;
      }
--- 946,950 ----
      if (fileSize < 0)
      {
!         mxf_log_error("Failed to stat file '%s': %s\n", filename, strerror(errno));
          goto fail;
      }
***************
*** 990,994 ****
      if (sysData->mode == READ_MODE)
      {
!         mxf_log(MXF_ELOG, "Cannot forward truncate read-only mxf page file\n");
          return 0;
      }
--- 990,994 ----
      if (sysData->mode == READ_MODE)
      {
!         mxf_log_error("Cannot forward truncate read-only mxf page file\n");
          return 0;
      }
***************
*** 1042,1046 ****
  #endif
          {
!             mxf_log(MXF_WLOG, "Failed to truncate '%s' to zero length: %s\n", filename, strerror(errno));
          }
          sysData->pages[i].wasRemoved = 1;
--- 1042,1046 ----
  #endif
          {
!             mxf_log_warn("Failed to truncate '%s' to zero length: %s\n", filename, strerror(errno));
          }
          sysData->pages[i].wasRemoved = 1;