}
}
- av_free_packet (&_packet);
+ av_packet_unref (&_packet);
if (_first_video && got_all_audio && _subtitle_streams.empty ()) {
/* All done */
}
}
+ /* 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) {
- i->first->add_subtitle (
- ContentTimePeriod (
- i->second.get (),
- 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))
+ )
+ );
+ }
}
}
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 */
- stream->add_subtitle (ContentTimePeriod (last->second.get (), 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<ContentTime> ();
+ _last_subtitle_start[stream] = optional<SubtitleStart> ();
} else {
/* This is just another subtitle, so we start again */
- _last_subtitle_start[stream] = period.from;
+ _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[stream] = 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);
}
}
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
+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;
+ }
}
projects / dcpomatic.git / blobdiff