#include "filter.h"
#include "exceptions.h"
#include "image.h"
-#include "ffmpeg_decoder.h"
+#include "ffmpeg_content.h"
+#include "safe_stringstream.h"
#include "i18n.h"
-using std::stringstream;
using std::string;
using std::list;
+using std::pair;
+using std::make_pair;
using std::cout;
using boost::shared_ptr;
using boost::weak_ptr;
{
_frame = av_frame_alloc ();
- string filters = Filter::ffmpeg_strings (content->filters()).first;
- if (!filters.empty ()) {
- filters += ",";
+ string filters = Filter::ffmpeg_string (content->filters());
+ if (filters.empty ()) {
+ filters = "copy";
}
- Crop crop = content->crop ();
- libdcp::Size cropped_size = _size;
- cropped_size.width -= crop.left + crop.right;
- cropped_size.height -= crop.top + crop.bottom;
- filters += crop_string (Position (crop.left, crop.top), cropped_size);
-
AVFilterGraph* graph = avfilter_graph_alloc();
if (graph == 0) {
throw DecodeError (N_("could not create filter graph."));
throw DecodeError (N_("Could not create buffer sink filter"));
}
- stringstream a;
+ SafeStringStream a;
a << "video_size=" << _size.width << "x" << _size.height << ":"
<< "pix_fmt=" << _pixel_format << ":"
<< "time_base=1/1:"
<< "pixel_aspect=1/1";
- int r;
-
- if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph)) < 0) {
+ if (avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph) < 0) {
throw DecodeError (N_("could not create buffer source"));
}
/** Take an AVFrame and process it using our configured filters, returning a
* set of Images. Caller handles memory management of the input frame.
*/
-list<shared_ptr<Image> >
+list<pair<shared_ptr<Image>, int64_t> >
FilterGraph::process (AVFrame* frame)
{
- list<shared_ptr<Image> > images;
+ list<pair<shared_ptr<Image>, int64_t> > images;
if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
throw DecodeError (N_("could not push buffer into filter chain."));
}
- while (1) {
+ while (true) {
if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) {
break;
}
- images.push_back (shared_ptr<Image> (new SimpleImage (_frame)));
+ images.push_back (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
av_frame_unref (_frame);
}