[ingex-commits] ingex/libMXF/lib/include/mxf mxf_labels_and_keys.h, 1.9, 1.10

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

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

Modified Files:
	mxf_labels_and_keys.h 
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_labels_and_keys.h
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/lib/include/mxf/mxf_labels_and_keys.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mxf_labels_and_keys.h	17 Dec 2009 16:20:57 -0000	1.9
--- mxf_labels_and_keys.h	12 Feb 2010 13:46:26 -0000	1.10
***************
*** 490,494 ****
  
  #define MXF_AES3BWF_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x16, elecount, eletype, elenum);
      
  #define MXF_BWF_FRAME_WRAPPED_EE_TYPE       0x01
--- 490,494 ----
  
  #define MXF_AES3BWF_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x16, elecount, eletype, elenum)
      
  #define MXF_BWF_FRAME_WRAPPED_EE_TYPE       0x01
***************
*** 506,510 ****
      
  #define MXF_DV_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x18, elecount, eletype, elenum);
      
  #define MXF_DV_FRAME_WRAPPED_EE_TYPE        0x01
--- 506,510 ----
      
  #define MXF_DV_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x18, elecount, eletype, elenum)
      
  #define MXF_DV_FRAME_WRAPPED_EE_TYPE        0x01
***************
*** 518,522 ****
      
  #define MXF_UNC_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x15, elecount, eletype, elenum);
      
  #define MXF_UNC_FRAME_WRAPPED_EE_TYPE       0x02
--- 518,522 ----
      
  #define MXF_UNC_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x15, elecount, eletype, elenum)
      
  #define MXF_UNC_FRAME_WRAPPED_EE_TYPE       0x02
***************
*** 543,546 ****
--- 543,550 ----
      {0x06, 0x0e, 0x2b, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0d, 0x01, 0x03, 0x01, 0x04, 0x01, 0x01, 0x00};
  
+ #define MXF_SDTI_CP_PACKAGE_METADATA_KEY(elecount) \
+     {0x06, 0x0e, 0x2b, 0x34, 0x02, 0x43, 0x01, 0x01, 0x0d, 0x01, 0x03, 0x01, 0x04, 0x01, 0x02, elecount}
+ 
+     
  
  /* D-10 mappings */
***************
*** 550,554 ****
      
  #define MXF_D10_PICTURE_TRACK_NUM(elenum) \
!     MXF_TRACK_NUM(0x05, 0x01, 0x01, elenum);
      
  #define MXF_D10_SOUND_EE_K(elenum) \
--- 554,558 ----
      
  #define MXF_D10_PICTURE_TRACK_NUM(elenum) \
!     MXF_TRACK_NUM(0x05, 0x01, 0x01, elenum)
      
  #define MXF_D10_SOUND_EE_K(elenum) \
***************
*** 556,560 ****
      
  #define MXF_D10_SOUND_TRACK_NUM(elenum) \
!     MXF_TRACK_NUM(0x06, 0x01, 0x10, elenum);
      
  #define MXF_D10_AUX_EE_K(elecount, eletype, elenum) \
--- 560,564 ----
      
  #define MXF_D10_SOUND_TRACK_NUM(elenum) \
!     MXF_TRACK_NUM(0x06, 0x01, 0x10, elenum)
      
  #define MXF_D10_AUX_EE_K(elecount, eletype, elenum) \
***************
*** 562,566 ****
      
  #define MXF_D10_AUX_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x07, elecount, eletype, elenum);
      
  
--- 566,570 ----
      
  #define MXF_D10_AUX_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x07, elecount, eletype, elenum)
      
  
***************
*** 571,575 ****
  
  #define MXF_ALAW_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x16, elecount, eletype, elenum);
      
  #define MXF_ALAW_FRAME_WRAPPED_EE_TYPE      0x08
--- 575,579 ----
  
  #define MXF_ALAW_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x16, elecount, eletype, elenum)
      
  #define MXF_ALAW_FRAME_WRAPPED_EE_TYPE      0x08
***************
*** 584,588 ****
  
  #define MXF_MPEG_PICT_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x15, elecount, eletype, elenum);
      
  #define MXF_MPEG_PICT_FRAME_WRAPPED_EE_TYPE      0x05
--- 588,592 ----
  
  #define MXF_MPEG_PICT_TRACK_NUM(elecount, eletype, elenum) \
!     MXF_TRACK_NUM(0x15, elecount, eletype, elenum)
      
  #define MXF_MPEG_PICT_FRAME_WRAPPED_EE_TYPE      0x05
***************
*** 752,755 ****
--- 756,766 ----
  
  
+ /* Transfer characteristic labels (Gamma) */
+ 
+ static const mxfUL ITUR_BT470_TRANSFER_CH =
+     {0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00};
+ 
+ 
+ 
  #ifdef __cplusplus
  }