X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.cc;h=f513eef2d57cbef6dc58c243f065c797905639eb;hp=5e3b725cf3c100580d29d31cbf0b006f4fdea2fd;hb=182b9d2e2feb6545592868606aaf0f0146095481;hpb=e5ae44fe8287c6a5f91c8f9dfced7cb661f0d79b diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index 5e3b725cf..f513eef2d 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -18,57 +18,59 @@ */ -#include "ffmpeg_image_proxy.h" + +#include "compose.hpp" #include "cross.h" -#include "exceptions.h" +#include "dcpomatic_assert.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 "memory_util.h" #include +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include #include } -DCPOMATIC_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" -using std::string; + using std::cout; -using std::pair; -using std::min; using std::make_pair; +using std::make_shared; +using std::min; +using std::pair; using std::shared_ptr; +using std::string; using boost::optional; using std::dynamic_pointer_cast; using dcp::raw_convert; -FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path, VideoRange video_range) + +FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path) : _data (path) - , _video_range (video_range) , _pos (0) , _path (path) { } -FFmpegImageProxy::FFmpegImageProxy (dcp::ArrayData data, VideoRange video_range) +FFmpegImageProxy::FFmpegImageProxy (dcp::ArrayData data) : _data (data) - , _video_range (video_range) , _pos (0) { } -FFmpegImageProxy::FFmpegImageProxy (shared_ptr node, shared_ptr socket) - : _video_range (string_to_video_range(node->string_child("VideoRange"))) - , _pos (0) +FFmpegImageProxy::FFmpegImageProxy (shared_ptr socket) + : _pos (0) { uint32_t const size = socket->read_uint32 (); _data = dcp::ArrayData (size); @@ -119,10 +121,9 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence) return _pos; } -DCPOMATIC_DISABLE_WARNINGS ImageProxy::Result -FFmpegImageProxy::image (optional) const +FFmpegImageProxy::image (Image::Alignment alignment, optional) const { auto constexpr name_for_errors = "FFmpegImageProxy::image"; @@ -133,11 +134,11 @@ FFmpegImageProxy::image (optional) const } uint8_t* avio_buffer = static_cast (wrapped_av_malloc(4096)); - AVIOContext* avio_context = avio_alloc_context (avio_buffer, 4096, 0, const_cast(this), avio_read_wrapper, 0, avio_seek_wrapper); + auto avio_context = avio_alloc_context (avio_buffer, 4096, 0, const_cast(this), avio_read_wrapper, 0, avio_seek_wrapper); AVFormatContext* format_context = avformat_alloc_context (); format_context->pb = avio_context; - AVDictionary* options = 0; + AVDictionary* options = nullptr; /* These durations are in microseconds, and represent how far into the content file we will look for streams. */ @@ -150,7 +151,7 @@ FFmpegImageProxy::image (optional) const directly from the file). This code just does enough to allow the probe code to take a hint from "foo.tga" and so try targa format. */ - AVInputFormat* f = av_find_input_format ("image2"); + auto f = av_find_input_format ("image2"); format_context = avformat_alloc_context (); format_context->pb = avio_context; format_context->iformat = f; @@ -166,50 +167,50 @@ FFmpegImageProxy::image (optional) const int r = avformat_find_stream_info(format_context, 0); if (r < 0) { - throw DecodeError (N_("avcodec_find_stream_info"), name_for_errors, r); + throw DecodeError (N_("avcodec_find_stream_info"), name_for_errors, r, *_path); } DCPOMATIC_ASSERT (format_context->nb_streams == 1); - AVFrame* frame = av_frame_alloc (); + auto frame = av_frame_alloc (); if (!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); - r = avcodec_open2 (codec_context, codec, 0); + auto context = avcodec_alloc_context3 (codec); + if (!context) { + throw DecodeError (N_("avcodec_alloc_context3"), name_for_errors, *_path); + } + + r = avcodec_open2 (context, codec, 0); if (r < 0) { - throw DecodeError (N_("avcodec_open2"), name_for_errors, r); + throw DecodeError (N_("avcodec_open2"), name_for_errors, r, *_path); } AVPacket packet; r = av_read_frame (format_context, &packet); if (r < 0) { - throw DecodeError (N_("av_read_frame"), name_for_errors, r); + throw DecodeError (N_("av_read_frame"), name_for_errors, r, *_path); } - int frame_finished; - if (avcodec_decode_video2(codec_context, frame, &frame_finished, &packet) < 0 || !frame_finished) { - throw DecodeError (N_("avcodec_decode_video2"), name_for_errors, r); + r = avcodec_send_packet (context, &packet); + if (r < 0) { + throw DecodeError (N_("avcodec_send_packet"), name_for_errors, r, *_path); } - AVPixelFormat const pix_fmt = static_cast(frame->format); - - _image.reset (new Image(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(); + r = avcodec_receive_frame (context, frame); + if (r < 0) { + throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path); } + _image = make_shared(frame, alignment); + 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); @@ -217,13 +218,11 @@ 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 @@ -236,7 +235,7 @@ FFmpegImageProxy::write_to_socket (shared_ptr socket) const bool FFmpegImageProxy::same (shared_ptr other) const { - shared_ptr mp = dynamic_pointer_cast (other); + auto mp = dynamic_pointer_cast(other); if (!mp) { return false; }