[ingex-commits] ingex/libMXF/examples/avidmxfinfo avid_mxf_info.c, 1.5, 1.6

[Stuart C. <stu...@us...>]

Update of /cvsroot/ingex/ingex/libMXF/examples/avidmxfinfo
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8297/examples/avidmxfinfo

Modified Files:
	avid_mxf_info.c 
Log Message:
Add support for writing NTSC JPEG (all supported variants) and IMX mxf files.
Add support for reading NTSC JPEG formats.  Cleanup JPEG reading code by
using values read from descriptor instead of hardcoded values based on ResID.
Add NTSC labels for all supported JPEG and IMX formats.  This necessitated
replacing e.g. AvidIMX50 with the more specific AvidIMX50_625_50 label.


Index: avid_mxf_info.c
===================================================================
RCS file: /cvsroot/ingex/ingex/libMXF/examples/avidmxfinfo/avid_mxf_info.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** avid_mxf_info.c	7 Nov 2008 14:12:59 -0000	1.5
--- avid_mxf_info.c	29 Jan 2009 07:21:42 -0000	1.6
***************
*** 991,1015 ****
          else
          {
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG21)))
              {
                  info->essenceType = MJPEG_2_1_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG31)))
              {
                  info->essenceType = MJPEG_3_1_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG101)))
              {
                  info->essenceType = MJPEG_10_1_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG101m)))
              {
                  info->essenceType = MJPEG_10_1_M_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG151s)))
              {
                  info->essenceType = MJPEG_15_1_S_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG201)))
              {
                  info->essenceType = MJPEG_20_1_ESSENCE_TYPE;
--- 991,1021 ----
          else
          {
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG21_PAL)) ||
!                 mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG21_NTSC)))
              {
                  info->essenceType = MJPEG_2_1_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG31_PAL)) ||
!                 mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG31_NTSC)))
              {
                  info->essenceType = MJPEG_3_1_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG101_PAL)) ||
!                 mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG101_NTSC)))
              {
                  info->essenceType = MJPEG_10_1_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG101m_PAL)) ||
!                 mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG101m_NTSC)))
              {
                  info->essenceType = MJPEG_10_1_M_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG151s_PAL)) ||
!                 mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG151s_NTSC)))
              {
                  info->essenceType = MJPEG_15_1_S_ESSENCE_TYPE;
              }
!             if (mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG201_PAL)) ||
!                 mxf_equals_ul(&pictureEssenceCoding, &MXF_CMDEF_L(AvidMJPEG201_NTSC)))
              {
                  info->essenceType = MJPEG_20_1_ESSENCE_TYPE;