#include "ffmpeg_audio_stream.h"
#include "ffmpeg_subtitle_stream.h"
#include "util.h"
-#include "safe_stringstream.h"
#include <boost/foreach.hpp>
#include <iostream>
}
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),
+ stream_name (s),
+ s->codec->codec->name,
s->id,
s->codec->sample_rate,
(double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate,
/* See if the header has duration information in it */
_need_video_length = _format_context->duration == AV_NOPTS_VALUE;
if (!_need_video_length) {
- _video_length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get ();
+ _video_length = llrint ((double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get());
}
}
- if (job) {
- if (_need_video_length) {
- job->sub (_("Finding length and subtitles"));
- } else if (!_subtitle_streams.empty()) {
- job->sub (_("Finding subtitles"));
- } else {
- job->sub (_("Finding length"));
- }
+ if (job && _need_video_length) {
+ job->sub (_("Finding length"));
}
/* Run through until we find:
* - the first video.
* - the first audio for each stream.
- * - the subtitle periods for each stream.
- *
- * We have to note subtitle periods as otherwise we have no way of knowing
- * where we should look for subtitles (video and audio are always present,
- * so they are ok).
*/
int64_t const len = _file_group.length ();
}
}
- for (size_t i = 0; i < _subtitle_streams.size(); ++i) {
- if (_subtitle_streams[i]->uses_index (_format_context, _packet.stream_index)) {
- subtitle_packet (context, _subtitle_streams[i]);
- }
- }
-
av_packet_unref (&_packet);
- if (_first_video && got_all_audio && _subtitle_streams.empty ()) {
+ if (_first_video && got_all_audio) {
/* All done */
break;
}
}
-
- /* 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 (
- i->second->id,
- ContentTimePeriod (
- i->second->time,
- ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24))
- )
- );
- }
- }
- }
-
- /* We just added subtitles to our streams without taking the PTS offset into account;
- this is because we might not know the PTS offset when the first subtitle is seen.
- Now we know the PTS offset so we can apply it to those subtitles.
- */
- if (has_video() && video_frame_rate()) {
- BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, _subtitle_streams) {
- i->add_offset (pts_offset (_audio_streams, _first_video, video_frame_rate().get()));
- }
- }
}
void
}
}
-void
-FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubtitleStream> stream)
-{
- int frame_finished;
- AVSubtitle sub;
- if (avcodec_decode_subtitle2 (context, &sub, &frame_finished, &_packet) >= 0 && frame_finished) {
- string id = subtitle_id (sub);
- FFmpegSubtitlePeriod const period = subtitle_period (sub);
- bool const starts_image = subtitle_starts_image (sub);
-
- 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));
- } 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);
- }
- }
-
- for (unsigned int i = 0; i < sub.num_rects; ++i) {
- if (sub.rects[i]->type == SUBTITLE_BITMAP) {
-#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
- uint32_t* palette = (uint32_t *) sub.rects[i]->pict.data[1];
- for (int j = 0; j < sub.rects[i]->nb_colors; ++j) {
- RGBA rgba (
- (palette[j] & 0x00ff0000) >> 16,
- (palette[j] & 0x0000ff00) >> 8,
- (palette[j] & 0x000000ff) >> 0,
- (palette[j] & 0xff000000) >> 24
- );
-
- stream->set_colour (rgba, rgba);
- }
-#else
- uint32_t* palette = (uint32_t *) sub.rects[i]->data[1];
- for (int j = 0; j < sub.rects[i]->nb_colors; ++j) {
- RGBA rgba (
- (palette[j] & 0x00ff0000) >> 16,
- (palette[j] & 0x0000ff00) >> 8,
- (palette[j] & 0x000000ff) >> 0,
- (palette[j] & 0xff000000) >> 24
- );
-
- stream->set_colour (rgba, rgba);
- }
-#endif
- }
- }
-
- avsubtitle_free (&sub);
- }
-}
-
optional<ContentTime>
FFmpegExaminer::frame_time (AVStream* s) const
{
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
+optional<int>
FFmpegExaminer::bits_per_pixel () const
{
if (video_codec_context()->pix_fmt == -1) {
- throw DecodeError (_("Could not find pixel format for video."));
+ return optional<int>();
}
AVPixFmtDescriptor const * d = av_pix_fmt_desc_get (video_codec_context()->pix_fmt);
projects / dcpomatic.git / blobdiff