#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) {
- subtitle.reset (
- new SubtitleDecoder (
- this,
- c->subtitle,
- bind (&FFmpegDecoder::image_subtitles_during, this, _1, _2),
- bind (&FFmpegDecoder::text_subtitles_during, this, _1, _2)
- )
- );
+ subtitle.reset (new SubtitleDecoder (this, c->subtitle, log));
}
}
}
}
-bool
-FFmpegDecoder::pass (PassReason reason, bool accurate)
+void
+FFmpegDecoder::pass ()
{
int r = av_read_frame (_format_context, &_packet);
/* 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 ();
- return true;
+ return;
}
int const si = _packet.stream_index;
shared_ptr<const FFmpegContent> fc = _ffmpeg_content;
- if (_video_stream && si == _video_stream.get() && !video->ignore() && (accurate || reason != PASS_REASON_SUBTITLE)) {
+ if (_video_stream && si == _video_stream.get() && !video->ignore()) {
decode_video_packet ();
} else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) {
decode_subtitle_packet ();
- } else if (accurate || reason != PASS_REASON_SUBTITLE) {
+ } else {
decode_audio_packet ();
}
av_packet_unref (&_packet);
- return false;
}
/** @param data pointer to array of pointers to buffers.
void
FFmpegDecoder::seek (ContentTime time, bool 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.
ct += ContentTime::from_frames (remove, (*stream)->frame_rate ());
}
- if (data->frames() > 0) {
- audio->give (*stream, data, ct);
+ if (ct < ContentTime()) {
+ LOG_WARNING ("Crazy timestamp %1", to_string (ct));
+ }
+
+ /* Give this data provided there is some, and its time is sane */
+ if (ct >= ContentTime() && data->frames() > 0) {
+ audio->emit (*stream, data, ct);
}
}
if (i->second != AV_NOPTS_VALUE) {
double const pts = i->second * av_q2d (_format_context->streams[_video_stream.get()]->time_base) + _pts_offset.seconds ();
- video->give (
+ video->emit (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
llrint (pts * _ffmpeg_content->active_video_frame_rate ())
);
FFmpegSubtitlePeriod sub_period = subtitle_period (sub);
ContentTimePeriod period;
period.from = sub_period.from + _pts_offset;
- if (sub_period.to) {
- /* We already know the subtitle period `to' time */
- period.to = sub_period.to.get() + _pts_offset;
- } else {
- /* We have to look up the `to' time in the stream's records */
- period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (subtitle_id (sub));
- }
+ /* We can't trust the `to' time from sub_period as there are some decoders which
+ give a sub_period time for `to' which is subsequently overridden by a `stop' subtitle;
+ see also FFmpegExaminer.
+ */
+ period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (subtitle_id (sub));
for (unsigned int i = 0; i < sub.num_rects; ++i) {
AVSubtitleRect const * rect = sub.rects[i];
avsubtitle_free (&sub);
}
-list<ContentTimePeriod>
-FFmpegDecoder::image_subtitles_during (ContentTimePeriod p, bool starting) const
-{
- return _ffmpeg_content->image_subtitles_during (p, starting);
-}
-
-list<ContentTimePeriod>
-FFmpegDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
-{
- return _ffmpeg_content->text_subtitles_during (p, starting);
-}
-
void
FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period)
{
out_p += image->stride()[0] / sizeof (uint32_t);
}
- dcp::Size const vs = _ffmpeg_content->video->size ();
+ int const target_width = subtitle_codec_context()->width;
+ int const target_height = subtitle_codec_context()->height;
dcpomatic::Rect<double> const scaled_rect (
- static_cast<double> (rect->x) / vs.width,
- static_cast<double> (rect->y) / vs.height,
- static_cast<double> (rect->w) / vs.width,
- static_cast<double> (rect->h) / vs.height
+ static_cast<double> (rect->x) / target_width,
+ static_cast<double> (rect->y) / target_height,
+ static_cast<double> (rect->w) / target_width,
+ static_cast<double> (rect->h) / target_height
);
- subtitle->give_image (period, image, scaled_rect);
+ subtitle->emit_image (period, image, scaled_rect);
}
void
list<sub::RawSubtitle> raw = sub::SSAReader::parse_line (base, bits[9]);
BOOST_FOREACH (sub::Subtitle const & i, sub::collect<list<sub::Subtitle> > (raw)) {
- subtitle->give_text (period, i);
+ subtitle->emit_text (period, i);
}
}
projects / dcpomatic.git / blobdiff