X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdecoder.cc;h=73e17e7ead91a8481763b3da63216cfdb9c62c02;hb=17cea71c34ed6bdba67aac8614572c7511844c2a;hp=358109a7e081dad3d180aaea8db72778295b6532;hpb=7ffd5bd9b4571c2db06a8c50419fe90b06ef1a07;p=dcpomatic.git diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 358109a7e..73e17e7ea 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -33,222 +33,64 @@ #include "util.h" #include "log.h" #include "decoder.h" -#include "filter.h" #include "delay_line.h" -#include "ffmpeg_compatibility.h" #include "subtitle.h" +#include "filter_graph.h" using std::string; using std::stringstream; using std::min; +using std::pair; using std::list; using boost::shared_ptr; +using boost::optional; /** @param f Film. * @param o Options. * @param j Job that we are running within, or 0 * @param minimal true to do the bare minimum of work; just run through the content. Useful for acquiring * accurate frame counts as quickly as possible. This generates no video or audio output. - * @param ignore_length Ignore the content's claimed length when computing progress. */ -Decoder::Decoder (boost::shared_ptr f, boost::shared_ptr o, Job* j, bool minimal, bool ignore_length) +Decoder::Decoder (boost::shared_ptr f, boost::shared_ptr o, Job* j) : _film (f) , _opt (o) , _job (j) - , _minimal (minimal) - , _ignore_length (ignore_length) , _video_frame (0) - , _delay_line (0) - , _delay_in_bytes (0) - , _audio_frames_processed (0) { - if (_opt->decode_video_frequency != 0 && !_film->length()) { - throw DecodeError ("cannot do a partial decode if length is unknown"); - } -} - -Decoder::~Decoder () -{ - delete _delay_line; -} - -/** Start off a decode processing run */ -void -Decoder::process_begin () -{ - _delay_in_bytes = _film->audio_delay() * audio_sample_rate() * audio_channels() * bytes_per_audio_sample() / 1000; - delete _delay_line; - _delay_line = new DelayLine (_delay_in_bytes); - - _audio_frames_processed = 0; -} - -/** Finish off a decode processing run */ -void -Decoder::process_end () -{ - if (_delay_in_bytes < 0) { - uint8_t remainder[-_delay_in_bytes]; - _delay_line->get_remaining (remainder); - _audio_frames_processed += _delay_in_bytes / (audio_channels() * bytes_per_audio_sample()); - emit_audio (remainder, -_delay_in_bytes); - } - - /* If we cut the decode off, the audio may be short; push some silence - in to get it to the right length. - */ - - int64_t const video_length_in_audio_frames = ((int64_t) last_video_frame() * audio_sample_rate() / frames_per_second()); - int64_t const audio_short_by_frames = video_length_in_audio_frames - _audio_frames_processed; - - _film->log()->log ( - String::compose ("DCP length is %1 (%2 audio frames); %3 frames of audio processed.", - last_video_frame(), - video_length_in_audio_frames, - _audio_frames_processed) - ); - if (audio_short_by_frames >= 0 && _opt->decode_audio) { - - _film->log()->log (String::compose ("DCP length is %1; %2 frames of audio processed.", last_video_frame(), _audio_frames_processed)); - _film->log()->log (String::compose ("Adding %1 frames of silence to the end.", audio_short_by_frames)); - - /* XXX: this is slightly questionable; does memset () give silence with all - sample formats? - */ - - int64_t bytes = audio_short_by_frames * _film->audio_channels() * bytes_per_audio_sample(); - - int64_t const silence_size = 16 * 1024 * _film->audio_channels() * bytes_per_audio_sample(); - uint8_t silence[silence_size]; - memset (silence, 0, silence_size); - - while (bytes) { - int64_t const t = min (bytes, silence_size); - emit_audio (silence, t); - bytes -= t; - } - } } /** Start decoding */ void Decoder::go () { - process_begin (); - if (_job && !_film->dcp_length()) { _job->set_progress_unknown (); } while (pass () == false) { if (_job && _film->dcp_length()) { - _job->set_progress (float (_video_frame) / _film->dcp_length().get()); + _job->set_progress (float (_video_frame) / _film->length().get()); } } - - process_end (); -} - -/** Run one pass. This may or may not generate any actual video / audio data; - * some decoders may require several passes to generate a single frame. - * @return true if we have finished processing all data; otherwise false. - */ -bool -Decoder::pass () -{ - if (!_ignore_length && _video_frame >= _film->dcp_length()) { - return true; - } - - return do_pass (); } -/** Called by subclasses to tell the world that some audio data is ready - * @param data Audio data, in Film::audio_sample_format. - * @param size Number of bytes of data. +/** Called to tell the world that some audio data is ready + * @param audio Audio data. */ void -Decoder::process_audio (uint8_t* data, int size) +Decoder::process_audio (shared_ptr audio) { - /* Push into the delay line */ - size = _delay_line->feed (data, size); - - emit_audio (data, size); -} - -void -Decoder::emit_audio (uint8_t* data, int size) -{ - /* Deinterleave and convert to float */ - - assert ((size % (bytes_per_audio_sample() * audio_channels())) == 0); - - int const total_samples = size / bytes_per_audio_sample(); - int const frames = total_samples / _film->audio_channels(); - shared_ptr audio (new AudioBuffers (audio_channels(), frames)); - - switch (audio_sample_format()) { - case AV_SAMPLE_FMT_S16: - { - int16_t* p = (int16_t *) data; - int sample = 0; - int channel = 0; - for (int i = 0; i < total_samples; ++i) { - audio->data(channel)[sample] = float(*p++) / (1 << 15); - - ++channel; - if (channel == _film->audio_channels()) { - channel = 0; - ++sample; - } - } - } - break; - - case AV_SAMPLE_FMT_S32: - { - int32_t* p = (int32_t *) data; - int sample = 0; - int channel = 0; - for (int i = 0; i < total_samples; ++i) { - audio->data(channel)[sample] = float(*p++) / (1 << 31); - - ++channel; - if (channel == _film->audio_channels()) { - channel = 0; - ++sample; - } - } - } - - case AV_SAMPLE_FMT_FLTP: - { - float* p = reinterpret_cast (data); - for (int i = 0; i < _film->audio_channels(); ++i) { - memcpy (audio->data(i), p, frames * sizeof(float)); - p += frames; - } - } - break; - - default: - assert (false); - } - /* Maybe apply gain */ if (_film->audio_gain() != 0) { float const linear_gain = pow (10, _film->audio_gain() / 20); - for (int i = 0; i < _film->audio_channels(); ++i) { - for (int j = 0; j < frames; ++j) { + for (int i = 0; i < audio->channels(); ++i) { + for (int j = 0; j < audio->frames(); ++j) { audio->data(i)[j] *= linear_gain; } } } - /* Update the number of audio frames we've pushed to the encoder */ - _audio_frames_processed += audio->frames (); - Audio (audio); } @@ -259,23 +101,6 @@ Decoder::emit_audio (uint8_t* data, int size) void Decoder::process_video (AVFrame* frame) { - if (_minimal) { - ++_video_frame; - return; - } - - /* Use Film::length here as our one may be wrong */ - - int gap = 0; - if (_opt->decode_video_frequency != 0) { - gap = _film->length().get() / _opt->decode_video_frequency; - } - - if (_opt->decode_video_frequency != 0 && gap != 0 && (_video_frame % gap) != 0) { - ++_video_frame; - return; - } - shared_ptr graph; list >::iterator i = _filter_graphs.begin(); @@ -286,7 +111,7 @@ Decoder::process_video (AVFrame* frame) if (i == _filter_graphs.end ()) { graph.reset (new FilterGraph (_film, this, _opt->apply_crop, Size (frame->width, frame->height), (AVPixelFormat) frame->format)); _filter_graphs.push_back (graph); - std::cout << "NEW GRAPH for " << frame->width << "x" << frame->height << " " << frame->format << "\n"; + _film->log()->log (String::compose ("New graph for %1x%2, pixel format %3", frame->width, frame->height, frame->format)); } else { graph = *i; } @@ -294,19 +119,35 @@ Decoder::process_video (AVFrame* frame) list > images = graph->process (frame); for (list >::iterator i = images.begin(); i != images.end(); ++i) { - if (_opt->black_after > 0 && _video_frame > _opt->black_after) { - (*i)->make_black (); - } - shared_ptr sub; - if (_timed_subtitle && _timed_subtitle->displayed_at (double (last_video_frame()) / _film->frames_per_second())) { + if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) { sub = _timed_subtitle->subtitle (); } - - TIMING ("Decoder emits %1", _video_frame); - Video ((*i), _video_frame, sub); - ++_video_frame; + + emit_video (*i, sub); + } +} + +void +Decoder::repeat_last_video () +{ + if (!_last_image) { + _last_image.reset (new CompactImage (pixel_format(), native_size())); + _last_image->make_black (); } + + emit_video (_last_image, _last_subtitle); +} + +void +Decoder::emit_video (shared_ptr image, shared_ptr sub) +{ + TIMING ("Decoder emits %1", _video_frame); + Video (image, sub); + ++_video_frame; + + _last_image = image; + _last_subtitle = sub; } void @@ -320,9 +161,14 @@ Decoder::process_subtitle (shared_ptr s) } } +void +Decoder::set_audio_stream (optional s) +{ + _audio_stream = s; +} -int -Decoder::bytes_per_audio_sample () const +void +Decoder::set_subtitle_stream (optional s) { - return av_get_bytes_per_sample (audio_sample_format ()); + _subtitle_stream = s; }