X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=c1d1041ae539f9cdab1f087291eb2d8d7104abbb;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=2a8d8cc164dfaa333bfb18b56a6f8054328542fb;hpb=6bc12a2eeb9c84a539688f2f7eb876e3ea278a9f;p=dcpomatic.git

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 2a8d8cc16..c1d1041ae 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -38,6 +38,7 @@
 #include "cross.h"
 #include "writer.h"
 #include "player.h"
+#include "audio_mapping.h"
 
 #include "i18n.h"
 
@@ -48,7 +49,8 @@ using std::vector;
 using std::list;
 using std::cout;
 using std::make_pair;
-using namespace boost;
+using boost::shared_ptr;
+using boost::optional;
 
 int const Encoder::_history_size = 25;
 
@@ -84,13 +86,20 @@ Encoder::process_begin ()
 		s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_frame_rate(), _film->target_audio_sample_rate());
 		_film->log()->log (s.str ());
 
-		/* We will be using planar float data when we call the resampler */
+		/* We will be using planar float data when we call the
+		   resampler.  As far as I can see, the audio channel
+		   layout is not necessary for our purposes; it seems
+		   only to be used get the number of channels and
+		   decide if rematrixing is needed.  It won't be, since
+		   input and output layouts are the same.
+		*/
+
 		_swr_context = swr_alloc_set_opts (
 			0,
-			_film->audio_channel_layout(),
+			av_get_default_channel_layout (_film->audio_mapping().dcp_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_film->target_audio_sample_rate(),
-			_film->audio_channel_layout(),
+			av_get_default_channel_layout (_film->audio_mapping().dcp_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_film->audio_frame_rate(),
 			0, 0
@@ -126,9 +135,9 @@ void
 Encoder::process_end ()
 {
 #if HAVE_SWRESAMPLE	
-	if (_film->has_audio() && _film->audio_channels() && _swr_context) {
+	if (_film->has_audio() && _swr_context) {
 
-		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_channels(), 256));
+		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_mapping().dcp_channels(), 256));
 			
 		while (1) {
 			int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
@@ -142,7 +151,7 @@ Encoder::process_end ()
 			}
 
 			out->set_frames (frames);
-			write_audio (out);
+			_writer->write (out);
 		}
 
 		swr_free (&_swr_context);
@@ -231,7 +240,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
+Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub)
 {
 	FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
 	
@@ -269,7 +278,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 		TIMING ("adding to queue of %1", _queue.size ());
-		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
+		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
@@ -294,7 +303,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 }
 
 void
-Encoder::process_audio (shared_ptr<AudioBuffers> data)
+Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 {
 #if HAVE_SWRESAMPLE
 	/* Maybe sample-rate convert */
@@ -303,7 +312,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 		/* Compute the resampled frames count and add 32 for luck */
 		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _film->audio_frame_rate()) + 32;
 
-		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_channels(), max_resampled_frames));
+		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_mapping().dcp_channels(), max_resampled_frames));
 
 		/* Resample audio */
 		int const resampled_frames = swr_convert (
@@ -321,7 +330,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 	}
 #endif
 
-	write_audio (data);
+	_writer->write (data);
 }
 
 void
@@ -333,7 +342,9 @@ Encoder::terminate_threads ()
 	lock.unlock ();
 
 	for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
-		(*i)->join ();
+		if ((*i)->joinable ()) {
+			(*i)->join ();
+		}
 		delete *i;
 	}
 }
@@ -360,7 +371,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
-		boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
+		shared_ptr<DCPVideoFrame> vf = _queue.front ();
 		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
 		_queue.pop_front ();
 		
@@ -414,34 +425,10 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (remote_backoff > 0) {
-			dvdomatic_sleep (remote_backoff);
+			dcpomatic_sleep (remote_backoff);
 		}
 
 		lock.lock ();
 		_condition.notify_all ();
 	}
 }
-
-void
-Encoder::write_audio (shared_ptr<const AudioBuffers> data)
-{
-	AudioMapping m (_film->audio_channels ());
-	if (m.dcp_channels() != _film->audio_channels()) {
-
-		/* Remap (currently just for mono -> 5.1) */
-
-		shared_ptr<AudioBuffers> b (new AudioBuffers (m.dcp_channels(), data->frames ()));
-		for (int i = 0; i < m.dcp_channels(); ++i) {
-			optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (i));
-			if (!s) {
-				b->make_silent (i);
-			} else {
-				memcpy (b->data()[i], data->data()[s.get()], data->frames() * sizeof(float));
-			}
-		}
-
-		data = b;
-	}
-
-	_writer->write (data);
-}