/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ 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.
- This program is distributed in the hope that it will be useful,
+ 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 this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#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"
#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 <dcp/reel.h>
#include <dcp/reel_sound_asset.h>
#include <dcp/reel_subtitle_asset.h>
#include <dcp/reel_picture_asset.h>
#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
#include <stdint.h>
#include <algorithm>
#include <iostream>
using std::make_pair;
using std::copy;
using boost::shared_ptr;
+using boost::make_shared;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
void
Player::setup_pieces ()
{
- list<shared_ptr<Piece> > old_pieces = _pieces;
_pieces.clear ();
BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
continue;
}
- shared_ptr<Decoder> decoder;
- optional<FrameRateChange> frc;
-
- /* FFmpeg */
- shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i);
- if (fc) {
- decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast));
- frc = FrameRateChange (fc->active_video_frame_rate(), _film->video_frame_rate());
- }
-
- shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (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<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
- if (ic) {
- /* See if we can re-use an old ImageDecoder */
- for (list<shared_ptr<Piece> >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) {
- shared_ptr<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> ((*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<const TextSubtitleContent> rc = dynamic_pointer_cast<const TextSubtitleContent> (i);
- if (rc) {
- decoder.reset (new TextSubtitleDecoder (rc));
- frc = FrameRateChange (rc->active_video_frame_rate(), _film->video_frame_rate());
- }
-
- /* DCPSubtitleContent */
- shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
- if (dsc) {
- decoder.reset (new DCPSubtitleDecoder (dsc));
- frc = FrameRateChange (dsc->active_video_frame_rate(), _film->video_frame_rate());
- }
-
- /* VideoMXFContent */
- shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (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 = decoder_factory (i, _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 */
decoder->audio->set_ignore ();
}
- _pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc.get ())));
+ _pieces.push_back (make_shared<Piece> (i, decoder, frc));
}
_have_valid_pieces = true;
{
return shared_ptr<PlayerVideo> (
new PlayerVideo (
- shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
+ make_shared<RawImageProxy> (_black_image),
time,
Crop (),
optional<double> (),
shared_ptr<PlayerVideo> (
new PlayerVideo (
i->image,
- content_video_to_dcp (piece, i->frame),
+ time,
piece->content->video->crop (),
- piece->content->video->fade (i->frame),
+ piece->content->video->fade (i->frame.index()),
image_size,
_video_container_size,
- i->eyes,
+ i->frame.eyes(),
i->part,
piece->content->video->colour_conversion ()
)
Frame const length_frames = length.frames_round (_film->audio_frame_rate ());
- shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
+ shared_ptr<AudioBuffers> audio = make_shared<AudioBuffers> (_film->audio_channels(), length_frames);
audio->make_silent ();
list<shared_ptr<Piece> > ov = overlaps (time, time + length, has_audio);
/* Gain */
if (i->content->audio->gain() != 0) {
- shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
+ shared_ptr<AudioBuffers> gain = make_shared<AudioBuffers> (all.audio);
gain->apply_gain (i->content->audio->gain ());
all.audio = gain;
}
/* Remap channels */
- shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames()));
+ shared_ptr<AudioBuffers> dcp_mapped = make_shared<AudioBuffers> (_film->audio_channels(), all.audio->frames());
dcp_mapped->make_silent ();
AudioMapping map = j->mapping ();
for (int i = 0; i < map.input_channels(); ++i) {
projects / dcpomatic.git / blobdiff