ImageProxy::Result
-FFmpegImageProxy::image (optional<dcp::Size>) const
+FFmpegImageProxy::image (Image::Alignment alignment, optional<dcp::Size>) const
{
auto constexpr name_for_errors = "FFmpegImageProxy::image";
}
uint8_t* avio_buffer = static_cast<uint8_t*> (wrapped_av_malloc(4096));
- AVIOContext* avio_context = avio_alloc_context (avio_buffer, 4096, 0, const_cast<FFmpegImageProxy*>(this), avio_read_wrapper, 0, avio_seek_wrapper);
+ auto avio_context = avio_alloc_context (avio_buffer, 4096, 0, const_cast<FFmpegImageProxy*>(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.
*/
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;
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 ();
}
auto context = avcodec_alloc_context3 (codec);
if (!context) {
- throw DecodeError (N_("avcodec_alloc_context3"), name_for_errors);
+ 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);
}
r = avcodec_send_packet (context, &packet);
if (r < 0) {
- throw DecodeError (N_("avcodec_send_packet"), name_for_errors, r);
+ throw DecodeError (N_("avcodec_send_packet"), name_for_errors, r, *_path);
}
r = avcodec_receive_frame (context, frame);
if (r < 0) {
- throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r);
+ throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path);
}
- _image = make_shared<Image>(frame);
+ _image = make_shared<Image>(frame, alignment);
av_packet_unref (&packet);
av_frame_free (&frame);