Extract VideoEncoder as a parent of J2KEncoder.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index ce36832bebe13174f833c7b52b6f183a0df7c8d3..152d3abafb89e716a48ad743740134b21c10a701 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -59,6 +59,7 @@ sources = """
           content_factory.cc
           combine_dcp_job.cc
           copy_dcp_details_to_film.cc
+          cpu_j2k_encoder_thread.cc
           create_cli.cc
           crop.cc
           cross_common.cc
@@ -67,9 +68,9 @@ sources = """
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
-          dcp_encoder.cc
           dcp_examiner.cc
           dcp_digest_file.cc
+          dcp_film_encoder.cc
           dcp_subtitle.cc
           dcp_subtitle_content.cc
           dcp_subtitle_decoder.cc
@@ -86,9 +87,8 @@ sources = """
           dkdm_recipient.cc
           dkdm_wrapper.cc
           dolby_cp750.cc
-          emailer.cc
+          email.cc
           empty.cc
-          encoder.cc
           encode_server.cc
           encode_server_finder.cc
           encoded_log_entry.cc
@@ -106,14 +106,15 @@ sources = """
           ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
-          ffmpeg_encoder.cc
           ffmpeg_examiner.cc
           ffmpeg_file_encoder.cc
+          ffmpeg_film_encoder.cc
           ffmpeg_image_proxy.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
           ffmpeg_wrapper.cc
           film.cc
+          film_encoder.cc
           film_util.cc
           filter.cc
           font.cc
@@ -138,6 +139,8 @@ sources = """
           job.cc
           job_manager.cc
           j2k_encoder.cc
+          j2k_encoder_thread.cc
+          j2k_sync_encoder_thread.cc
           json_server.cc
           kdm_cli.cc
           kdm_recipient.cc
@@ -163,6 +166,7 @@ sources = """
           referenced_reel_asset.cc
           release_notes.cc
           render_text.cc
+          remote_j2k_encoder_thread.cc
           resampler.cc
           resolution.cc
           rgba.cc
@@ -183,7 +187,7 @@ sources = """
           string_text_file_content.cc
           string_text_file_decoder.cc
           subtitle_analysis.cc
-          subtitle_encoder.cc
+          subtitle_film_encoder.cc
           territory_type.cc
           text_ring_buffers.cc
           text_type.cc
@@ -194,6 +198,7 @@ sources = """
           rough_duration.cc
           signal_manager.cc
           stdout_log.cc
+          unzipper.cc
           update_checker.cc
           upload_job.cc
           uploader.cc
@@ -201,9 +206,11 @@ sources = """
           upmixer_b.cc
           usl.cc
           util.cc
+          variant.cc
           verify_dcp_job.cc
           video_content.cc
           video_decoder.cc
+          video_encoder.cc
           video_filter_graph.cc
           video_filter_graph_set.cc
           video_frame_type.cc
@@ -227,8 +234,9 @@ def build(bld):
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
-                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
+                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB XML++
                  CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT
+                 LIBZ
                  """
 
     if bld.env.TARGET_OSX:
@@ -242,6 +250,9 @@ def build(bld):
         if bld.env.TARGET_LINUX:
             obj.uselib += ' POLKIT'
 
+    if bld.env.ENABLE_GROK:
+        obj.source += ' grok_j2k_encoder_thread.cc'
+
     if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI OLE32 UUID'
         obj.source += ' cross_windows.cc'