X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=544cc11b91fc545d2d74426b5ab372db4933fdd1;hp=48738b91725da6cc156f901e6b3494c6d9177d10;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=22873931f874a87fcf6a0077eddbec0f97eb3423 diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 48738b917..544cc11b9 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2015 Carl Hetherington - 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 . */ @@ -29,7 +30,7 @@ extern "C" { #include "ffmpeg_audio_stream.h" #include "ffmpeg_subtitle_stream.h" #include "util.h" -#include "safe_stringstream.h" +#include #include #include @@ -61,9 +62,20 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrcodec->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 ( - 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 + ) ) ); @@ -72,17 +84,21 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrduration == AV_NOPTS_VALUE; - if (!_need_video_length) { - _video_length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get (); + if (has_video ()) { + /* 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 (); + } } 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")); } } @@ -113,7 +129,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrstreams[_packet.stream_index]->codec; - if (_packet.stream_index == _video_stream) { + if (_video_stream && _packet.stream_index == _video_stream.get()) { video_packet (context); } @@ -134,7 +150,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptr c, shared_ptrsecond) { - i->first->add_subtitle ( - i->second->id, - ContentTimePeriod ( - i->second->time, - ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24)) - ) - ); + 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)) + ) + ); + } } } @@ -159,7 +185,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptr i, _subtitle_streams) { i->add_offset (pts_offset (_audio_streams, _first_video, video_frame_rate().get())); } @@ -169,6 +195,8 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptr= 0 && frame_finished) { if (!_first_video) { - _first_video = frame_time (_format_context->streams[_video_stream]); + _first_video = frame_time (_format_context->streams[_video_stream.get()]); } if (_need_video_length) { _video_length = frame_time ( - _format_context->streams[_video_stream] + _format_context->streams[_video_stream.get()] ).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ()); } } @@ -207,25 +235,66 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr= 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 */ - stream->add_subtitle (last->second->id, ContentTimePeriod (last->second->time, period.from)); + 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 (); } else { /* This is just another subtitle, so we start again */ - _last_subtitle_start[stream] = SubtitleStart (id, period.from); + _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from); } } else if (sub.num_rects == 1) { if (period.to) { - stream->add_subtitle (id, ContentTimePeriod (period.from, period.to.get ())); + 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, period.from); + _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); } } @@ -246,11 +315,12 @@ FFmpegExaminer::frame_time (AVStream* s) const optional FFmpegExaminer::video_frame_rate () const { + DCPOMATIC_ASSERT (_video_stream); /* This use of r_frame_rate is debateable; there's a few different * frame rates in the format context, but this one seems to be the most * reliable. */ - return av_q2d (av_stream_get_r_frame_rate (_format_context->streams[_video_stream])); + return av_q2d (av_stream_get_r_frame_rate (_format_context->streams[_video_stream.get()])); } dcp::Size @@ -269,7 +339,8 @@ FFmpegExaminer::video_length () const optional FFmpegExaminer::sample_aspect_ratio () const { - AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream], 0); + DCPOMATIC_ASSERT (_video_stream); + AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream.get()], 0); if (sar.num == 0) { /* I assume this means that we don't know */ return optional (); @@ -277,26 +348,10 @@ FFmpegExaminer::sample_aspect_ratio () 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; + locked_stringstream n; n << stream_name (s); @@ -310,7 +365,7 @@ FFmpegExaminer::subtitle_stream_name (AVStream* s) const string FFmpegExaminer::stream_name (AVStream* s) const { - SafeStringStream n; + locked_stringstream n; if (s->metadata) { AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0); @@ -333,7 +388,13 @@ FFmpegExaminer::stream_name (AVStream* s) const int FFmpegExaminer::bits_per_pixel () const { - return av_get_bits_per_pixel (av_pix_fmt_desc_get (video_codec_context()->pix_fmt)); + if (video_codec_context()->pix_fmt == -1) { + throw DecodeError (_("Could not find pixel format for video.")); + } + + AVPixFmtDescriptor const * d = av_pix_fmt_desc_get (video_codec_context()->pix_fmt); + DCPOMATIC_ASSERT (d); + return av_get_bits_per_pixel (d); } bool @@ -374,8 +435,6 @@ FFmpegExaminer::yuv () const case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV422P9BE: case AV_PIX_FMT_YUV422P9LE: - case AV_PIX_FMT_YUVA422P_LIBAV: - case AV_PIX_FMT_YUVA444P_LIBAV: case AV_PIX_FMT_YUVA420P9BE: case AV_PIX_FMT_YUVA420P9LE: case AV_PIX_FMT_YUVA422P9BE: @@ -418,3 +477,9 @@ FFmpegExaminer::yuv () const return false; } } + +bool +FFmpegExaminer::has_video () const +{ + return static_cast (_video_stream); +}