#include "ffmpeg_audio_stream.h"
#include "ffmpeg_subtitle_stream.h"
#include "util.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/pixfmt.h>
#include <libavutil/pixdesc.h>
-#include <libavutil/eval.h>
+#include <libavutil/channel_layout.h>
#include <libavutil/display.h>
+#include <libavutil/eval.h>
}
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <iostream>
#include "i18n.h"
s->id,
s->codecpar->sample_rate,
llrint ((double(_format_context->duration) / AV_TIME_BASE) * s->codecpar->sample_rate),
- s->codecpar->channels
+ s->codecpar->channels,
+ s->codecpar->bits_per_raw_sample ? s->codecpar->bits_per_raw_sample : s->codecpar->bits_per_coded_sample
)
);
auto stream = _format_context->streams[*_video_stream];
auto rotate_tag = av_dict_get (stream->metadata, "rotate", 0, 0);
uint8_t* displaymatrix = av_stream_get_side_data (stream, AV_PKT_DATA_DISPLAYMATRIX, 0);
- _rotation = 0;
if (rotate_tag && *rotate_tag->value && strcmp(rotate_tag->value, "0")) {
char *tail;
return false;
}
- int r = avcodec_send_packet (context, packet);
- if (r < 0 && !(r == AVERROR_EOF && !packet)) {
- /* We could cope with AVERROR(EAGAIN) and re-send the packet but I think it should never happen.
- * AVERROR_EOF can happen during flush if we've already sent a flush packet.
- */
- throw DecodeError (N_("avcodec_send_packet"), N_("FFmpegExaminer::video_packet"), r);
- }
+ bool pending = false;
+ do {
+ int r = avcodec_send_packet (context, packet);
+ if (r < 0) {
+ LOG_WARNING("avcodec_send_packet returned %1 for a video packet", r);
+ }
- r = avcodec_receive_frame (context, _frame);
- if (r == AVERROR(EAGAIN)) {
- /* More input is required */
- return true;
- } else if (r == AVERROR_EOF) {
- /* No more output is coming */
- return false;
- }
+ /* EAGAIN means we should call avcodec_receive_frame and then re-send the same packet */
+ pending = r == AVERROR(EAGAIN);
+
+ r = avcodec_receive_frame (context, _video_frame);
+ if (r == AVERROR(EAGAIN)) {
+ /* More input is required */
+ return true;
+ } else if (r == AVERROR_EOF) {
+ /* No more output is coming */
+ return false;
+ }
+ } while (pending);
if (!_first_video) {
- _first_video = frame_time (_format_context->streams[_video_stream.get()]);
+ _first_video = frame_time (_video_frame, _format_context->streams[_video_stream.get()]);
}
if (_need_video_length) {
_video_length = frame_time (
+ _video_frame,
_format_context->streams[_video_stream.get()]
).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ());
}
if (temporal_reference.size() < (PULLDOWN_CHECK_FRAMES * 2)) {
- temporal_reference += (_frame->top_field_first ? "T" : "B");
- temporal_reference += (_frame->repeat_pict ? "3" : "2");
+ temporal_reference += (_video_frame->top_field_first ? "T" : "B");
+ temporal_reference += (_video_frame->repeat_pict ? "3" : "2");
}
return true;
}
int r = avcodec_send_packet (context, packet);
- if (r < 0 && !(r == AVERROR_EOF && !packet) && r != AVERROR(EAGAIN)) {
- /* We could cope with AVERROR(EAGAIN) and re-send the packet but I think it should never happen.
- * AVERROR_EOF can happen during flush if we've already sent a flush packet.
- * EAGAIN means we need to do avcodec_receive_frame, so just carry on and do that.
- */
- throw DecodeError (N_("avcodec_send_packet"), N_("FFmpegExaminer::audio_packet"), r);
+ if (r < 0) {
+ LOG_WARNING("avcodec_send_packet returned %1 for an audio packet", r);
+ return;
}
- if (avcodec_receive_frame (context, _frame) < 0) {
+ auto frame = audio_frame (stream);
+
+ if (avcodec_receive_frame (context, frame) < 0) {
return;
}
- stream->first_audio = frame_time (stream->stream(_format_context));
+ stream->first_audio = frame_time (frame, stream->stream(_format_context));
}
optional<ContentTime>
-FFmpegExaminer::frame_time (AVStream* s) const
+FFmpegExaminer::frame_time (AVFrame* frame, AVStream* stream) const
{
optional<ContentTime> t;
- int64_t const bet = _frame->best_effort_timestamp;
+ int64_t const bet = frame->best_effort_timestamp;
if (bet != AV_NOPTS_VALUE) {
- t = ContentTime::from_seconds (bet * av_q2d (s->time_base));
+ t = ContentTime::from_seconds (bet * av_q2d(stream->time_base));
}
return t;
}
-dcp::Size
+optional<dcp::Size>
FFmpegExaminer::video_size () const
{
return dcp::Size (video_codec_context()->width, video_codec_context()->height);
}
+bool
+FFmpegExaminer::has_alpha() const
+{
+ if (video_codec_context()->pix_fmt == -1) {
+ return false;
+ }
+
+ auto const d = av_pix_fmt_desc_get(video_codec_context()->pix_fmt);
+ DCPOMATIC_ASSERT(d);
+ return d->flags & AV_PIX_FMT_FLAG_ALPHA;
+}
+
+
bool
FFmpegExaminer::yuv () const
{
return VideoRange::FULL;
}
}
+
+
+PixelQuanta
+FFmpegExaminer::pixel_quanta () const
+{
+ auto const desc = av_pix_fmt_desc_get(video_codec_context()->pix_fmt);
+ DCPOMATIC_ASSERT (desc);
+ return { 1 << desc->log2_chroma_w, 1 << desc->log2_chroma_h };
+}
+
projects / dcpomatic.git / blobdiff