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, 3 insertions, 13 deletions

diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index 8b05dc7..675f96d 100755
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -134,25 +134,15 @@ namespace ASDCP
   Result_t EncryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESEncContext*);
   Result_t DecryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESDecContext*);
 
-  Result_t MD_to_JP2K_PDesc(const ASDCP::MXF::RGBAEssenceDescriptor&  EssenceDescriptor,
+  Result_t MD_to_JP2K_PDesc(const ASDCP::MXF::GenericPictureEssenceDescriptor&  EssenceDescriptor,
 			    const ASDCP::MXF::JPEG2000PictureSubDescriptor& EssenceSubDescriptor,
 			    const ASDCP::Rational& EditRate, const ASDCP::Rational& SampleRate,
 			    ASDCP::JP2K::PictureDescriptor& PDesc);
 
   Result_t JP2K_PDesc_to_MD(const JP2K::PictureDescriptor& PDesc,
 			    const ASDCP::Dictionary& dict,
-			    ASDCP::MXF::RGBAEssenceDescriptor *EssenceDescriptor,
-			    ASDCP::MXF::JPEG2000PictureSubDescriptor *EssenceSubDescriptor);
-
-  Result_t MD_to_JP2K_PDesc(const ASDCP::MXF::CDCIEssenceDescriptor&  EssenceDescriptor,
-			    const ASDCP::MXF::JPEG2000PictureSubDescriptor& EssenceSubDescriptor,
-			    const ASDCP::Rational& EditRate, const ASDCP::Rational& SampleRate,
-			    ASDCP::JP2K::PictureDescriptor& PDesc);
-
-  Result_t JP2K_PDesc_to_MD(const JP2K::PictureDescriptor& PDesc,
-			    const ASDCP::Dictionary& dict,
-			    ASDCP::MXF::CDCIEssenceDescriptor *EssenceDescriptor,
-			    ASDCP::MXF::JPEG2000PictureSubDescriptor *EssenceSubDescriptor);
+			    ASDCP::MXF::GenericPictureEssenceDescriptor& EssenceDescriptor,
+			    ASDCP::MXF::JPEG2000PictureSubDescriptor& EssenceSubDescriptor);
 
   Result_t PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, ASDCP::MXF::WaveAudioDescriptor* ADescObj);
   Result_t MD_to_PCM_ADesc(ASDCP::MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc);