[ingex-commits] ingex/player/ingex_player mxf_source.c,1.32,1.33

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/ingex/ingex/player/ingex_player
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7937

Modified Files:
	mxf_source.c 
Log Message:
player: enable support for various mxf unc frame rates


Index: mxf_source.c
===================================================================
RCS file: /cvsroot/ingex/ingex/player/ingex_player/mxf_source.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** mxf_source.c	30 Jul 2012 10:51:33 -0000	1.32
--- mxf_source.c	11 Apr 2013 14:16:13 -0000	1.33
***************
*** 1288,1307 ****
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994i_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994i_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_25p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_25p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_2997p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_2997p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_50p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_50p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_25p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_25p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_2997p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_2997p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_50p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_50p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_5994p_422_FrameWrapped)) ||
!                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_5994p_422_ClipWrapped)))
              {
                  CHK_OFAIL(track->video.componentDepth == 8 || track->video.componentDepth == 10);
--- 1288,1317 ----
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994i_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994i_422_ClipWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_60i_422_FrameWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_60i_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_25p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_25p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_2997p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_2997p_422_ClipWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_30p_422_FrameWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_30p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_50p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_50p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_5994p_422_ClipWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_60p_422_FrameWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_1080_60p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_25p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_25p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_2997p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_2997p_422_ClipWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_30p_422_FrameWrapped)) ||
+                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_30p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_50p_422_FrameWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_50p_422_ClipWrapped)) ||
                  mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_5994p_422_FrameWrapped)) ||
!                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_5994p_422_ClipWrapped)) ||
!                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_60p_422_FrameWrapped)) ||
!                 mxf_equals_ul(&track->essenceContainerLabel, &MXF_EC_L(HD_Unc_720_60p_422_ClipWrapped)))
              {
                  CHK_OFAIL(track->video.componentDepth == 8 || track->video.componentDepth == 10);