projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More tests; fix blend for YUV420P10LE.
[dcpomatic.git]
/
src
/
lib
/
image.h
diff --git
a/src/lib/image.h
b/src/lib/image.h
index b8d48275a5fed39dc9a9515a4951b9ec85ff85b5..fd5adb0762ea9071ce1cd831f7aba49c3bef0aab 100644
(file)
--- a/
src/lib/image.h
+++ b/
src/lib/image.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-39,7
+40,7
@@
class Socket;
class Image
{
public:
class Image
{
public:
- Image (AVPixelFormat
, dcp::Size, bool
, int extra_pixels = 0);
+ Image (AVPixelFormat
p, dcp::Size s, bool aligned
, int extra_pixels = 0);
Image (AVFrame *);
Image (Image const &);
Image (boost::shared_ptr<const Image>, bool);
Image (AVFrame *);
Image (Image const &);
Image (boost::shared_ptr<const Image>, bool);
@@
-53,14
+54,15
@@
public:
bool aligned () const;
int planes () const;
bool aligned () const;
int planes () const;
- int
components (
) const;
- int
line
_factor (int) const;
+ int
vertical_factor (int
) const;
+ int
horizontal
_factor (int) const;
dcp::Size sample_size (int) const;
dcp::Size sample_size (int) const;
+ float bytes_per_pixel (int) const;
- boost::shared_ptr<Image> scale (dcp::Size
, dcp::YUVToRGB yuv_to_rgb, AVPixelF
ormat, bool aligned, bool fast) const;
+ boost::shared_ptr<Image> scale (dcp::Size
out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_f
ormat, bool aligned, bool fast) const;
boost::shared_ptr<Image> crop_scale_window (
boost::shared_ptr<Image> crop_scale_window (
- Crop c
, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned, bool fast)
- const;
+ Crop c
rop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast
+
)
const;
void make_black ();
void make_transparent ();
void make_black ();
void make_transparent ();
@@
-80,15
+82,14
@@
private:
void allocate ();
void swap (Image &);
void allocate ();
void swap (Image &);
- float bytes_per_pixel (int) const;
void yuv_16_black (uint16_t, bool);
static uint16_t swap_16 (uint16_t);
dcp::Size _size;
AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
uint8_t** _data; ///< array of pointers to components
void yuv_16_black (uint16_t, bool);
static uint16_t swap_16 (uint16_t);
dcp::Size _size;
AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
uint8_t** _data; ///< array of pointers to components
- int* _line_size; ///< array of sizes of the data in each line, in
pixel
s (without any alignment padding bytes)
- int* _stride; ///< array of strides for each line (including any alignment padding bytes)
+ int* _line_size; ///< array of sizes of the data in each line, in
byte
s (without any alignment padding bytes)
+ int* _stride; ///< array of strides for each line
, in bytes
(including any alignment padding bytes)
bool _aligned;
int _extra_pixels;
};
bool _aligned;
int _extra_pixels;
};