o Added preliminary support for timed-text wrapping for AS-02. This

    work will require changes in SMPTE ST 429-5 and perhaps other
    standards work, so files created with this implementation are
    "speculative".  Publication of the revised ST 429-5 may not occur
    until early 2015.
  o Moved LocalFilenameResolver into the AS_DCP public API so that it
    can be used by other modules including AS-02.
  o Fixed wave wrapping UL in clip-wrapped AS-02 files.  Renamed some
    UL constants to reflect "clip" or "frame" wrapping.
  o Re-factored JP2K_PDesc_to_MD() and MD_to_JP2K_PDesc() to work
    with GenericPictureEssenceDescriptor objects.
  o Fixed a bug that was suppressing PictureComponentSizing,
    CodingStyleDefault and QuantizationDefault when writing the
    essence descriptor in a JP2K file (AS-DCP and AS-02).
  o Fixed the version byte on the following UL values:
    	  StereoscopicPictureSubDescriptor
	  GenericPictureEssenceDescriptor_ColorPrimaries
	  GenericPictureEssenceDescriptor_ActiveHeight
	  GenericPictureEssenceDescriptor_ActiveWidth
	  GenericPictureEssenceDescriptor_ActiveXOffset
	  GenericPictureEssenceDescriptor_ActiveYOffset
  o Added some essence descriptor options to as-02-wrap.
  o Added TTML timed-text wrapping option to as-02-wrap.
  o Changed bit rate display in asdcp-info from mebi-bits/s to
    mega-bits/s.
  o Added "SMPTE" / "Interop" format type display to asdcp-info.
  o Modified asdcp-wrap to assume -L when wrapping timed-text (since
    there is no MXF text wrapping for Interop.)
  o Fixed missing-index-partion bugs for AS-02 files.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/asdcp-info.cpp b/src/asdcp-info.cpp
index 4a03bde..df69d2b 100755
--- a/src/asdcp-info.cpp
+++ b/src/asdcp-info.cpp
@@ -93,7 +93,7 @@ USAGE:%s [-h|-help] [-V]\n\
 \n\
 Options:\n\
   -3          - Force stereoscopic interpretation of a JP2K file\n\
-  -C          - Do not show essence coding UL\n\
+  -c          - Show essence coding UL\n\
   -d          - Show essence descriptor info\n\
   -h | -help  - Show help\n\
   -H          - Show MXF header metadata\n\
@@ -326,7 +326,8 @@ public:
 	m_Desc.FillDescriptor(m_Reader);
 	m_Reader.FillWriterInfo(m_WriterInfo);
 
-	fprintf(stdout, "File essence type is %s, (%d edit unit%s).\n",
+	fprintf(stdout, "%s file essence type is %s, (%d edit unit%s).\n",
+		( m_WriterInfo.LabelSetType == LS_MXF_SMPTE ? "SMPTE 429" : LS_MXF_INTEROP ? "Interop" : "Unknown" ),
 		type_string, m_Desc.ContainerDuration, (m_Desc.ContainerDuration==1?"":"s"));
 
 	if ( Options.showheader_flag )
@@ -488,7 +489,7 @@ public:
       }
 
     // scale bytes to megabits
-    static const double mega_const = 1 / ( 1024.0 * 1024.0 / 8.0 );
+    static const double mega_const = 1.0 / ( 1000000 / 8.0 );
 
     // we did not accumulate the first or last frame, so duration -= 2
     double avg_bytes_frame = total_frame_bytes / ( m_Desc.ContainerDuration - 2 );