[ingex-commits] ingex/libMXF/lib/mxf mxf_data_model.c, 1.5, 1.6 mxf_file.c, 1.6, 1.7 mxf_partition.c, 1.5, 1.6 mxf_primer.c, 1.3, 1.4 mxf_utils.c, 1.4, 1.5

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

Update of /cvsroot/ingex/ingex/libMXF/lib/mxf
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30295/lib/mxf

Modified Files:
	mxf_data_model.c mxf_file.c mxf_partition.c mxf_primer.c 
	mxf_utils.c 
Log Message:
- Create -18dbFS 1kHz test tone to make archive sample files better for testing
- Declare function parameters as const when data is not modified
- Fix archive file format by writing label signalling v210 coding for
10-bit uncompressed picture data to the
GenericPictureEssenceDescriptor::PictureEssenceCoding property rather
than to the FileDescriptor::Codec property
- Added transfer characteristic and system item package metadata keys for D10
- Removed semi-colon from ends of MXF_TRACK_NUM defines to allow use as a
function parameter
Patches provided by Rob Lievaart
 - Fix bug where parameters passed to MSVC gmtime_s were the wrong way round
 - Remove unused variable in mxf_get_timestamp_now
 - Added some explicit casts to avoid MSVC warnings
 - Replaced while(1) with for(;;) to stop MSVC warnings
 - Disabled MSVC warning about assignment in conditional in


Index: mxf_primer.c
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/lib/mxf/mxf_primer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mxf_primer.c	7 Nov 2008 14:12:59 -0000	1.3
--- mxf_primer.c	12 Feb 2010 13:46:27 -0000	1.4
***************
*** 199,203 ****
      mxfLocalTag tag;
      
!     while (1)
      {
          tag = primerPack->nextTag--;
--- 199,203 ----
      mxfLocalTag tag;
      
!     for(;;)
      {
          tag = primerPack->nextTag--;

Index: mxf_utils.c
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/lib/mxf/mxf_utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mxf_utils.c	26 Oct 2007 15:15:52 -0000	1.4
--- mxf_utils.c	12 Feb 2010 13:46:27 -0000	1.5
***************
*** 149,153 ****
      struct _timeb tb;
      struct tm gmt;
-     struct tm* gmtPtr = NULL;
      
      memset(&gmt, 0, sizeof(struct tm));
--- 149,152 ----
***************
*** 157,168 ****
      
      /* using the secure (and reentrant) gmtime */
!     gmtime_s(&tb.time, &gmt);
  
!     now->year = gmt.tm_year + 1900;
!     now->month = gmt.tm_mon + 1;
!     now->day = gmt.tm_mday;
!     now->hour = gmt.tm_hour;
!     now->min = gmt.tm_min;
!     now->sec = gmt.tm_sec;
      now->qmsec = (uint8_t)(tb.millitm / 4 + 0.5); /* 1/250th second */
      
--- 156,167 ----
      
      /* using the secure (and reentrant) gmtime */
!     gmtime_s(&gmt, &tb.time);
  
!     now->year = (int16_t)gmt.tm_year + 1900;
!     now->month = (uint8_t)gmt.tm_mon + 1;
!     now->day = (uint8_t)gmt.tm_mday;
!     now->hour = (uint8_t)gmt.tm_hour;
!     now->min = (uint8_t)gmt.tm_min;
!     now->sec = (uint8_t)gmt.tm_sec;
      now->qmsec = (uint8_t)(tb.millitm / 4 + 0.5); /* 1/250th second */
      

Index: mxf_data_model.c
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/lib/mxf/mxf_data_model.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mxf_data_model.c	13 Oct 2009 09:21:52 -0000	1.5
--- mxf_data_model.c	12 Feb 2010 13:46:26 -0000	1.6
***************
*** 176,179 ****
--- 176,184 ----
  }
  
+ #if defined(_MSC_VER)
+ #pragma warning(push)
+ #pragma warning(disable:4706)
+ #endif
+ 
  
  #define MXF_BASIC_TYPE_DEF(id, name, size) \
***************
*** 200,204 ****
      
  
!     
  int mxf_load_data_model(MXFDataModel** dataModel)
  {
--- 205,209 ----
      
  
!  
  int mxf_load_data_model(MXFDataModel** dataModel)
  {
***************
*** 252,255 ****
--- 257,264 ----
  }
  
+ #if defined(_MSC_VER)
+ #pragma warning(pop)
+ #endif
+ 
  void mxf_free_data_model(MXFDataModel** dataModel)
  {

Index: mxf_partition.c
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/lib/mxf/mxf_partition.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mxf_partition.c	18 Sep 2009 14:37:27 -0000	1.5
--- mxf_partition.c	12 Feb 2010 13:46:27 -0000	1.6
***************
*** 709,713 ****
          if (byte == ((const uint8_t*)(&g_PartitionPackPrefix_key))[keyCompareByte])
          {
!             keyPtr[keyCompareByte++] = byte;
              if (keyCompareByte == 11)
              {
--- 709,713 ----
          if (byte == ((const uint8_t*)(&g_PartitionPackPrefix_key))[keyCompareByte])
          {
!             keyPtr[keyCompareByte++] = (uint8_t)byte;
              if (keyCompareByte == 11)
              {
***************
*** 736,740 ****
              return 0;
          }
!         keyPtr[keyCompareByte] = byte;
      }
      
--- 736,740 ----
              return 0;
          }
!         keyPtr[keyCompareByte] = (uint8_t)byte;
      }
      

Index: mxf_file.c
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/lib/mxf/mxf_file.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mxf_file.c	12 Oct 2009 15:25:57 -0000	1.6
--- mxf_file.c	12 Feb 2010 13:46:27 -0000	1.7
***************
*** 950,960 ****
      else 
      {
!         int bytesToRead = c & 0x7f;
          CHK_ORET(bytesToRead <= 8); 
          for (i = 0; i < bytesToRead; i++) 
          {
              CHK_ORET((c = mxf_file_getc(mxfFile)) != EOF); 
!             length = length << 8;
!             length = length | c;
          }
          llength += bytesToRead;
--- 950,960 ----
      else 
      {
!         uint8_t bytesToRead = ((uint8_t)c) & 0x7f;
          CHK_ORET(bytesToRead <= 8); 
          for (i = 0; i < bytesToRead; i++) 
          {
              CHK_ORET((c = mxf_file_getc(mxfFile)) != EOF); 
!             length <<= 8;
!             length |= (uint8_t)c;
          }
          llength += bytesToRead;