From: Carl Hetherington Date: Sun, 16 Dec 2012 12:51:00 +0000 (+0000) Subject: Various fixes. X-Git-Tag: v2.0.48~1425 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=c726a221e619d22ad5253eaa6c3429bce557e111;p=dcpomatic.git Various fixes. --- diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 577894996..93ce2cdbb 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -57,7 +57,7 @@ Decoder::Decoder (boost::shared_ptr f, boost::shared_ptr o, } -void +bool Decoder::seek (SourceFrame f) { throw DecodeError ("decoder does not support seek"); diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 96d3a2014..e4693fb6d 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -58,7 +58,10 @@ public: virtual ~Decoder () {} virtual bool pass () = 0; - virtual void seek (SourceFrame); + /** Seek. + * @return true on error. + */ + virtual bool seek (SourceFrame); protected: /** our Film */ diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index f4c7d3d85..c7c96ce68 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -270,46 +270,10 @@ FFmpegDecoder::pass () _film->log()->log (String::compose ("Used only %1 bytes of %2 in packet", r, _packet.size)); } - /* Where we are in the output, in seconds */ - double const out_pts_seconds = video_frame() / frames_per_second(); - - /* Where we are in the source, in seconds */ - double const source_pts_seconds = av_q2d (_format_context->streams[_packet.stream_index]->time_base) - * av_frame_get_best_effort_timestamp(_frame); - - _film->log()->log ( - String::compose ("Source video frame ready; source at %1, output at %2", source_pts_seconds, out_pts_seconds), - Log::VERBOSE - ); - - if (!_first_video) { - _first_video = source_pts_seconds; - } - - /* Difference between where we are and where we should be */ - double const delta = source_pts_seconds - _first_video.get() - out_pts_seconds; - double const one_frame = 1 / frames_per_second(); - - /* Insert frames if required to get out_pts_seconds up to pts_seconds */ - if (delta > one_frame) { - int const extra = rint (delta / one_frame); - for (int i = 0; i < extra; ++i) { - repeat_last_video (); - _film->log()->log ( - String::compose ( - "Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)", - out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second() - ) - ); - } - } - - if (delta > -one_frame) { - /* Process this frame */ - filter_and_emit_video (_frame); + if (_opt->decoder_alignment) { + out_careful (); } else { - /* Otherwise we are omitting a frame to keep things right */ - _film->log()->log (String::compose ("Frame removed at %1s", out_pts_seconds)); + filter_and_emit_video (_frame); } } @@ -584,12 +548,13 @@ FFmpegDecoder::filter_and_emit_video (AVFrame* frame) } } -void +bool FFmpegDecoder::seek (SourceFrame f) { int64_t const t = static_cast(f) / (av_q2d (_format_context->streams[_video_stream]->time_base) * frames_per_second()); - av_seek_frame (_format_context, _video_stream, t, 0); + int const r = av_seek_frame (_format_context, _video_stream, t, 0); avcodec_flush_buffers (_video_codec_context); + return r < 0; } shared_ptr @@ -645,3 +610,48 @@ FFmpegAudioStream::to_string () const } +void +FFmpegDecoder::out_careful () +{ + /* Where we are in the output, in seconds */ + double const out_pts_seconds = video_frame() / frames_per_second(); + + /* Where we are in the source, in seconds */ + double const source_pts_seconds = av_q2d (_format_context->streams[_packet.stream_index]->time_base) + * av_frame_get_best_effort_timestamp(_frame); + + _film->log()->log ( + String::compose ("Source video frame ready; source at %1, output at %2", source_pts_seconds, out_pts_seconds), + Log::VERBOSE + ); + + if (!_first_video) { + _first_video = source_pts_seconds; + } + + /* Difference between where we are and where we should be */ + double const delta = source_pts_seconds - _first_video.get() - out_pts_seconds; + double const one_frame = 1 / frames_per_second(); + + /* Insert frames if required to get out_pts_seconds up to pts_seconds */ + if (delta > one_frame) { + int const extra = rint (delta / one_frame); + for (int i = 0; i < extra; ++i) { + repeat_last_video (); + _film->log()->log ( + String::compose ( + "Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)", + out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second() + ) + ); + } + } + + if (delta > -one_frame) { + /* Process this frame */ + filter_and_emit_video (_frame); + } else { + /* Otherwise we are omitting a frame to keep things right */ + _film->log()->log (String::compose ("Frame removed at %1s", out_pts_seconds)); + } +} diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index de0a6a67c..89e42f978 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -97,7 +97,7 @@ public: void set_audio_stream (boost::shared_ptr); void set_subtitle_stream (boost::shared_ptr); - void seek (SourceFrame); + bool seek (SourceFrame); private: @@ -106,6 +106,7 @@ private: AVSampleFormat audio_sample_format () const; int bytes_per_audio_sample () const; + void out_careful (); void filter_and_emit_video (AVFrame *); void setup_general (); diff --git a/src/lib/image.cc b/src/lib/image.cc index 72828ed46..748e9ae4b 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -125,7 +125,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal Size content_size = out_size; content_size.width -= (padding * 2); - shared_ptr rgb (new AlignedImage (PIX_FMT_RGB24, content_size)); + shared_ptr rgb (new CompactImage (PIX_FMT_RGB24, content_size)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), diff --git a/src/lib/options.h b/src/lib/options.h index 29b3b71cd..65c7b9ebc 100644 --- a/src/lib/options.h +++ b/src/lib/options.h @@ -43,6 +43,7 @@ public: , decode_video_skip (0) , decode_audio (true) , decode_subtitles (false) + , decoder_alignment (true) , _frame_out_path (f) , _frame_out_extension (e) , _multichannel_audio_out_path (m) @@ -110,6 +111,8 @@ public: bool decode_audio; ///< true to decode audio, otherwise false bool decode_subtitles; + bool decoder_alignment; + private: /** Path of the directory to write video frames to */ std::string _frame_out_path; diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 2dc578e65..12fe302f4 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -34,12 +34,12 @@ #include "lib/scaler.h" #include "film_viewer.h" #include "wx_util.h" -#include "ffmpeg_player.h" #include "video_decoder.h" using std::string; using std::pair; using std::max; +using std::cout; using boost::shared_ptr; FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) @@ -74,6 +74,22 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) set_film (_film); } +void +FilmViewer::film_changed (Film::Property p) +{ + switch (p) { + case Film::CROP: + calculate_sizes (); + update_from_raw (); + break; + case Film::FORMAT: + calculate_sizes (); + update_from_raw (); + break; + default: + break; + } +} void FilmViewer::set_film (shared_ptr f) @@ -91,8 +107,12 @@ FilmViewer::set_film (shared_ptr f) /* XXX: Options is not decoder-specific at all */ shared_ptr o (new Options ("", "", "")); o->decode_audio = false; + o->decoder_alignment = false; _decoders = decoder_factory (_film, o, 0); _decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2)); + + film_changed (Film::CROP); + film_changed (Film::FORMAT); } void @@ -135,7 +155,10 @@ FilmViewer::paint_panel (wxPaintEvent& ev) void FilmViewer::slider_moved (wxCommandEvent& ev) { - _decoders.video->seek (_slider->GetValue() * _film->length().get() / 4096); + if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / 4096)) { + return; + } + shared_ptr last = _display; while (last == _display) { _decoders.video->pass (); @@ -150,12 +173,20 @@ FilmViewer::panel_sized (wxSizeEvent& ev) _panel_width = ev.GetSize().GetWidth(); _panel_height = ev.GetSize().GetHeight(); calculate_sizes (); + update_from_raw (); +} +void +FilmViewer::update_from_raw () +{ if (!_raw) { return; } - _display = _raw->scale_and_convert_to_rgb (Size (_out_width, _out_height), 0, Scaler::from_id ("bicubic")); + if (_out_width && _out_height) { + _display = _raw->scale_and_convert_to_rgb (Size (_out_width, _out_height), 0, Scaler::from_id ("bicubic")); + } + _panel->Refresh (); _panel->Update (); } @@ -196,5 +227,7 @@ void FilmViewer::process_video (shared_ptr image, shared_ptr sub) { _raw = image; - _display.reset (new CompactImage (_raw->scale_and_convert_to_rgb (Size (_out_width, _out_height), 0, Scaler::from_id ("bicubic")))); + if (_out_width && _out_height) { + _display = _raw->scale_and_convert_to_rgb (Size (_out_width, _out_height), 0, Scaler::from_id ("bicubic")); + } } diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index f5427551d..f0d4b6280 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -50,6 +50,7 @@ private: void process_video (boost::shared_ptr, boost::shared_ptr); void calculate_sizes (); void check_play_state (); + void update_from_raw (); boost::shared_ptr _film;