#include <libavformat/avformat.h>
#include <libavutil/pixfmt.h>
#include <libavutil/pixdesc.h>
+#include <libavutil/eval.h>
+#include <libavutil/display.h>
}
#include "ffmpeg_examiner.h"
#include "ffmpeg_content.h"
s->codec->codec->name,
s->id,
s->codec->sample_rate,
- (double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate,
+ llrint ((double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate),
s->codec->channels
)
)
/* 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());
}
}
break;
}
}
+
+ if (_video_stream) {
+ /* This code taken from get_rotation() in ffmpeg:cmdutils.c */
+ AVStream* stream = _format_context->streams[*_video_stream];
+ AVDictionaryEntry* 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;
+ _rotation = av_strtod (rotate_tag->value, &tail);
+ if (*tail) {
+ _rotation = 0;
+ }
+ }
+
+ if (displaymatrix && !_rotation) {
+ _rotation = - av_display_rotation_get ((int32_t*) displaymatrix);
+ }
+
+ _rotation = *_rotation - 360 * floor (*_rotation / 360 + 0.9 / 360);
+
+ DCPOMATIC_ASSERT (fabs (*_rotation - 90 * round (*_rotation / 90)) < 2);
+ }
}
void
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.get()]));
+ return av_q2d(av_guess_frame_rate(_format_context, _format_context->streams[_video_stream.get()], 0));
}
dcp::Size
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);