Fix crash introduced in previous commit.

[dcpomatic.git] / src / lib / ffmpeg_examiner.cc

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 3c6d185f43f0991d3716ad31e12dfb7b5f9dfd20..51ade8e89cb844336baa4dfac51ef56be3f4fbea 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -26,8 +26,8 @@
 #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>
@@ -37,7 +37,7 @@ extern "C" {
 #include <libavutil/display.h>
 #include <libavutil/eval.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
@@ -91,7 +91,8 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                                        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
                                        )
                                );
 
@@ -181,7 +182,6 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                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;
@@ -195,7 +195,9 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                        _rotation = - av_display_rotation_get ((int32_t*) displaymatrix);
                }
 
-               _rotation = *_rotation - 360 * floor (*_rotation / 360 + 0.9 / 360);
+               if (_rotation) {
+                       _rotation = *_rotation - 360 * floor (*_rotation / 360 + 0.9 / 360);
+               }
        }
 
        LOG_GENERAL("Temporal reference was %1", temporal_reference);
@@ -221,22 +223,25 @@ FFmpegExaminer::video_packet (AVCodecContext* context, string& temporal_referenc
                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, _video_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 (_video_frame, _format_context->streams[_video_stream.get()]);
@@ -301,7 +306,7 @@ FFmpegExaminer::video_frame_rate () const
 }
 
 
-dcp::Size
+optional<dcp::Size>
 FFmpegExaminer::video_size () const
 {
        return dcp::Size (video_codec_context()->width, video_codec_context()->height);
@@ -379,6 +384,19 @@ FFmpegExaminer::bits_per_pixel () const
 }
 
 
+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
 {
@@ -486,6 +504,7 @@ 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 };
 }