diff options
| author | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2021-05-28 13:33:19 +0200 |
|---|---|---|
| committer | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2021-05-28 13:33:19 +0200 |
| commit | a542b262538a782d379fb3943a226dd7b11f04a2 (patch) | |
| tree | 0cc8ec06c7b57235cc1153e58500eafb9d2cba23 | |
| parent | d1f386db72b5374b11c9df061a5ff2e6e8adc610 (diff) | |
Made availability of jxs wrapping in as-02-wrap conditional on configure options.
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rwxr-xr-x | src/as-02-wrap.cpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 179bf05..00a784f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -144,6 +144,7 @@ endif if USE_ASDCP_JXS libasdcp_la_SOURCES += JXS_Codestream_Parser.cpp JXS_Sequence_Parser.cpp JXS.cpp AS_DCP_JXS.cpp +AM_CPPFLAGS += -DUSE_ASDCP_JXS endif libasdcp_la_LDFLAGS = -release @VERSION@ diff --git a/src/as-02-wrap.cpp b/src/as-02-wrap.cpp index b457716..1703394 100755 --- a/src/as-02-wrap.cpp +++ b/src/as-02-wrap.cpp @@ -39,7 +39,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <KM_xml.h> #include <KM_prng.h> #include <AS_02.h> +#ifdef USE_ASDCP_JXS #include "AS_02_JXS.h" +#endif #include "AS_02_ACES.h" #include <PCMParserList.h> #include <Metadata.h> @@ -1181,6 +1183,7 @@ write_JP2K_file(CommandOptions& Options) //------------------------------------------------------------------------------------------ // JPEG XS essence +#ifdef USE_ASDCP_JXS namespace ASDCP { Result_t JXS_PDesc_to_MD(const ASDCP::JXS::PictureDescriptor& PDesc, @@ -1391,6 +1394,7 @@ write_JXS_file(CommandOptions& Options) return result; } +#endif //------------------------------------------------------------------------------------------ // ACES essence @@ -2198,9 +2202,11 @@ main(int argc, const char** argv) result = write_JP2K_file(Options); break; // PB +#ifdef USE_ASDCP_JXS case ESS_JPEG_XS: result = write_JXS_file(Options); break; +#endif case ::ESS_AS02_ACES: result = write_ACES_file(Options); break; |