X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=64866047863afc9de6b9f9893609d84958e4c723;hb=0e9cc320b18ae53e2bf0cc8fdb9984b58e33e0ec;hp=16a89faa75a580e1ef55aa1a595d0e46fbc43d14;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 16a89faa7..648660478 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -20,6 +20,8 @@ extern "C" { #include #include +#include +#include } #include "ffmpeg_examiner.h" #include "ffmpeg_content.h" @@ -28,6 +30,8 @@ extern "C" { #include "ffmpeg_subtitle_stream.h" #include "util.h" #include "safe_stringstream.h" +#include +#include #include "i18n.h" @@ -72,13 +76,14 @@ 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 (); - } else if (job) { - job->sub (_("Finding length")); - job->set_progress_unknown (); } if (job) { - job->sub (_("Finding subtitles")); + if (_need_video_length) { + job->sub (_("Finding length and subtitles")); + } else { + job->sub (_("Finding subtitles")); + } } /* Run through until we find: @@ -90,6 +95,8 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptr c, shared_ptrset_progress_unknown (); + if (len > 0) { + job->set_progress (float (_format_context->pb->pos) / len); + } else { + job->set_progress_unknown (); + } } AVCodecContext* context = _format_context->streams[_packet.stream_index]->codec; @@ -106,10 +117,15 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptruses_index (_format_context, _packet.stream_index)) { audio_packet (context, _audio_streams[i]); } + if (!_audio_streams[i]->first_audio) { + got_all_audio = false; + } } for (size_t i = 0; i < _subtitle_streams.size(); ++i) { @@ -118,7 +134,45 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrsecond) { + 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 (video_frame_rate()) { + BOOST_FOREACH (shared_ptr i, _subtitle_streams) { + i->add_offset (pts_offset (_audio_streams, _first_video, video_frame_rate().get())); + } } } @@ -137,7 +191,7 @@ FFmpegExaminer::video_packet (AVCodecContext* context) if (_need_video_length) { _video_length = frame_time ( _format_context->streams[_video_stream] - ).get_value_or (ContentTime ()).frames (video_frame_rate().get ()); + ).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ()); } } } @@ -161,17 +215,54 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr= 0 && frame_finished) { + string id = subtitle_id (sub); FFmpegSubtitlePeriod const period = subtitle_period (sub); - if (sub.num_rects <= 0 && _last_subtitle_start) { - stream->add_subtitle (ContentTimePeriod (_last_subtitle_start.get (), period.from)); - _last_subtitle_start = optional (); + 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 (); + } 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) { - stream->add_subtitle (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 = 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) { + 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); + } + } + } + avsubtitle_free (&sub); } } @@ -189,7 +280,7 @@ FFmpegExaminer::frame_time (AVStream* s) const return t; } -optional +optional FFmpegExaminer::video_frame_rate () const { /* This use of r_frame_rate is debateable; there's a few different @@ -212,15 +303,15 @@ FFmpegExaminer::video_length () const return max (Frame (1), _video_length); } -optional +optional FFmpegExaminer::sample_aspect_ratio () const { AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream], 0); if (sar.num == 0) { /* I assume this means that we don't know */ - return optional (); + return optional (); } - return float (sar.num) / sar.den; + return double (sar.num) / sar.den; } string @@ -275,3 +366,96 @@ FFmpegExaminer::stream_name (AVStream* s) const return n.str (); } + +int +FFmpegExaminer::bits_per_pixel () const +{ + 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 +FFmpegExaminer::yuv () const +{ + switch (video_codec_context()->pix_fmt) { + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUYV422: + case AV_PIX_FMT_YUV422P: + case AV_PIX_FMT_YUV444P: + case AV_PIX_FMT_YUV410P: + case AV_PIX_FMT_YUV411P: + case AV_PIX_FMT_YUVJ420P: + case AV_PIX_FMT_YUVJ422P: + case AV_PIX_FMT_YUVJ444P: + case AV_PIX_FMT_UYVY422: + case AV_PIX_FMT_UYYVYY411: + case AV_PIX_FMT_NV12: + case AV_PIX_FMT_NV21: + case AV_PIX_FMT_YUV440P: + case AV_PIX_FMT_YUVJ440P: + case AV_PIX_FMT_YUVA420P: + case AV_PIX_FMT_YUV420P16LE: + case AV_PIX_FMT_YUV420P16BE: + case AV_PIX_FMT_YUV422P16LE: + case AV_PIX_FMT_YUV422P16BE: + case AV_PIX_FMT_YUV444P16LE: + case AV_PIX_FMT_YUV444P16BE: + case AV_PIX_FMT_YUV420P9BE: + case AV_PIX_FMT_YUV420P9LE: + case AV_PIX_FMT_YUV420P10BE: + case AV_PIX_FMT_YUV420P10LE: + case AV_PIX_FMT_YUV422P10BE: + case AV_PIX_FMT_YUV422P10LE: + case AV_PIX_FMT_YUV444P9BE: + case AV_PIX_FMT_YUV444P9LE: + case AV_PIX_FMT_YUV444P10BE: + case AV_PIX_FMT_YUV444P10LE: + case AV_PIX_FMT_YUV422P9BE: + case AV_PIX_FMT_YUV422P9LE: + case AV_PIX_FMT_YUVA420P9BE: + case AV_PIX_FMT_YUVA420P9LE: + case AV_PIX_FMT_YUVA422P9BE: + case AV_PIX_FMT_YUVA422P9LE: + case AV_PIX_FMT_YUVA444P9BE: + case AV_PIX_FMT_YUVA444P9LE: + case AV_PIX_FMT_YUVA420P10BE: + case AV_PIX_FMT_YUVA420P10LE: + case AV_PIX_FMT_YUVA422P10BE: + case AV_PIX_FMT_YUVA422P10LE: + case AV_PIX_FMT_YUVA444P10BE: + case AV_PIX_FMT_YUVA444P10LE: + case AV_PIX_FMT_YUVA420P16BE: + case AV_PIX_FMT_YUVA420P16LE: + case AV_PIX_FMT_YUVA422P16BE: + case AV_PIX_FMT_YUVA422P16LE: + case AV_PIX_FMT_YUVA444P16BE: + case AV_PIX_FMT_YUVA444P16LE: + case AV_PIX_FMT_NV16: + case AV_PIX_FMT_NV20LE: + case AV_PIX_FMT_NV20BE: + case AV_PIX_FMT_YVYU422: + case AV_PIX_FMT_YUVA444P: + case AV_PIX_FMT_YUVA422P: + case AV_PIX_FMT_YUV420P12BE: + case AV_PIX_FMT_YUV420P12LE: + case AV_PIX_FMT_YUV420P14BE: + case AV_PIX_FMT_YUV420P14LE: + case AV_PIX_FMT_YUV422P12BE: + case AV_PIX_FMT_YUV422P12LE: + case AV_PIX_FMT_YUV422P14BE: + case AV_PIX_FMT_YUV422P14LE: + case AV_PIX_FMT_YUV444P12BE: + case AV_PIX_FMT_YUV444P12LE: + case AV_PIX_FMT_YUV444P14BE: + case AV_PIX_FMT_YUV444P14LE: + case AV_PIX_FMT_YUVJ411P: + return true; + default: + return false; + } +}