From b0f078d851e2a84d2f9d2ae085f6aad837747eb1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 May 2016 10:57:06 +0100 Subject: [PATCH] Factor out decoder creation to a factory method. --- src/lib/decoder_factory.cc | 86 +++++++++++++++++++++++++++++++++ src/lib/decoder_factory.h | 28 +++++++++++ src/lib/player.cc | 99 +++++++++----------------------------- src/lib/wscript | 1 + src/wx/subtitle_panel.cc | 14 ++---- 5 files changed, 140 insertions(+), 88 deletions(-) create mode 100644 src/lib/decoder_factory.cc create mode 100644 src/lib/decoder_factory.h diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc new file mode 100644 index 000000000..7f53c9a4b --- /dev/null +++ b/src/lib/decoder_factory.cc @@ -0,0 +1,86 @@ +/* + Copyright (C) 2016 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic 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. + + DCP-o-matic 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 DCP-o-matic. If not, see . + +*/ + +#include "ffmpeg_content.h" +#include "ffmpeg_decoder.h" +#include "dcp_content.h" +#include "dcp_decoder.h" +#include "image_content.h" +#include "image_decoder.h" +#include "text_subtitle_content.h" +#include "text_subtitle_decoder.h" +#include "dcp_subtitle_content.h" +#include "dcp_subtitle_decoder.h" +#include "video_mxf_content.h" +#include "video_mxf_decoder.h" +#include + +using std::list; +using boost::shared_ptr; +using boost::dynamic_pointer_cast; + +shared_ptr +decoder_factory (shared_ptr content, list > old_image_decoders, shared_ptr log, bool fast) +{ + shared_ptr fc = dynamic_pointer_cast (content); + if (fc) { + return shared_ptr (new FFmpegDecoder (fc, log, fast)); + } + + shared_ptr dc = dynamic_pointer_cast (content); + if (dc) { + return shared_ptr (new DCPDecoder (dc, log, fast)); + } + + shared_ptr ic = dynamic_pointer_cast (content); + if (ic) { + shared_ptr decoder; + + /* See if we can re-use an old ImageDecoder */ + BOOST_FOREACH (shared_ptr i, old_image_decoders) { + if (i->content() == ic) { + decoder = i; + } + } + + if (!decoder) { + decoder.reset (new ImageDecoder (ic, log)); + } + + return decoder; + } + + shared_ptr rc = dynamic_pointer_cast (content); + if (rc) { + return shared_ptr (new TextSubtitleDecoder (rc)); + } + + shared_ptr dsc = dynamic_pointer_cast (content); + if (dsc) { + return shared_ptr (new DCPSubtitleDecoder (dsc)); + } + + shared_ptr vmc = dynamic_pointer_cast (content); + if (vmc) { + return shared_ptr (new VideoMXFDecoder (vmc, log)); + } + + return shared_ptr (); +} diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h new file mode 100644 index 000000000..6a4e55ef1 --- /dev/null +++ b/src/lib/decoder_factory.h @@ -0,0 +1,28 @@ +/* + Copyright (C) 2016 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic 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. + + DCP-o-matic 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 DCP-o-matic. If not, see . + +*/ + +class ImageDecoder; + +extern boost::shared_ptr decoder_factory ( + boost::shared_ptr content, + std::list > old_image_decoders, + boost::shared_ptr log, + bool fast + ); diff --git a/src/lib/player.cc b/src/lib/player.cc index 6d5b9f309..d437d5b1b 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -20,20 +20,8 @@ #include "player.h" #include "film.h" -#include "ffmpeg_decoder.h" -#include "video_decoder.h" -#include "audio_decoder.h" #include "audio_buffers.h" -#include "audio_content.h" -#include "ffmpeg_content.h" -#include "image_decoder.h" #include "content_audio.h" -#include "image_content.h" -#include "subtitle_content.h" -#include "text_subtitle_decoder.h" -#include "text_subtitle_content.h" -#include "video_mxf_decoder.h" -#include "video_mxf_content.h" #include "dcp_content.h" #include "job.h" #include "image.h" @@ -45,13 +33,20 @@ #include "content_video.h" #include "player_video.h" #include "frame_rate_change.h" -#include "dcp_content.h" -#include "dcp_decoder.h" -#include "dcp_subtitle_content.h" -#include "dcp_subtitle_decoder.h" #include "audio_processor.h" #include "playlist.h" #include "referenced_reel_asset.h" +#include "decoder_factory.h" +#include "decoder.h" +#include "video_decoder.h" +#include "audio_decoder.h" +#include "subtitle_content.h" +#include "subtitle_decoder.h" +#include "ffmpeg_content.h" +#include "audio_content.h" +#include "content_subtitle.h" +#include "dcp_decoder.h" +#include "image_decoder.h" #include #include #include @@ -120,7 +115,14 @@ Player::Player (shared_ptr film, shared_ptr playlist void Player::setup_pieces () { - list > old_pieces = _pieces; + list > old_image_decoders; + BOOST_FOREACH (shared_ptr i, _pieces) { + shared_ptr imd = dynamic_pointer_cast (i->decoder); + if (imd) { + old_image_decoders.push_back (imd); + } + } + _pieces.clear (); BOOST_FOREACH (shared_ptr i, _playlist->content ()) { @@ -129,65 +131,8 @@ Player::setup_pieces () continue; } - shared_ptr decoder; - optional frc; - - /* FFmpeg */ - shared_ptr fc = dynamic_pointer_cast (i); - if (fc) { - decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast)); - frc = FrameRateChange (fc->active_video_frame_rate(), _film->video_frame_rate()); - } - - shared_ptr dc = dynamic_pointer_cast (i); - if (dc) { - decoder.reset (new DCPDecoder (dc, _film->log(), _fast)); - frc = FrameRateChange (dc->active_video_frame_rate(), _film->video_frame_rate()); - } - - /* ImageContent */ - shared_ptr ic = dynamic_pointer_cast (i); - if (ic) { - /* See if we can re-use an old ImageDecoder */ - for (list >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) { - shared_ptr imd = dynamic_pointer_cast ((*j)->decoder); - if (imd && imd->content() == ic) { - decoder = imd; - } - } - - if (!decoder) { - decoder.reset (new ImageDecoder (ic, _film->log())); - } - - frc = FrameRateChange (ic->active_video_frame_rate(), _film->video_frame_rate()); - } - - /* It's questionable whether subtitle content should have a video frame rate; perhaps - it should be assumed that any subtitle content has been prepared at the same rate - as simultaneous video content (like we do with audio). - */ - - /* TextSubtitleContent */ - shared_ptr rc = dynamic_pointer_cast (i); - if (rc) { - decoder.reset (new TextSubtitleDecoder (rc)); - frc = FrameRateChange (rc->active_video_frame_rate(), _film->video_frame_rate()); - } - - /* DCPSubtitleContent */ - shared_ptr dsc = dynamic_pointer_cast (i); - if (dsc) { - decoder.reset (new DCPSubtitleDecoder (dsc)); - frc = FrameRateChange (dsc->active_video_frame_rate(), _film->video_frame_rate()); - } - - /* VideoMXFContent */ - shared_ptr vmc = dynamic_pointer_cast (i); - if (vmc) { - decoder.reset (new VideoMXFDecoder (vmc, _film->log())); - frc = FrameRateChange (vmc->active_video_frame_rate(), _film->video_frame_rate()); - } + shared_ptr decoder = decoder_factory (i, old_image_decoders, _film->log(), _fast); + FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate()); if (!decoder) { /* Not something that we can decode; e.g. Atmos content */ @@ -202,7 +147,7 @@ Player::setup_pieces () decoder->audio->set_ignore (); } - _pieces.push_back (shared_ptr (new Piece (i, decoder, frc.get ()))); + _pieces.push_back (shared_ptr (new Piece (i, decoder, frc))); } _have_valid_pieces = true; diff --git a/src/lib/wscript b/src/lib/wscript index 6bfd21ce8..658abb987 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -55,6 +55,7 @@ sources = """ dcp_video.cc dcpomatic_socket.cc dcpomatic_time.cc + decoder_factory.cc dolby_cp750.cc emailer.cc encoder.cc diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 52b23f5a2..31ee2c477 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -34,6 +34,7 @@ #include "lib/dcp_subtitle_decoder.h" #include "lib/dcp_content.h" #include "lib/subtitle_content.h" +#include "lib/decoder_factory.h" #include #include @@ -384,17 +385,8 @@ SubtitlePanel::subtitle_view_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr decoder; - - shared_ptr sr = dynamic_pointer_cast (c.front ()); - if (sr) { - decoder.reset (new TextSubtitleDecoder (sr)); - } - - shared_ptr dc = dynamic_pointer_cast (c.front ()); - if (dc) { - decoder.reset (new DCPSubtitleDecoder (dc)); - } + list > image_decoders; + shared_ptr decoder = decoder_factory (c.front(), image_decoders, _parent->film()->log(), false); if (decoder) { _subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); -- 2.30.2