From 54a9c84e2b4d69b1e6ed669400f84b1604cc2369 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Dec 2012 20:42:41 +0000 Subject: Move audio into Encoder so that J2KStillEncoder can use it too. Rename J2KWAVEncoder -> J2KVideoEncoder. --- src/lib/ab_transcode_job.cc | 1 - src/lib/encoder.cc | 152 ++++++++++++++++- src/lib/encoder.h | 26 ++- src/lib/encoder_factory.cc | 4 +- src/lib/j2k_still_encoder.h | 1 - src/lib/j2k_video_encoder.cc | 259 ++++++++++++++++++++++++++++ src/lib/j2k_video_encoder.h | 61 +++++++ src/lib/j2k_wav_encoder.cc | 394 ------------------------------------------- src/lib/j2k_wav_encoder.h | 78 --------- src/lib/transcode_job.cc | 2 +- src/lib/wscript | 2 +- 11 files changed, 495 insertions(+), 485 deletions(-) create mode 100644 src/lib/j2k_video_encoder.cc create mode 100644 src/lib/j2k_video_encoder.h delete mode 100644 src/lib/j2k_wav_encoder.cc delete mode 100644 src/lib/j2k_wav_encoder.h (limited to 'src/lib') diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc index b9538ce2e..da9ce7933 100644 --- a/src/lib/ab_transcode_job.cc +++ b/src/lib/ab_transcode_job.cc @@ -19,7 +19,6 @@ #include #include "ab_transcode_job.h" -#include "j2k_wav_encoder.h" #include "film.h" #include "format.h" #include "filter.h" diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 1fc7d5997..f352f5a52 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -21,11 +21,17 @@ * @brief Parent class for classes which can encode video and audio frames. */ +#include #include "encoder.h" #include "util.h" #include "options.h" +#include "film.h" +#include "log.h" +#include "exceptions.h" using std::pair; +using std::stringstream; +using std::vector; using namespace boost; int const Encoder::_history_size = 25; @@ -39,11 +45,109 @@ Encoder::Encoder (shared_ptr f, shared_ptr o) , _just_skipped (false) , _video_frame (0) , _audio_frame (0) +#ifdef HAVE_SWRESAMPLE + , _swr_context (0) +#endif + , _audio_frames_written (0) { + if (_film->audio_stream()) { + /* Create sound output files with .tmp suffixes; we will rename + them if and when we complete. + */ + for (int i = 0; i < _film->audio_channels(); ++i) { + SF_INFO sf_info; + sf_info.samplerate = dcp_audio_sample_rate (_film->audio_stream()->sample_rate()); + /* We write mono files */ + sf_info.channels = 1; + sf_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_24; + SNDFILE* f = sf_open (_opt->multichannel_audio_out_path (i, true).c_str (), SFM_WRITE, &sf_info); + if (f == 0) { + throw CreateFileError (_opt->multichannel_audio_out_path (i, true)); + } + _sound_files.push_back (f); + } + } +} + +Encoder::~Encoder () +{ + close_sound_files (); +} +void +Encoder::process_begin () +{ + if (_film->audio_stream() && _film->audio_stream()->sample_rate() != _film->target_audio_sample_rate()) { +#ifdef HAVE_SWRESAMPLE + + stringstream s; + s << "Will resample audio from " << _film->audio_stream()->sample_rate() << " to " << _film->target_audio_sample_rate(); + _film->log()->log (s.str ()); + + /* We will be using planar float data when we call the resampler */ + _swr_context = swr_alloc_set_opts ( + 0, + _film->audio_stream()->channel_layout(), + AV_SAMPLE_FMT_FLTP, + _film->target_audio_sample_rate(), + _film->audio_stream()->channel_layout(), + AV_SAMPLE_FMT_FLTP, + _film->audio_stream()->sample_rate(), + 0, 0 + ); + + swr_init (_swr_context); +#else + throw EncodeError ("Cannot resample audio as libswresample is not present"); +#endif + } else { +#ifdef HAVE_SWRESAMPLE + _swr_context = 0; +#endif + } } +void +Encoder::process_end () +{ +#if HAVE_SWRESAMPLE + if (_film->audio_stream() && _swr_context) { + + shared_ptr out (new AudioBuffers (_film->audio_stream()->channels(), 256)); + + while (1) { + int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0); + + if (frames < 0) { + throw EncodeError ("could not run sample-rate converter"); + } + + if (frames == 0) { + break; + } + + out->set_frames (frames); + write_audio (out); + } + + swr_free (&_swr_context); + } +#endif + + if (_film->audio_stream()) { + close_sound_files (); + + /* Rename .wav.tmp files to .wav */ + for (int i = 0; i < _film->audio_channels(); ++i) { + if (boost::filesystem::exists (_opt->multichannel_audio_out_path (i, false))) { + boost::filesystem::remove (_opt->multichannel_audio_out_path (i, false)); + } + boost::filesystem::rename (_opt->multichannel_audio_out_path (i, true), _opt->multichannel_audio_out_path (i, false)); + } + } +} + /** @return an estimate of the current number of frames we are encoding per second, * or 0 if not known. */ @@ -152,7 +256,53 @@ Encoder::process_audio (shared_ptr data) data = trimmed; } - do_process_audio (data); +#if HAVE_SWRESAMPLE + /* Maybe sample-rate convert */ + if (_swr_context) { + + /* 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_stream()->sample_rate()) + 32; + + shared_ptr resampled (new AudioBuffers (_film->audio_stream()->channels(), max_resampled_frames)); + + /* Resample audio */ + int const resampled_frames = swr_convert ( + _swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) data->data(), data->frames() + ); + + if (resampled_frames < 0) { + throw EncodeError ("could not run sample-rate converter"); + } + + resampled->set_frames (resampled_frames); + + /* And point our variables at the resampled audio */ + data = resampled; + } +#endif + write_audio (data); + _audio_frame += data->frames (); } + +void +Encoder::write_audio (shared_ptr audio) +{ + for (int i = 0; i < _film->audio_channels(); ++i) { + sf_write_float (_sound_files[i], audio->data(i), audio->frames()); + } + + _audio_frames_written += audio->frames (); +} + +void +Encoder::close_sound_files () +{ + for (vector::iterator i = _sound_files.begin(); i != _sound_files.end(); ++i) { + sf_close (*i); + } + + _sound_files.clear (); +} + diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 64f113d74..f355daff7 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -31,6 +31,12 @@ extern "C" { #include } +#ifdef HAVE_SWRESAMPLE +extern "C" { +#include +} +#endif +#include #include "util.h" #include "video_sink.h" #include "audio_sink.h" @@ -55,10 +61,10 @@ class Encoder : public VideoSink, public AudioSink { public: Encoder (boost::shared_ptr f, boost::shared_ptr o); - virtual ~Encoder () {} + virtual ~Encoder (); /** Called to indicate that a processing run is about to begin */ - virtual void process_begin () {} + virtual void process_begin (); /** Call with a frame of video. * @param i Video frame image. @@ -70,7 +76,7 @@ public: void process_audio (boost::shared_ptr); /** Called when a processing run has finished */ - virtual void process_end () {} + virtual void process_end (); float current_frames_per_second () const; bool skipping () const; @@ -84,9 +90,6 @@ protected: */ virtual void do_process_video (boost::shared_ptr i, boost::shared_ptr s) = 0; - /** Called with some audio data */ - virtual void do_process_audio (boost::shared_ptr) = 0; - void frame_done (); void frame_skipped (); @@ -110,6 +113,17 @@ protected: SourceFrame _video_frame; /** Number of audio frames received so far */ int64_t _audio_frame; + +private: + void close_sound_files (); + void write_audio (boost::shared_ptr audio); + +#if HAVE_SWRESAMPLE + SwrContext* _swr_context; +#endif + + std::vector _sound_files; + int64_t _audio_frames_written; }; #endif diff --git a/src/lib/encoder_factory.cc b/src/lib/encoder_factory.cc index fe4d50ef3..8384ecee3 100644 --- a/src/lib/encoder_factory.cc +++ b/src/lib/encoder_factory.cc @@ -22,7 +22,7 @@ */ #include -#include "j2k_wav_encoder.h" +#include "j2k_video_encoder.h" #include "j2k_still_encoder.h" #include "film.h" @@ -35,5 +35,5 @@ encoder_factory (shared_ptr f, shared_ptr o) return shared_ptr (new J2KStillEncoder (f, o)); } - return shared_ptr (new J2KWAVEncoder (f, o)); + return shared_ptr (new J2KVideoEncoder (f, o)); } diff --git a/src/lib/j2k_still_encoder.h b/src/lib/j2k_still_encoder.h index 7c302474c..ad2a5d277 100644 --- a/src/lib/j2k_still_encoder.h +++ b/src/lib/j2k_still_encoder.h @@ -39,7 +39,6 @@ public: private: void do_process_video (boost::shared_ptr, boost::shared_ptr); - void do_process_audio (boost::shared_ptr) {} void link (std::string, std::string) const; }; diff --git a/src/lib/j2k_video_encoder.cc b/src/lib/j2k_video_encoder.cc new file mode 100644 index 000000000..0f010b933 --- /dev/null +++ b/src/lib/j2k_video_encoder.cc @@ -0,0 +1,259 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file src/j2k_video_encoder.cc + * @brief An encoder which writes JPEG2000 files, where they are video (ie not still). + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "j2k_video_encoder.h" +#include "config.h" +#include "options.h" +#include "exceptions.h" +#include "dcp_video_frame.h" +#include "server.h" +#include "filter.h" +#include "log.h" +#include "cross.h" +#include "film.h" + +using std::string; +using std::stringstream; +using std::list; +using std::vector; +using std::pair; +using std::cout; +using boost::shared_ptr; +using boost::thread; +using boost::lexical_cast; + +J2KVideoEncoder::J2KVideoEncoder (shared_ptr f, shared_ptr o) + : Encoder (f, o) + , _process_end (false) +{ + +} + +J2KVideoEncoder::~J2KVideoEncoder () +{ + terminate_worker_threads (); +} + +void +J2KVideoEncoder::terminate_worker_threads () +{ + boost::mutex::scoped_lock lock (_worker_mutex); + _process_end = true; + _worker_condition.notify_all (); + lock.unlock (); + + for (list::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) { + (*i)->join (); + delete *i; + } +} + +void +J2KVideoEncoder::do_process_video (shared_ptr yuv, shared_ptr sub) +{ + boost::mutex::scoped_lock lock (_worker_mutex); + + /* Wait until the queue has gone down a bit */ + while (_queue.size() >= _worker_threads.size() * 2 && !_process_end) { + TIMING ("decoder sleeps with queue of %1", _queue.size()); + _worker_condition.wait (lock); + TIMING ("decoder wakes with queue of %1", _queue.size()); + } + + if (_process_end) { + return; + } + + /* Only do the processing if we don't already have a file for this frame */ + if (!boost::filesystem::exists (_opt->frame_out_path (_video_frame, false))) { + pair const s = Filter::ffmpeg_strings (_film->filters()); + TIMING ("adding to queue of %1", _queue.size ()); + _queue.push_back (boost::shared_ptr ( + new DCPVideoFrame ( + yuv, sub, _opt->out_size, _opt->padding, _film->subtitle_offset(), _film->subtitle_scale(), + _film->scaler(), _video_frame, _film->frames_per_second(), s.second, + Config::instance()->colour_lut_index (), Config::instance()->j2k_bandwidth (), + _film->log() + ) + )); + + _worker_condition.notify_all (); + } else { + frame_skipped (); + } +} + +void +J2KVideoEncoder::encoder_thread (ServerDescription* server) +{ + /* Number of seconds that we currently wait between attempts + to connect to the server; not relevant for localhost + encodings. + */ + int remote_backoff = 0; + + while (1) { + + TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id()); + boost::mutex::scoped_lock lock (_worker_mutex); + while (_queue.empty () && !_process_end) { + _worker_condition.wait (lock); + } + + if (_process_end) { + return; + } + + TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); + boost::shared_ptr vf = _queue.front (); + _film->log()->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame()), Log::VERBOSE); + _queue.pop_front (); + + lock.unlock (); + + shared_ptr encoded; + + if (server) { + try { + encoded = vf->encode_remotely (server); + + if (remote_backoff > 0) { + _film->log()->log (String::compose ("%1 was lost, but now she is found; removing backoff", server->host_name ())); + } + + /* This job succeeded, so remove any backoff */ + remote_backoff = 0; + + } catch (std::exception& e) { + if (remote_backoff < 60) { + /* back off more */ + remote_backoff += 10; + } + _film->log()->log ( + String::compose ( + "Remote encode of %1 on %2 failed (%3); thread sleeping for %4s", + vf->frame(), server->host_name(), e.what(), remote_backoff) + ); + } + + } else { + try { + TIMING ("encoder thread %1 begins local encode of %2", boost::this_thread::get_id(), vf->frame()); + encoded = vf->encode_locally (); + TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame()); + } catch (std::exception& e) { + _film->log()->log (String::compose ("Local encode failed (%1)", e.what ())); + } + } + + if (encoded) { + encoded->write (_opt, vf->frame ()); + frame_done (); + } else { + lock.lock (); + _film->log()->log ( + String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", boost::this_thread::get_id(), vf->frame()) + ); + _queue.push_front (vf); + lock.unlock (); + } + + if (remote_backoff > 0) { + dvdomatic_sleep (remote_backoff); + } + + lock.lock (); + _worker_condition.notify_all (); + } +} + +void +J2KVideoEncoder::process_begin () +{ + Encoder::process_begin (); + + for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) { + _worker_threads.push_back (new boost::thread (boost::bind (&J2KVideoEncoder::encoder_thread, this, (ServerDescription *) 0))); + } + + vector servers = Config::instance()->servers (); + + for (vector::iterator i = servers.begin(); i != servers.end(); ++i) { + for (int j = 0; j < (*i)->threads (); ++j) { + _worker_threads.push_back (new boost::thread (boost::bind (&J2KVideoEncoder::encoder_thread, this, *i))); + } + } +} + +void +J2KVideoEncoder::process_end () +{ + Encoder::process_end (); + + boost::mutex::scoped_lock lock (_worker_mutex); + + _film->log()->log ("Clearing queue of " + lexical_cast (_queue.size ())); + + /* Keep waking workers until the queue is empty */ + while (!_queue.empty ()) { + _film->log()->log ("Waking with " + lexical_cast (_queue.size ()), Log::VERBOSE); + _worker_condition.notify_all (); + _worker_condition.wait (lock); + } + + lock.unlock (); + + terminate_worker_threads (); + + _film->log()->log ("Mopping up " + lexical_cast (_queue.size())); + + /* The following sequence of events can occur in the above code: + 1. a remote worker takes the last image off the queue + 2. the loop above terminates + 3. the remote worker fails to encode the image and puts it back on the queue + 4. the remote worker is then terminated by terminate_worker_threads + + So just mop up anything left in the queue here. + */ + + for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { + _film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ())); + try { + shared_ptr e = (*i)->encode_locally (); + e->write (_opt, (*i)->frame ()); + frame_done (); + } catch (std::exception& e) { + _film->log()->log (String::compose ("Local encode failed (%1)", e.what ())); + } + } +} + diff --git a/src/lib/j2k_video_encoder.h b/src/lib/j2k_video_encoder.h new file mode 100644 index 000000000..604110576 --- /dev/null +++ b/src/lib/j2k_video_encoder.h @@ -0,0 +1,61 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file src/j2k_video_encoder.h + * @brief An encoder which writes JPEG2000 files, where they are video (ie not still). + */ + +#include +#include +#include +#include +#include +#include "encoder.h" + +class ServerDescription; +class DCPVideoFrame; +class Image; +class Log; +class Subtitle; + +/** @class J2KVideoEncoder + * @brief An encoder which writes JPEG2000 files, where they are video (ie not still). + */ +class J2KVideoEncoder : public Encoder +{ +public: + J2KVideoEncoder (boost::shared_ptr, boost::shared_ptr); + ~J2KVideoEncoder (); + + void process_begin (); + void process_end (); + +private: + + void do_process_video (boost::shared_ptr, boost::shared_ptr); + + void encoder_thread (ServerDescription *); + void terminate_worker_threads (); + + bool _process_end; + std::list > _queue; + std::list _worker_threads; + mutable boost::mutex _worker_mutex; + boost::condition _worker_condition; +}; diff --git a/src/lib/j2k_wav_encoder.cc b/src/lib/j2k_wav_encoder.cc deleted file mode 100644 index e76591552..000000000 --- a/src/lib/j2k_wav_encoder.cc +++ /dev/null @@ -1,394 +0,0 @@ -/* - Copyright (C) 2012 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/** @file src/j2k_wav_encoder.cc - * @brief An encoder which writes JPEG2000 and WAV files. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "j2k_wav_encoder.h" -#include "config.h" -#include "options.h" -#include "exceptions.h" -#include "dcp_video_frame.h" -#include "server.h" -#include "filter.h" -#include "log.h" -#include "cross.h" -#include "film.h" - -using std::string; -using std::stringstream; -using std::list; -using std::vector; -using std::pair; -using std::cout; -using boost::shared_ptr; -using boost::thread; -using boost::lexical_cast; - -J2KWAVEncoder::J2KWAVEncoder (shared_ptr f, shared_ptr o) - : Encoder (f, o) -#ifdef HAVE_SWRESAMPLE - , _swr_context (0) -#endif - , _audio_frames_written (0) - , _process_end (false) -{ - if (_film->audio_stream()) { - /* Create sound output files with .tmp suffixes; we will rename - them if and when we complete. - */ - for (int i = 0; i < _film->audio_channels(); ++i) { - SF_INFO sf_info; - sf_info.samplerate = dcp_audio_sample_rate (_film->audio_stream()->sample_rate()); - /* We write mono files */ - sf_info.channels = 1; - sf_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_24; - SNDFILE* f = sf_open (_opt->multichannel_audio_out_path (i, true).c_str (), SFM_WRITE, &sf_info); - if (f == 0) { - throw CreateFileError (_opt->multichannel_audio_out_path (i, true)); - } - _sound_files.push_back (f); - } - } -} - -J2KWAVEncoder::~J2KWAVEncoder () -{ - terminate_worker_threads (); - close_sound_files (); -} - -void -J2KWAVEncoder::terminate_worker_threads () -{ - boost::mutex::scoped_lock lock (_worker_mutex); - _process_end = true; - _worker_condition.notify_all (); - lock.unlock (); - - for (list::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) { - (*i)->join (); - delete *i; - } -} - -void -J2KWAVEncoder::close_sound_files () -{ - for (vector::iterator i = _sound_files.begin(); i != _sound_files.end(); ++i) { - sf_close (*i); - } - - _sound_files.clear (); -} - -void -J2KWAVEncoder::do_process_video (shared_ptr yuv, shared_ptr sub) -{ - boost::mutex::scoped_lock lock (_worker_mutex); - - /* Wait until the queue has gone down a bit */ - while (_queue.size() >= _worker_threads.size() * 2 && !_process_end) { - TIMING ("decoder sleeps with queue of %1", _queue.size()); - _worker_condition.wait (lock); - TIMING ("decoder wakes with queue of %1", _queue.size()); - } - - if (_process_end) { - return; - } - - /* Only do the processing if we don't already have a file for this frame */ - if (!boost::filesystem::exists (_opt->frame_out_path (_video_frame, false))) { - pair const s = Filter::ffmpeg_strings (_film->filters()); - TIMING ("adding to queue of %1", _queue.size ()); - _queue.push_back (boost::shared_ptr ( - new DCPVideoFrame ( - yuv, sub, _opt->out_size, _opt->padding, _film->subtitle_offset(), _film->subtitle_scale(), - _film->scaler(), _video_frame, _film->frames_per_second(), s.second, - Config::instance()->colour_lut_index (), Config::instance()->j2k_bandwidth (), - _film->log() - ) - )); - - _worker_condition.notify_all (); - } else { - frame_skipped (); - } -} - -void -J2KWAVEncoder::encoder_thread (ServerDescription* server) -{ - /* Number of seconds that we currently wait between attempts - to connect to the server; not relevant for localhost - encodings. - */ - int remote_backoff = 0; - - while (1) { - - TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id()); - boost::mutex::scoped_lock lock (_worker_mutex); - while (_queue.empty () && !_process_end) { - _worker_condition.wait (lock); - } - - if (_process_end) { - return; - } - - TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); - boost::shared_ptr vf = _queue.front (); - _film->log()->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame()), Log::VERBOSE); - _queue.pop_front (); - - lock.unlock (); - - shared_ptr encoded; - - if (server) { - try { - encoded = vf->encode_remotely (server); - - if (remote_backoff > 0) { - _film->log()->log (String::compose ("%1 was lost, but now she is found; removing backoff", server->host_name ())); - } - - /* This job succeeded, so remove any backoff */ - remote_backoff = 0; - - } catch (std::exception& e) { - if (remote_backoff < 60) { - /* back off more */ - remote_backoff += 10; - } - _film->log()->log ( - String::compose ( - "Remote encode of %1 on %2 failed (%3); thread sleeping for %4s", - vf->frame(), server->host_name(), e.what(), remote_backoff) - ); - } - - } else { - try { - TIMING ("encoder thread %1 begins local encode of %2", boost::this_thread::get_id(), vf->frame()); - encoded = vf->encode_locally (); - TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame()); - } catch (std::exception& e) { - _film->log()->log (String::compose ("Local encode failed (%1)", e.what ())); - } - } - - if (encoded) { - encoded->write (_opt, vf->frame ()); - frame_done (); - } else { - lock.lock (); - _film->log()->log ( - String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", boost::this_thread::get_id(), vf->frame()) - ); - _queue.push_front (vf); - lock.unlock (); - } - - if (remote_backoff > 0) { - dvdomatic_sleep (remote_backoff); - } - - lock.lock (); - _worker_condition.notify_all (); - } -} - -void -J2KWAVEncoder::process_begin () -{ - if (_film->audio_stream() && _film->audio_stream()->sample_rate() != _film->target_audio_sample_rate()) { -#ifdef HAVE_SWRESAMPLE - - stringstream s; - s << "Will resample audio from " << _film->audio_stream()->sample_rate() << " to " << _film->target_audio_sample_rate(); - _film->log()->log (s.str ()); - - /* We will be using planar float data when we call the resampler */ - _swr_context = swr_alloc_set_opts ( - 0, - _film->audio_stream()->channel_layout(), - AV_SAMPLE_FMT_FLTP, - _film->target_audio_sample_rate(), - _film->audio_stream()->channel_layout(), - AV_SAMPLE_FMT_FLTP, - _film->audio_stream()->sample_rate(), - 0, 0 - ); - - swr_init (_swr_context); -#else - throw EncodeError ("Cannot resample audio as libswresample is not present"); -#endif - } else { -#ifdef HAVE_SWRESAMPLE - _swr_context = 0; -#endif - } - - for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) { - _worker_threads.push_back (new boost::thread (boost::bind (&J2KWAVEncoder::encoder_thread, this, (ServerDescription *) 0))); - } - - vector servers = Config::instance()->servers (); - - for (vector::iterator i = servers.begin(); i != servers.end(); ++i) { - for (int j = 0; j < (*i)->threads (); ++j) { - _worker_threads.push_back (new boost::thread (boost::bind (&J2KWAVEncoder::encoder_thread, this, *i))); - } - } -} - -void -J2KWAVEncoder::process_end () -{ - boost::mutex::scoped_lock lock (_worker_mutex); - - _film->log()->log ("Clearing queue of " + lexical_cast (_queue.size ())); - - /* Keep waking workers until the queue is empty */ - while (!_queue.empty ()) { - _film->log()->log ("Waking with " + lexical_cast (_queue.size ()), Log::VERBOSE); - _worker_condition.notify_all (); - _worker_condition.wait (lock); - } - - lock.unlock (); - - terminate_worker_threads (); - - _film->log()->log ("Mopping up " + lexical_cast (_queue.size())); - - /* The following sequence of events can occur in the above code: - 1. a remote worker takes the last image off the queue - 2. the loop above terminates - 3. the remote worker fails to encode the image and puts it back on the queue - 4. the remote worker is then terminated by terminate_worker_threads - - So just mop up anything left in the queue here. - */ - - for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { - _film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ())); - try { - shared_ptr e = (*i)->encode_locally (); - e->write (_opt, (*i)->frame ()); - frame_done (); - } catch (std::exception& e) { - _film->log()->log (String::compose ("Local encode failed (%1)", e.what ())); - } - } - -#if HAVE_SWRESAMPLE - if (_film->audio_stream() && _swr_context) { - - shared_ptr out (new AudioBuffers (_film->audio_stream()->channels(), 256)); - - while (1) { - int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0); - - if (frames < 0) { - throw EncodeError ("could not run sample-rate converter"); - } - - if (frames == 0) { - break; - } - - out->set_frames (frames); - write_audio (out); - } - - swr_free (&_swr_context); - } -#endif - - if (_film->audio_stream()) { - close_sound_files (); - - /* Rename .wav.tmp files to .wav */ - for (int i = 0; i < _film->audio_channels(); ++i) { - if (boost::filesystem::exists (_opt->multichannel_audio_out_path (i, false))) { - boost::filesystem::remove (_opt->multichannel_audio_out_path (i, false)); - } - boost::filesystem::rename (_opt->multichannel_audio_out_path (i, true), _opt->multichannel_audio_out_path (i, false)); - } - } -} - -void -J2KWAVEncoder::do_process_audio (shared_ptr audio) -{ - shared_ptr resampled; - -#if HAVE_SWRESAMPLE - /* Maybe sample-rate convert */ - if (_swr_context) { - - /* Compute the resampled frames count and add 32 for luck */ - int const max_resampled_frames = ceil ((int64_t) audio->frames() * _film->target_audio_sample_rate() / _film->audio_stream()->sample_rate()) + 32; - - resampled.reset (new AudioBuffers (_film->audio_stream()->channels(), max_resampled_frames)); - - /* Resample audio */ - int const resampled_frames = swr_convert ( - _swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) audio->data(), audio->frames() - ); - - if (resampled_frames < 0) { - throw EncodeError ("could not run sample-rate converter"); - } - - resampled->set_frames (resampled_frames); - - /* And point our variables at the resampled audio */ - audio = resampled; - } -#endif - - write_audio (audio); -} - -void -J2KWAVEncoder::write_audio (shared_ptr audio) -{ - for (int i = 0; i < _film->audio_channels(); ++i) { - sf_write_float (_sound_files[i], audio->data(i), audio->frames()); - } - - _audio_frames_written += audio->frames (); -} - diff --git a/src/lib/j2k_wav_encoder.h b/src/lib/j2k_wav_encoder.h deleted file mode 100644 index 064f4221e..000000000 --- a/src/lib/j2k_wav_encoder.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - Copyright (C) 2012 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/** @file src/j2k_wav_encoder.h - * @brief An encoder which writes JPEG2000 and WAV files. - */ - -#include -#include -#include -#include -#include -#ifdef HAVE_SWRESAMPLE -extern "C" { -#include -} -#endif -#include -#include "encoder.h" - -class ServerDescription; -class DCPVideoFrame; -class Image; -class Log; -class Subtitle; -class AudioBuffers; - -/** @class J2KWAVEncoder - * @brief An encoder which writes JPEG2000 and WAV files. - */ -class J2KWAVEncoder : public Encoder -{ -public: - J2KWAVEncoder (boost::shared_ptr, boost::shared_ptr); - ~J2KWAVEncoder (); - - void process_begin (); - void process_end (); - -private: - - void do_process_video (boost::shared_ptr, boost::shared_ptr); - void do_process_audio (boost::shared_ptr); - - void write_audio (boost::shared_ptr audio); - void encoder_thread (ServerDescription *); - void close_sound_files (); - void terminate_worker_threads (); - -#if HAVE_SWRESAMPLE - SwrContext* _swr_context; -#endif - - std::vector _sound_files; - int64_t _audio_frames_written; - - bool _process_end; - std::list > _queue; - std::list _worker_threads; - mutable boost::mutex _worker_mutex; - boost::condition _worker_condition; -}; diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 477c73c75..b429c4646 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -24,12 +24,12 @@ #include #include #include "transcode_job.h" -#include "j2k_wav_encoder.h" #include "film.h" #include "format.h" #include "transcoder.h" #include "log.h" #include "encoder_factory.h" +#include "encoder.h" using std::string; using std::stringstream; diff --git a/src/lib/wscript b/src/lib/wscript index 5d3fbb906..d13de4f3b 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -38,7 +38,7 @@ def build(bld): image.cc imagemagick_decoder.cc j2k_still_encoder.cc - j2k_wav_encoder.cc + j2k_video_encoder.cc job.cc job_manager.cc log.cc -- cgit v1.2.3