projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
image.h
diff --git
a/src/lib/image.h
b/src/lib/image.h
index 23f13a648c8b8cd29d16d1c25772d3dd50b89bf1..de03d0e3f60485a8d316deb00cef21ad80bc92f7 100644
(file)
--- a/
src/lib/image.h
+++ b/
src/lib/image.h
@@
-21,8
+21,8
@@
* @brief A set of classes to describe video images.
*/
* @brief A set of classes to describe video images.
*/
-#ifndef D
VD
OMATIC_IMAGE_H
-#define D
VD
OMATIC_IMAGE_H
+#ifndef D
CP
OMATIC_IMAGE_H
+#define D
CP
OMATIC_IMAGE_H
#include <string>
#include <boost/shared_ptr.hpp>
#include <string>
#include <boost/shared_ptr.hpp>
@@
-92,7
+92,10
@@
protected:
virtual void swap (Image &);
float bytes_per_pixel (int) const;
virtual void swap (Image &);
float bytes_per_pixel (int) const;
-private:
+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
};
@@
-117,6
+120,7
@@
private:
FilterBufferImage& operator= (FilterBufferImage const &);
AVFilterBufferRef* _buffer;
FilterBufferImage& operator= (FilterBufferImage const &);
AVFilterBufferRef* _buffer;
+ int* _line_size;
};
/** @class SimpleImage
};
/** @class SimpleImage
@@
-127,6
+131,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 ();