X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.cc;h=7b23221011474a246675977f9f7b260b29199484;hp=f2b72059b9a013f59bad2c66e7ad56baa1dc207d;hb=e29ce33a36c2e20444d57196defc86d5072bce81;hpb=35409488fd54aacefa6858dce4b02a576170e76e diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index f2b72059b..7b2322101 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -18,18 +18,20 @@ */ -#include "ffmpeg_image_proxy.h" + +#include "compose.hpp" #include "cross.h" -#include "exceptions.h" #include "dcpomatic_socket.h" +#include "exceptions.h" +#include "ffmpeg_image_proxy.h" #include "image.h" -#include "compose.hpp" #include "util.h" #include "warnings.h" #include extern "C" { #include #include +#include } DCPOMATIC_DISABLE_WARNINGS #include @@ -38,37 +40,43 @@ DCPOMATIC_ENABLE_WARNINGS #include "i18n.h" -using std::string; + using std::cout; -using std::pair; -using std::min; using std::make_pair; -using boost::shared_ptr; +using std::make_shared; +using std::min; +using std::pair; +using std::shared_ptr; +using std::string; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::raw_convert; -FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path) + +FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path, VideoRange video_range) : _data (path) + , _video_range (video_range) , _pos (0) , _path (path) { } -FFmpegImageProxy::FFmpegImageProxy (dcp::Data data) +FFmpegImageProxy::FFmpegImageProxy (dcp::ArrayData data, VideoRange video_range) : _data (data) + , _video_range (video_range) , _pos (0) { } -FFmpegImageProxy::FFmpegImageProxy (shared_ptr, shared_ptr socket) - : _pos (0) +FFmpegImageProxy::FFmpegImageProxy (shared_ptr node, shared_ptr socket) + : _video_range (string_to_video_range(node->string_child("VideoRange"))) + , _pos (0) { uint32_t const size = socket->read_uint32 (); - _data = dcp::Data (size); - socket->read (_data.data().get(), size); + _data = dcp::ArrayData (size); + socket->read (_data.data(), size); } static int @@ -90,7 +98,7 @@ FFmpegImageProxy::avio_read (uint8_t* buffer, int const amount) if (to_do == 0) { return AVERROR_EOF; } - memcpy (buffer, _data.data().get() + _pos, to_do); + memcpy (buffer, _data.data() + _pos, to_do); _pos += to_do; return to_do; } @@ -115,11 +123,12 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence) return _pos; } -DCPOMATIC_DISABLE_WARNINGS ImageProxy::Result FFmpegImageProxy::image (optional) const { + auto constexpr name_for_errors = "FFmpegImageProxy::image"; + boost::mutex::scoped_lock lm (_mutex); if (_image) { @@ -158,41 +167,61 @@ FFmpegImageProxy::image (optional) const } } - if (avformat_find_stream_info(format_context, 0) < 0) { - throw DecodeError (_("could not find stream information")); + int r = avformat_find_stream_info(format_context, 0); + if (r < 0) { + throw DecodeError (N_("avcodec_find_stream_info"), name_for_errors, r); } DCPOMATIC_ASSERT (format_context->nb_streams == 1); AVFrame* frame = av_frame_alloc (); if (!frame) { - throw DecodeError (N_("could not allocate frame")); + std::bad_alloc (); } - AVCodecContext* codec_context = format_context->streams[0]->codec; - AVCodec* codec = avcodec_find_decoder (codec_context->codec_id); + auto codec = avcodec_find_decoder (format_context->streams[0]->codecpar->codec_id); DCPOMATIC_ASSERT (codec); - if (avcodec_open2 (codec_context, codec, 0) < 0) { - throw DecodeError (N_("could not open decoder")); + auto context = avcodec_alloc_context3 (codec); + if (!context) { + throw DecodeError (N_("avcodec_alloc_context3"), name_for_errors); + } + + r = avcodec_open2 (context, codec, 0); + if (r < 0) { + throw DecodeError (N_("avcodec_open2"), name_for_errors, r); } AVPacket packet; - int r = av_read_frame (format_context, &packet); + r = av_read_frame (format_context, &packet); + if (r < 0) { + throw DecodeError (N_("av_read_frame"), name_for_errors, r); + } + + r = avcodec_send_packet (context, &packet); if (r < 0) { - throw DecodeError (N_("could not read frame")); + throw DecodeError (N_("avcodec_send_packet"), name_for_errors, r); } - int frame_finished; - if (avcodec_decode_video2(codec_context, frame, &frame_finished, &packet) < 0 || !frame_finished) { - throw DecodeError (N_("could not decode video")); + r = avcodec_receive_frame (context, frame); + if (r < 0) { + throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r); } - _image.reset (new Image (frame)); + auto const pix_fmt = static_cast(frame->format); + + _image = make_shared(frame); + if (_video_range == VideoRange::VIDEO && av_pix_fmt_desc_get(pix_fmt)->flags & AV_PIX_FMT_FLAG_RGB) { + /* Asking for the video range to be converted by libswscale (in Image) will not work for + * RGB sources since that method only processes video range in YUV and greyscale. So we have + * to do it ourselves here. + */ + _image->video_range_to_full_range(); + } av_packet_unref (&packet); av_frame_free (&frame); - avcodec_close (codec_context); + avcodec_free_context (&context); avformat_close_input (&format_context); av_free (avio_context->buffer); av_free (avio_context); @@ -200,19 +229,19 @@ FFmpegImageProxy::image (optional) const return Result (_image, 0); } -DCPOMATIC_ENABLE_WARNINGS void FFmpegImageProxy::add_metadata (xmlpp::Node* node) const { node->add_child("Type")->add_child_text (N_("FFmpeg")); + node->add_child("VideoRange")->add_child_text(video_range_to_string(_video_range)); } void FFmpegImageProxy::write_to_socket (shared_ptr socket) const { socket->write (_data.size()); - socket->write (_data.data().get(), _data.size()); + socket->write (_data.data(), _data.size()); } bool @@ -223,11 +252,7 @@ FFmpegImageProxy::same (shared_ptr other) const return false; } - if (_data.size() != mp->_data.size()) { - return false; - } - - return memcmp (_data.data().get(), mp->_data.data().get(), _data.size()) == 0; + return _data == mp->_data; } size_t