projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A whole load of UTF-8/-16 confusion fixes for Windows.
[dcpomatic.git]
/
src
/
lib
/
filter_graph.cc
diff --git
a/src/lib/filter_graph.cc
b/src/lib/filter_graph.cc
index 2624bc4d7c0354a9bf46a48348a6c75d38dd5872..cd5d198079683f588c2a12c68a1648e4a5136e29 100644
(file)
--- a/
src/lib/filter_graph.cc
+++ b/
src/lib/filter_graph.cc
@@
-33,36
+33,38
@@
extern "C" {
#include "filter.h"
#include "exceptions.h"
#include "image.h"
#include "filter.h"
#include "exceptions.h"
#include "image.h"
-#include "film.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::shared_ptr;
+using boost::weak_ptr;
using libdcp::Size;
using libdcp::Size;
-/** Construct a FilterGraph for the settings in a film.
- * @param film Film.
- * @param decoder Decoder that we are using.
+/** 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.
*/
* @param s Size of the images to process.
* @param p Pixel format of the images to process.
*/
-FilterGraph::FilterGraph (shared_ptr<
Film> film, FFmpegDecoder* decoder
, libdcp::Size s, AVPixelFormat p)
+FilterGraph::FilterGraph (shared_ptr<
const FFmpegContent> content
, libdcp::Size s, AVPixelFormat p)
: _buffer_src_context (0)
, _buffer_sink_context (0)
, _size (s)
, _pixel_format (p)
{
: _buffer_src_context (0)
, _buffer_sink_context (0)
, _size (s)
, _pixel_format (p)
{
- string filters = Filter::ffmpeg_strings (film->filters()).first;
- if (!filters.empty ()) {
- filters += N_(",");
+ _frame = av_frame_alloc ();
+
+ string filters = Filter::ffmpeg_strings (content->filters()).first;
+ if (filters.empty ()) {
+ filters = "copy";
}
}
- filters += crop_string (Position (film->crop().left, film->crop().top), film->cropped_size (decoder->native_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."));
@@
-81,12
+83,10
@@
FilterGraph::FilterGraph (shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp:
stringstream a;
a << "video_size=" << _size.width << "x" << _size.height << ":"
<< "pix_fmt=" << _pixel_format << ":"
stringstream a;
a << "video_size=" << _size.width << "x" << _size.height << ":"
<< "pix_fmt=" << _pixel_format << ":"
- << "time_base=" << decoder->time_base_numerator() << "/" << decoder->time_base_denominator() << ":"
- << "pixel_aspect=" << decoder->sample_aspect_ratio_numerator() << "/" << decoder->sample_aspect_ratio_denominator();
-
- int r;
+ << "time_base=1/1:"
+ << "pixel_aspect=1/1";
- 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"));
}
@@
-125,27
+125,30
@@
FilterGraph::FilterGraph (shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp:
/* XXX: leaking `inputs' / `outputs' ? */
}
/* XXX: leaking `inputs' / `outputs' ? */
}
+FilterGraph::~FilterGraph ()
+{
+ av_frame_free (&_frame);
+}
+
/** Take an AVFrame and process it using our configured filters, returning a
/** Take an AVFrame and process it using our configured filters, returning a
- * set of Images.
+ * 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."));
}
while (1) {
if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
throw DecodeError (N_("could not push buffer into filter chain."));
}
while (1) {
- AVFrame* frame = av_frame_alloc ();
- if (av_buffersink_get_frame (_buffer_sink_context, frame) < 0) {
- av_frame_free (&frame);
+ if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) {
break;
}
break;
}
- /* This takes ownership of the AVFrame */
-
images.push_back (shared_ptr<Image> (new FrameImage (frame, true))
);
+ 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;