/*
Copyright (C) 2012-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 "raw_image_proxy.h"
#include "video_decoder.h"
#include "film.h"
-#include "md5_digester.h"
#include "audio_decoder.h"
#include "compose.hpp"
+#include "subtitle_content.h"
+#include "audio_content.h"
#include <dcp/subtitle_string.h>
#include <sub/ssa_reader.h>
#include <sub/subtitle.h>
using boost::shared_ptr;
using boost::is_any_of;
using boost::split;
+using boost::optional;
+using boost::dynamic_pointer_cast;
using dcp::Size;
-FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log, bool fast)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
: FFmpeg (c)
, _log (log)
{
}
if (c->audio) {
- audio.reset (new AudioDecoder (this, c->audio, fast, log));
+ audio.reset (new AudioDecoder (this, c->audio, log));
}
if (c->subtitle) {
/* XXX: should we reset _packet.data and size after each *_decode_* call? */
- while (decode_video_packet ()) {}
+ while (video && decode_video_packet ()) {}
- decode_audio_packet ();
- audio->flush ();
+ if (audio) {
+ decode_audio_packet ();
+ audio->flush ();
+ }
}
bool
/* Maybe we should fail here, but for now we'll just finish off instead */
char buf[256];
av_strerror (r, buf, sizeof(buf));
- LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), buf, r);
+ LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), &buf[0], r);
}
flush ();
int sample = 0;
int channel = 0;
for (int i = 0; i < total_samples; ++i) {
- audio->data(channel)[sample] = static_cast<float>(*p++) / (1 << 31);
+ audio->data(channel)[sample] = static_cast<float>(*p++) / 2147483648;
++channel;
if (channel == stream->channels()) {
int32_t** p = reinterpret_cast<int32_t **> (_frame->data);
for (int i = 0; i < stream->channels(); ++i) {
for (int j = 0; j < frames; ++j) {
- audio->data(i)[j] = static_cast<float>(p[i][j]) / (1 << 31);
+ audio->data(i)[j] = static_cast<float>(p[i][j]) / 2147483648;
}
}
}
void
FFmpegDecoder::seek (ContentTime time, bool accurate)
{
- video->seek (time, accurate);
- audio->seek (time, accurate);
- subtitle->seek (time, accurate);
+ if (video) {
+ video->seek (time, accurate);
+ }
+
+ if (audio) {
+ audio->seek (time, accurate);
+ }
+
+ if (subtitle) {
+ subtitle->seek (time, accurate);
+ }
/* If we are doing an `accurate' seek, we need to use pre-roll, as
we don't really know what the seek will give us.
http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html
*/
- DCPOMATIC_ASSERT (_video_stream);
+ optional<int> stream;
+
+ if (_video_stream) {
+ stream = _video_stream;
+ } else {
+ shared_ptr<FFmpegAudioStream> s = dynamic_pointer_cast<FFmpegAudioStream> (_ffmpeg_content->audio->stream ());
+ if (s) {
+ stream = s->index (_format_context);
+ }
+ }
+
+ DCPOMATIC_ASSERT (stream);
ContentTime u = time - _pts_offset;
if (u < ContentTime ()) {
}
av_seek_frame (
_format_context,
- _video_stream.get(),
- u.seconds() / av_q2d (_format_context->streams[_video_stream.get()]->time_base),
+ stream.get(),
+ u.seconds() / av_q2d (_format_context->streams[stream.get()]->time_base),
AVSEEK_FLAG_BACKWARD
);
- avcodec_flush_buffers (video_codec_context());
+ if (video_codec_context ()) {
+ avcodec_flush_buffers (video_codec_context());
+ }
/* XXX: should be flushing audio buffers? */
if (decode_result < 0) {
/* avcodec_decode_audio4 can sometimes return an error even though it has decoded
some valid data; for example dca_subframe_footer can return AVERROR_INVALIDDATA
- if it overreads the auxiliary data. ffplay carries on if frame_finished is true,
+ if it overreads the auxiliary data. ffplay carries on if frame_finished is true,
even in the face of such an error, so I think we should too.
Returning from the method here caused mantis #352.
sub::RawSubtitle base;
list<sub::RawSubtitle> raw = sub::SSAReader::parse_line (base, bits[9]);
- list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (raw);
-
- /* XXX: lots of this is copied from TextSubtitle; there should probably be some sharing */
- /* Highest line index in this subtitle */
- int highest = 0;
- BOOST_FOREACH (sub::Subtitle i, subs) {
- BOOST_FOREACH (sub::Line j, i.lines) {
- DCPOMATIC_ASSERT (j.vertical_position.reference && j.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
- DCPOMATIC_ASSERT (j.vertical_position.line);
- highest = max (highest, j.vertical_position.line.get());
- }
+ BOOST_FOREACH (sub::Subtitle const & i, sub::collect<list<sub::Subtitle> > (raw)) {
+ subtitle->give_text (period, i);
}
-
- list<dcp::SubtitleString> ss;
-
- BOOST_FOREACH (sub::Subtitle i, sub::collect<list<sub::Subtitle> > (sub::SSAReader::parse_line (base, bits[9]))) {
- BOOST_FOREACH (sub::Line j, i.lines) {
- BOOST_FOREACH (sub::Block k, j.blocks) {
- ss.push_back (
- dcp::SubtitleString (
- boost::optional<string> (),
- k.italic,
- k.bold,
- dcp::Colour (255, 255, 255),
- /* 48pt is 1/22nd of the screen height */
- 48,
- 1,
- dcp::Time (i.from.seconds(), 1000),
- dcp::Time (i.to.seconds(), 1000),
- 0,
- dcp::HALIGN_CENTER,
- /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
- of the screen a bit to a pleasing degree.
- */
- 1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22),
- dcp::VALIGN_TOP,
- dcp::DIRECTION_LTR,
- k.text,
- static_cast<dcp::Effect> (0),
- dcp::Colour (255, 255, 255),
- dcp::Time (),
- dcp::Time ()
- )
- );
- }
- }
- }
-
- subtitle->give_text (period, ss);
}
projects / dcpomatic.git / blobdiff