projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use newer format to specify filter graphs; don't filter unless necessary; fix tiny...
[dcpomatic.git]
/
src
/
lib
/
image.h
diff --git
a/src/lib/image.h
b/src/lib/image.h
index f40ea92809a476babadefbbef113a86504c26828..16fbd28c24b93c4064045368cf87e171444c16c9 100644
(file)
--- a/
src/lib/image.h
+++ b/
src/lib/image.h
@@
-32,7
+32,6
@@
extern "C" {
#include <libavfilter/avfilter.h>
}
#include "util.h"
#include <libavfilter/avfilter.h>
}
#include "util.h"
-#include "ffmpeg_compatibility.h"
class Scaler;
class RGBFrameImage;
class Scaler;
class RGBFrameImage;
@@
-92,18
+91,23
@@
protected:
virtual void swap (Image &);
float bytes_per_pixel (int) const;
virtual void swap (Image &);
float bytes_per_pixel (int) const;
-private:
+ friend class pixel_formats_test;
+
+private:
+ void yuv_16_black (uint16_t);
+ static uint16_t swap_16 (uint16_t);
+
AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
};
AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
};
-/** @class F
ilterBuffer
Image
- * @brief An Image that is held in an AVF
ilterBufferRef
.
+/** @class F
rame
Image
+ * @brief An Image that is held in an AVF
rame
.
*/
*/
-class F
ilterBuffer
Image : public Image
+class F
rame
Image : public Image
{
public:
{
public:
- F
ilterBufferImage (AVPixelFormat, AVFilterBufferRef *
);
- ~F
ilterBuffer
Image ();
+ F
rameImage (AVFrame *, bool
);
+ ~F
rame
Image ();
uint8_t ** data () const;
int * line_size () const;
uint8_t ** data () const;
int * line_size () const;
@@
-113,10
+117,11
@@
public:
private:
/* Not allowed */
private:
/* Not allowed */
- F
ilterBufferImage (FilterBuffer
Image const &);
- F
ilterBufferImage& operator= (FilterBuffer
Image const &);
+ F
rameImage (Frame
Image const &);
+ F
rameImage& operator= (Frame
Image const &);
- AVFilterBufferRef* _buffer;
+ AVFrame* _frame;
+ bool _own;
int* _line_size;
};
int* _line_size;
};
@@
-128,6
+133,7
@@
class SimpleImage : public Image
public:
SimpleImage (AVPixelFormat, libdcp::Size, bool);
SimpleImage (SimpleImage const &);
public:
SimpleImage (AVPixelFormat, libdcp::Size, bool);
SimpleImage (SimpleImage const &);
+ SimpleImage (boost::shared_ptr<const Image>);
SimpleImage& operator= (SimpleImage const &);
~SimpleImage ();
SimpleImage& operator= (SimpleImage const &);
~SimpleImage ();