projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
filter_graph.cc
diff --git
a/src/lib/filter_graph.cc
b/src/lib/filter_graph.cc
index 472480de300dee5834555ddde7aba22f5fb369a2..5add16d19bcedac612b55eecf5bc85a7feedf99a 100644
(file)
--- a/
src/lib/filter_graph.cc
+++ b/
src/lib/filter_graph.cc
@@
-33,24
+33,26
@@
extern "C" {
#include "filter.h"
#include "exceptions.h"
#include "image.h"
#include "filter.h"
#include "exceptions.h"
#include "image.h"
-#include "ffmpeg_
decoder
.h"
+#include "ffmpeg_
content
.h"
#include "i18n.h"
using std::stringstream;
using std::string;
using std::list;
#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;
using std::cout;
using boost::shared_ptr;
using boost::weak_ptr;
-using
lib
dcp::Size;
+using dcp::Size;
/** Construct a FilterGraph for the settings in a piece of content.
* @param content Content.
* @param s Size of the images to process.
* @param p Pixel format of the images to process.
*/
/** Construct a FilterGraph for the settings in a piece of content.
* @param content Content.
* @param s Size of the images to process.
* @param p Pixel format of the images to process.
*/
-FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content,
lib
dcp::Size s, AVPixelFormat p)
+FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s, AVPixelFormat p)
: _buffer_src_context (0)
, _buffer_sink_context (0)
, _size (s)
: _buffer_src_context (0)
, _buffer_sink_context (0)
, _size (s)
@@
-58,17
+60,11
@@
FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
{
_frame = av_frame_alloc ();
{
_frame = av_frame_alloc ();
- string filters = Filter::ffmpeg_string
s (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."));
AVFilterGraph* graph = avfilter_graph_alloc();
if (graph == 0) {
throw DecodeError (N_("could not create filter graph."));
@@
-90,9
+86,7
@@
FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
<< "time_base=1/1:"
<< "pixel_aspect=1/1";
<< "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"));
}
throw DecodeError (N_("could not create buffer source"));
}
@@
-128,7
+122,8
@@
FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
throw DecodeError (N_("could not configure filter graph."));
}
throw DecodeError (N_("could not configure filter graph."));
}
- /* XXX: leaking `inputs' / `outputs' ? */
+ avfilter_inout_free (&inputs);
+ avfilter_inout_free (&outputs);
}
FilterGraph::~FilterGraph ()
}
FilterGraph::~FilterGraph ()
@@
-139,10
+134,10
@@
FilterGraph::~FilterGraph ()
/** Take an AVFrame and process it using our configured filters, returning a
* set of Images. Caller handles memory management of the input frame.
*/
/** 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)
{
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."));
if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
throw DecodeError (N_("could not push buffer into filter chain."));
@@
-153,7
+148,7
@@
FilterGraph::process (AVFrame* frame)
break;
}
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);
}
av_frame_unref (_frame);
}
@@
-165,7
+160,7
@@
FilterGraph::process (AVFrame* frame)
* @return true if this chain can process images with `s' and `p', otherwise false.
*/
bool
* @return true if this chain can process images with `s' and `p', otherwise false.
*/
bool
-FilterGraph::can_process (
lib
dcp::Size s, AVPixelFormat p) const
+FilterGraph::can_process (dcp::Size s, AVPixelFormat p) const
{
return (_size == s && _pixel_format == p);
}
{
return (_size == s && _pixel_format == p);
}