X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_wav_encoder.cc;h=73a70910e9f9f631f3f3109e3c317bbd27694610;hb=abd57c6c2e8526eac93e9d0c9bd0b6080de1e6fa;hp=58f8a101f7440c0be6312846114c9ebeed474011;hpb=b996eb8276dc4645745540190c9a2f5e2c875c0c;p=dcpomatic.git diff --git a/src/lib/j2k_wav_encoder.cc b/src/lib/j2k_wav_encoder.cc index 58f8a101f..73a70910e 100644 --- a/src/lib/j2k_wav_encoder.cc +++ b/src/lib/j2k_wav_encoder.cc @@ -32,7 +32,6 @@ #include #include "j2k_wav_encoder.h" #include "config.h" -#include "film_state.h" #include "options.h" #include "exceptions.h" #include "dcp_video_frame.h" @@ -40,23 +39,31 @@ #include "filter.h" #include "log.h" #include "cross.h" - -using namespace std; -using namespace boost; - -J2KWAVEncoder::J2KWAVEncoder (shared_ptr s, shared_ptr o, Log* l) - : Encoder (s, o, l) +#include "film.h" + +using std::string; +using std::stringstream; +using std::list; +using std::vector; +using std::pair; +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) { /* Create sound output files with .tmp suffixes; we will rename them if and when we complete. */ - for (int i = 0; i < _fs->audio_channels(); ++i) { + for (int i = 0; i < _film->audio_channels(); ++i) { SF_INFO sf_info; - sf_info.samplerate = dcp_audio_sample_rate (_fs->audio_sample_rate()); + sf_info.samplerate = dcp_audio_sample_rate (_film->audio_sample_rate()); /* We write mono files */ sf_info.channels = 1; sf_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_24; @@ -116,14 +123,14 @@ J2KWAVEncoder::process_video (shared_ptr yuv, int frame, shared_ptrframe_out_path (frame, false))) { - pair const s = Filter::ffmpeg_strings (_fs->filters()); + 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, _fs->subtitle_offset(), _fs->subtitle_scale(), - _fs->scaler(), frame, _fs->frames_per_second(), s.second, + yuv, sub, _opt->out_size, _opt->padding, _film->subtitle_offset(), _film->subtitle_scale(), + _film->scaler(), frame, _film->frames_per_second(), s.second, Config::instance()->colour_lut_index (), Config::instance()->j2k_bandwidth (), - _log + _film->log() ) )); @@ -156,7 +163,7 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server) TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); boost::shared_ptr vf = _queue.front (); - _log->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame())); + _film->log()->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame())); _queue.pop_front (); lock.unlock (); @@ -168,7 +175,7 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server) encoded = vf->encode_remotely (server); if (remote_backoff > 0) { - _log->log (String::compose ("%1 was lost, but now she is found; removing backoff", server->host_name ())); + _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 */ @@ -179,7 +186,7 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server) /* back off more */ remote_backoff += 10; } - _log->log ( + _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) @@ -192,7 +199,7 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server) encoded = vf->encode_locally (); TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame()); } catch (std::exception& e) { - _log->log (String::compose ("Local encode failed (%1)", e.what ())); + _film->log()->log (String::compose ("Local encode failed (%1)", e.what ())); } } @@ -201,7 +208,9 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server) frame_done (vf->frame ()); } else { lock.lock (); - _log->log (String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", boost::this_thread::get_id(), vf->frame())); + _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 (); } @@ -216,24 +225,24 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server) } void -J2KWAVEncoder::process_begin (int64_t audio_channel_layout, AVSampleFormat audio_sample_format) +J2KWAVEncoder::process_begin (int64_t audio_channel_layout) { - if (_fs->audio_sample_rate() != _fs->target_sample_rate()) { + if (_film->audio_sample_rate() != _film->target_audio_sample_rate()) { #ifdef HAVE_SWRESAMPLE stringstream s; - s << "Will resample audio from " << _fs->audio_sample_rate() << " to " << _fs->target_sample_rate(); - _log->log (s.str ()); + s << "Will resample audio from " << _film->audio_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, audio_channel_layout, AV_SAMPLE_FMT_FLTP, - _fs->target_sample_rate(), + _film->target_audio_sample_rate(), audio_channel_layout, AV_SAMPLE_FMT_FLTP, - _fs->audio_sample_rate(), + _film->audio_sample_rate(), 0, 0 ); @@ -265,11 +274,11 @@ J2KWAVEncoder::process_end () { boost::mutex::scoped_lock lock (_worker_mutex); - _log->log ("Clearing queue of " + lexical_cast (_queue.size ())); + _film->log()->log ("Clearing queue of " + lexical_cast (_queue.size ())); /* Keep waking workers until the queue is empty */ while (!_queue.empty ()) { - _log->log ("Waking with " + lexical_cast (_queue.size ())); + _film->log()->log ("Waking with " + lexical_cast (_queue.size ())); _worker_condition.notify_all (); _worker_condition.wait (lock); } @@ -278,7 +287,7 @@ J2KWAVEncoder::process_end () terminate_worker_threads (); - _log->log ("Mopping up " + lexical_cast (_queue.size())); + _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 @@ -290,26 +299,23 @@ J2KWAVEncoder::process_end () */ for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { - _log->log (String::compose ("Encode left-over frame %1", (*i)->frame ())); + _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 ((*i)->frame ()); } catch (std::exception& e) { - _log->log (String::compose ("Local encode failed (%1)", e.what ())); + _film->log()->log (String::compose ("Local encode failed (%1)", e.what ())); } } #if HAVE_SWRESAMPLE if (_swr_context) { - float* out[_fs->audio_channels()]; - for (int i = 0; i < _fs->audio_channels(); ++i) { - out[i] = new float[256]; - } + shared_ptr out (new AudioBuffers (_film->audio_channels(), 256)); while (1) { - int const frames = swr_convert (_swr_context, (uint8_t **) out, 256, 0, 0); + 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"); @@ -319,21 +325,23 @@ J2KWAVEncoder::process_end () break; } - write_audio (out, frames); - } - - for (int i = 0; i < _fs->audio_channels(); ++i) { - delete[] out[i]; + write_audio (out); } swr_free (&_swr_context); } -#endif +#endif + + int const dcp_sr = dcp_audio_sample_rate (_film->audio_sample_rate ()); + int64_t const extra_audio_frames = dcp_sr - (_audio_frames_written % dcp_sr); + shared_ptr silence (new AudioBuffers (_film->audio_channels(), extra_audio_frames)); + silence->make_silent (); + write_audio (silence); close_sound_files (); /* Rename .wav.tmp files to .wav */ - for (int i = 0; i < _fs->audio_channels(); ++i) { + 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)); } @@ -342,50 +350,45 @@ J2KWAVEncoder::process_end () } void -J2KWAVEncoder::process_audio (float** data, int frames) +J2KWAVEncoder::process_audio (shared_ptr audio) { - float* resampled[_fs->audio_channels()]; + shared_ptr resampled; -#if HAVE_SWRESAMPLE +#if HAVE_SWRESAMPLE /* Maybe sample-rate convert */ if (_swr_context) { /* Compute the resampled frames count and add 32 for luck */ - int const resampled_frames = ceil (frames * _fs->target_sample_rate() / _fs->audio_sample_rate()) + 32; + int const max_resampled_frames = ceil (audio->frames() * _film->target_audio_sample_rate() / _film->audio_sample_rate()) + 32; - /* Make a buffer to put the result in */ - for (int i = 0; i < _fs->audio_channels(); ++i) { - resampled[i] = new float[resampled_frames]; - } + resampled.reset (new AudioBuffers (_film->audio_channels(), max_resampled_frames)); /* Resample audio */ - int out_frames = swr_convert (_swr_context, (uint8_t **) resampled, resampled_frames, (uint8_t const **) data, frames); - if (out_frames < 0) { + 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 */ - data = resampled; - frames = resampled_frames; + audio = resampled; } #endif - write_audio (data, frames); - -#if HAVE_SWRESAMPLE - if (_swr_context) { - for (int i = 0; i < _fs->audio_channels(); ++i) { - delete[] resampled[i]; - } - } -#endif + write_audio (audio); } void -J2KWAVEncoder::write_audio (float** data, int frames) +J2KWAVEncoder::write_audio (shared_ptr audio) { - for (int i = 0; i < _fs->audio_channels(); ++i) { - sf_write_float (_sound_files[i], data[i], frames); + 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 (); }