projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various update bits.
[dcpomatic.git]
/
src
/
lib
/
filter_graph.cc
diff --git
a/src/lib/filter_graph.cc
b/src/lib/filter_graph.cc
index 7ec2466c588a4dc29e6e02b6274a7ca6ee81fbdf..cd5d198079683f588c2a12c68a1648e4a5136e29 100644
(file)
--- a/
src/lib/filter_graph.cc
+++ b/
src/lib/filter_graph.cc
@@
-33,13
+33,15
@@
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;
@@
-59,16
+61,10
@@
FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
_frame = av_frame_alloc ();
string filters = Filter::ffmpeg_strings (content->filters()).first;
_frame = av_frame_alloc ();
string filters = Filter::ffmpeg_strings (content->filters()).first;
- if (
!
filters.empty ()) {
- 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"));
}
@@
-139,10
+133,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
+147,8
@@
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);
}
return images;
}
return images;