diff options
| author | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2021-06-25 15:00:37 +0200 |
|---|---|---|
| committer | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2021-06-25 15:00:37 +0200 |
| commit | a62423a866d9348a2d9a97337e01b995497a4e05 (patch) | |
| tree | 10c939c5222b4deb81b32b4e24f1fe5b326a1158 /src/AS_DCP_MXF.cpp | |
| parent | 7e3380f5eb9c9441c26646415be3ffec4d01b2c0 (diff) | |
Updated to John's latest branch.
Diffstat (limited to 'src/AS_DCP_MXF.cpp')
| -rwxr-xr-x | src/AS_DCP_MXF.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp index 3ee13c9..9cb4c15 100755 --- a/src/AS_DCP_MXF.cpp +++ b/src/AS_DCP_MXF.cpp @@ -33,7 +33,6 @@ 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" @@ -196,10 +195,6 @@ ASDCP::EssenceType(const std::string& filename, EssenceType_t& type) type = ESS_JPEG_2000; } } - else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(JPEGXSPictureSubDescriptor))) ) - { - type = ESS_JPEG_XS; - } else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor), &md_object)) ) { assert(md_object); @@ -253,10 +248,6 @@ ASDCP::EssenceType(const std::string& filename, EssenceType_t& type) { type = ESS_AS02_JPEG_2000; } - else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(JPEGXSPictureSubDescriptor))) ) - { - type = ESS_AS02_JPEG_XS; - } else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor), &md_object)) ) { assert(md_object); @@ -353,10 +344,6 @@ 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; @@ -437,10 +424,6 @@ 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; |