From d1f386db72b5374b11c9df061a5ff2e6e8adc610 Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Fri, 28 May 2021 12:43:29 +0200 Subject: Added a first version of JXS support for as-02-wrap. Added recognition of JXS files in AS_DCP_MXF. In case color specifications are missing from the original picture descriptor, JXS_PDesc_to_MD() no longer fails, it just does not fill in the Essence descriptor and leaves that to the caller, e.g. as-02-wrap. --- src/AS_DCP_MXF.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/AS_DCP_MXF.cpp') diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp index 9cb4c15..7231b5a 100755 --- a/src/AS_DCP_MXF.cpp +++ b/src/AS_DCP_MXF.cpp @@ -33,6 +33,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "AS_DCP_internal.h" #include "JP2K.h" +#include "JXS.h" #include "ACES.h" #include "MPEG.h" #include "Wav.h" @@ -344,6 +345,10 @@ ASDCP::RawEssenceType(const std::string& filename, EssenceType_t& type) { type = ESS_JPEG_2000; } + else if ( memcmp(FB.RoData(), ASDCP::JXS::Magic, sizeof(ASDCP::JXS::Magic)) == 0 ) + { + type = ESS_JPEG_XS; + } else if(memcmp(FB.RoData(), AS_02::ACES::Magic, sizeof(AS_02::ACES::Magic)) == 0) { type = ESS_AS02_ACES; @@ -424,6 +429,10 @@ ASDCP::RawEssenceType(const std::string& filename, EssenceType_t& type) { type = ESS_JPEG_2000; } + else if ( memcmp(FB.RoData(), ASDCP::JXS::Magic, sizeof(ASDCP::JXS::Magic)) == 0 ) + { + type = ESS_JPEG_XS; + } else if(memcmp(FB.RoData(), AS_02::ACES::Magic, sizeof(AS_02::ACES::Magic)) == 0) { type = ESS_AS02_ACES; -- cgit v1.2.3