FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
: FFmpeg (c)
, _log (log)
+ , _have_current_subtitle (false)
{
if (c->video) {
video.reset (new VideoDecoder (this, c, 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)
+FFmpegDecoder::pass ()
{
int r = av_read_frame (_format_context, &_packet);
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 ();
}
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);
- }
+ Decoder::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.
avcodec_flush_buffers (video_codec_context());
}
- /* XXX: should be flushing audio buffers? */
+ BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, ffmpeg_content()->ffmpeg_audio_streams()) {
+ avcodec_flush_buffers (i->stream(_format_context)->codec);
+ }
if (subtitle_codec_context ()) {
avcodec_flush_buffers (subtitle_codec_context ());
}
+
+ _have_current_subtitle = false;
}
void
if (ct < ContentTime ()) {
/* Discard audio data that comes before time 0 */
Frame const remove = min (int64_t (data->frames()), (-ct).frames_ceil(double((*stream)->frame_rate ())));
- data->move (remove, 0, data->frames() - remove);
+ data->move (data->frames() - remove, remove, 0);
data->set_frames (data->frames() - remove);
ct += ContentTime::from_frames (remove, (*stream)->frame_rate ());
}
if (ct < ContentTime()) {
- LOG_WARNING ("Crazy timestamp %s", to_string (ct));
+ LOG_WARNING ("Crazy timestamp %1", to_string (ct));
}
- update_position (ct);
-
/* Give this data provided there is some, and its time is sane */
if (ct >= ContentTime() && data->frames() > 0) {
- audio->give (*stream, data, ct);
+ 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 ())
);
- update_position (ContentTime::from_seconds (pts));
} else {
LOG_WARNING_NC ("Dropping frame without PTS");
}
return;
}
+ /* Stop any current subtitle, either at the time it was supposed to stop, or now if now is sooner */
+ if (_have_current_subtitle) {
+ if (_current_subtitle_to) {
+ subtitle->emit_stop (min(*_current_subtitle_to, subtitle_period(sub).from + _pts_offset));
+ } else {
+ subtitle->emit_stop (subtitle_period(sub).from + _pts_offset);
+ }
+ _have_current_subtitle = false;
+ }
+
if (sub.num_rects <= 0) {
- /* Sometimes we get an empty AVSubtitle, which is used by some codecs to
- indicate that the previous subtitle should stop. We can ignore it here.
- */
+ /* Nothing new in this subtitle */
return;
}
source that we may have chopped off for the DCP).
*/
FFmpegSubtitlePeriod sub_period = subtitle_period (sub);
- ContentTimePeriod period;
- period.from = sub_period.from + _pts_offset;
- update_position (period.from);
+ ContentTime from;
+ from = sub_period.from + _pts_offset;
+ _have_current_subtitle = true;
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));
+ _current_subtitle_to = *sub_period.to + _pts_offset;
}
for (unsigned int i = 0; i < sub.num_rects; ++i) {
case SUBTITLE_NONE:
break;
case SUBTITLE_BITMAP:
- decode_bitmap_subtitle (rect, period);
+ decode_bitmap_subtitle (rect, from);
break;
case SUBTITLE_TEXT:
cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
break;
case SUBTITLE_ASS:
- decode_ass_subtitle (rect->ass, period);
+ decode_ass_subtitle (rect->ass, from);
break;
}
}
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)
+FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from)
{
/* Note RGBA is expressed little-endian, so the first byte in the word is R, second
G, third B, fourth A.
static_cast<double> (rect->h) / target_height
);
- subtitle->give_image (period, image, scaled_rect);
+ subtitle->emit_image_start (from, image, scaled_rect);
}
void
-FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
+FFmpegDecoder::decode_ass_subtitle (string ass, ContentTime from)
{
/* We have no styles and no Format: line, so I'm assuming that FFmpeg
produces a single format of Dialogue: lines...
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);
- }
-}
-
-void
-FFmpegDecoder::update_position (ContentTime p)
-{
- /* _position should err on the side of being too big, as then there is less
- chance that we will erroneously decide not to seek when _position > request.
- */
- if (!_position) {
- _position = p;
- } else {
- _position = max (*_position, p);
+ subtitle->emit_text_start (from, i);
}
}