/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include <libavfilter/buffersrc.h>
#include <libavfilter/buffersink.h>
}
-#include <boost/make_shared.hpp>
#include "i18n.h"
using std::string;
using std::make_pair;
using boost::shared_ptr;
-using boost::make_shared;
-VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p)
+VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p, dcp::Fraction r)
: _size (s)
, _pixel_format (p)
+ , _frame_rate (r)
{
}
list<pair<shared_ptr<Image>, int64_t> > images;
if (_copy) {
- images.push_back (make_pair (make_shared<Image> (frame), av_frame_get_best_effort_timestamp (frame)));
+ images.push_back (make_pair (shared_ptr<Image> (new Image (frame)), av_frame_get_best_effort_timestamp (frame)));
} else {
int r = av_buffersrc_write_frame (_buffer_src_context, frame);
if (r < 0) {
break;
}
- images.push_back (make_pair (make_shared<Image> (_frame), av_frame_get_best_effort_timestamp (_frame)));
+ images.push_back (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
av_frame_unref (_frame);
}
}
string
VideoFilterGraph::src_parameters () const
{
- SafeStringStream a;
-
- a << "video_size=" << _size.width << "x" << _size.height << ":"
- << "pix_fmt=" << _pixel_format << ":"
- << "time_base=1/1:"
- << "pixel_aspect=1/1";
-
- return a.str ();
+ char buffer[256];
+ snprintf (
+ buffer, sizeof(buffer),
+ "video_size=%dx%d:pix_fmt=%d:frame_rate=%d/%d:time_base=1/1:pixel_aspect=1/1",
+ _size.width, _size.height,
+ _pixel_format,
+ _frame_rate.numerator, _frame_rate.denominator
+ );
+ return buffer;
}
void *
{
AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
AVPixelFormat* pixel_fmts = new AVPixelFormat[2];
- pixel_fmts = new AVPixelFormat[2];
pixel_fmts[0] = _pixel_format;
pixel_fmts[1] = AV_PIX_FMT_NONE;
sink_params->pixel_fmts = pixel_fmts;