diff options
| author | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2021-05-28 12:43:29 +0200 |
|---|---|---|
| committer | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2021-05-28 12:43:29 +0200 |
| commit | d1f386db72b5374b11c9df061a5ff2e6e8adc610 (patch) | |
| tree | 8a010d36b349fcd790fceeacbea5ca5306ccd8fb /src/AS_DCP_MXF.cpp | |
| parent | f9d7fbc33aa571c547d916b145712469efd9f4b8 (diff) | |
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.
Diffstat (limited to 'src/AS_DCP_MXF.cpp')
| -rwxr-xr-x | src/AS_DCP_MXF.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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 <KM_xml.h> #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; |