/*
Copyright (C) 2013-2015 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 "ffmpeg_audio_stream.h"
#include "ffmpeg_subtitle_stream.h"
#include "util.h"
-#include "safe_stringstream.h"
#include <boost/foreach.hpp>
#include <iostream>
s->codec->channel_layout = av_get_default_channel_layout (s->codec->channels);
}
+ DCPOMATIC_ASSERT (_format_context->duration != AV_NOPTS_VALUE);
+ DCPOMATIC_ASSERT (s->codec->codec);
+ DCPOMATIC_ASSERT (s->codec->codec->name);
+
_audio_streams.push_back (
shared_ptr<FFmpegAudioStream> (
- new FFmpegAudioStream (audio_stream_name (s), s->id, s->codec->sample_rate, s->codec->channels)
+ new FFmpegAudioStream (
+ stream_name (s),
+ s->codec->codec->name,
+ s->id,
+ s->codec->sample_rate,
+ (double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate,
+ s->codec->channels
+ )
)
);
if (job) {
if (_need_video_length) {
job->sub (_("Finding length and subtitles"));
- } else {
+ } else if (!_subtitle_streams.empty()) {
job->sub (_("Finding subtitles"));
+ } else {
+ job->sub (_("Finding length"));
}
}
/* Finish off any hanging subtitles at the end */
for (LastSubtitleMap::const_iterator i = _last_subtitle_start.begin(); i != _last_subtitle_start.end(); ++i) {
if (i->second) {
- if (i->second->image) {
- i->first->add_image_subtitle (
- i->second->id,
- ContentTimePeriod (
- i->second->time,
- ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24))
- )
- );
- } else {
- i->first->add_text_subtitle (
+ if (i->first->unknown_to (i->second->id)) {
+ i->first->set_subtitle_to (
i->second->id,
- ContentTimePeriod (
- i->second->time,
- ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24))
- )
+ ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24))
);
}
}
FFmpegSubtitlePeriod const period = subtitle_period (sub);
bool const starts_image = subtitle_starts_image (sub);
+ /* Some streams (notably DVB streams) have subtitles which have a specified end time
+ but which are then stopped earlier than this by a zero-num_rect subtitle.
+ */
+
LastSubtitleMap::iterator last = _last_subtitle_start.find (stream);
- if (last != _last_subtitle_start.end() && last->second) {
- /* We have seen the start of a subtitle but not yet the end. Whatever this is
- finishes the previous subtitle, so add it */
- if (last->second->image) {
- stream->add_image_subtitle (last->second->id, ContentTimePeriod (last->second->time, period.from));
+ if (sub.num_rects == 0 && last != _last_subtitle_start.end() && last->second) {
+ /* Set (or fix) the `to' time for the last subtitle */
+ stream->set_subtitle_to (last->second->id, period.from);
+ _last_subtitle_start[stream] = optional<SubtitleStart> ();
+ } else if (sub.num_rects > 0) {
+ /* Add a subtitle; if we don't know the `to' time we set it to the from time and fix it later */
+ if (starts_image) {
+ stream->add_image_subtitle (id, ContentTimePeriod (period.from, period.to.get_value_or (period.from)));
} else {
- stream->add_text_subtitle (last->second->id, ContentTimePeriod (last->second->time, period.from));
- }
- if (sub.num_rects == 0) {
- /* This is a `proper' end-of-subtitle */
- _last_subtitle_start[stream] = optional<SubtitleStart> ();
- } else {
- /* This is just another subtitle, so we start again */
- _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
- }
- } else if (sub.num_rects == 1) {
- if (period.to) {
- if (starts_image) {
- stream->add_image_subtitle (id, ContentTimePeriod (period.from, period.to.get ()));
- } else {
- stream->add_text_subtitle (id, ContentTimePeriod (period.from, period.to.get ()));
- }
- } else {
- _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
+ stream->add_text_subtitle (id, ContentTimePeriod (period.from, period.to.get_value_or (period.from)));
}
+
+ _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
}
for (unsigned int i = 0; i < sub.num_rects; ++i) {
return double (sar.num) / sar.den;
}
-string
-FFmpegExaminer::audio_stream_name (AVStream* s) const
-{
- SafeStringStream n;
-
- n << stream_name (s);
-
- if (!n.str().empty()) {
- n << "; ";
- }
-
- n << s->codec->channels << " channels";
-
- return n.str ();
-}
-
string
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
{
- SafeStringStream n;
-
- n << stream_name (s);
+ string n = stream_name (s);
- if (n.str().empty()) {
- n << _("unknown");
+ if (n.empty()) {
+ n = _("unknown");
}
- return n.str ();
+ return n;
}
string
FFmpegExaminer::stream_name (AVStream* s) const
{
- SafeStringStream n;
+ string n;
if (s->metadata) {
AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);
if (lang) {
- n << lang->value;
+ n = lang->value;
}
AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0);
if (title) {
- if (!n.str().empty()) {
- n << " ";
+ if (!n.empty()) {
+ n += " ";
}
- n << title->value;
+ n += title->value;
}
}
- return n.str ();
+ return n;
}
int
projects / dcpomatic.git / blobdiff