X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=73d08b90244eeb5c88d280b1538d5771bbd49113;hp=e1f8d0ddd4c1d7597b17c78ce8449479e3e9f44a;hb=HEAD;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab diff --git a/src/lib/image.h b/src/lib/image.h index e1f8d0ddd..0237b3d1b 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - 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. - 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 - 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 . */ @@ -24,76 +25,102 @@ #ifndef DCPOMATIC_IMAGE_H #define DCPOMATIC_IMAGE_H -#include -#include -#include -extern "C" { -#include -#include -} -#include -#include "util.h" + +#include "crop.h" #include "position.h" #include "position_image.h" +#include "video_range.h" +extern "C" { +#include +} +#include +#include + + +struct AVFrame; +class Socket; -class Scaler; -class Image : public dcp::Image +class Image : public std::enable_shared_from_this { public: - Image (AVPixelFormat, dcp::Size, bool); - Image (AVFrame *); - Image (Image const &); - Image (boost::shared_ptr, bool); + enum class Alignment { + COMPACT, + PADDED + }; + + Image (AVPixelFormat p, dcp::Size s, Alignment alignment); + explicit Image (AVFrame const *, Alignment alignment); + explicit Image (Image const &); + Image (std::shared_ptr, Alignment alignment); Image& operator= (Image const &); ~Image (); - - uint8_t ** data () const; - int * line_size () const; - int * stride () const; + + uint8_t * const * data () const; + /** @return array of sizes of the data in each line, in bytes (not including any alignment padding) */ + int const * line_size () const; + /** @return array of sizes of the data in each line, in bytes (including any alignment padding) */ + int const * stride () const; dcp::Size size () const; - bool aligned () const; + Alignment alignment () const; - int components () const; - int line_factor (int) const; - int lines (int) const; + int planes () const; + int vertical_factor (int) const; + int horizontal_factor (int) const; + dcp::Size sample_size (int) const; + float bytes_per_pixel (int) const; - boost::shared_ptr scale (dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const; - boost::shared_ptr crop (Crop c, bool aligned) const; + std::shared_ptr convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, Alignment alignment, bool fast) const; + std::shared_ptr scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, Alignment alignment, bool fast) const; + std::shared_ptr crop_scale_window ( + Crop crop, + dcp::Size inter_size, + dcp::Size out_size, + dcp::YUVToRGB yuv_to_rgb, + VideoRange video_range, + AVPixelFormat out_format, + VideoRange out_video_range, + Alignment alignment, + bool fast + ) const; - boost::shared_ptr crop_scale_window (Crop c, dcp::Size, dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const; - void make_black (); void make_transparent (); - void alpha_blend (boost::shared_ptr image, Position pos); - void copy (boost::shared_ptr image, Position pos); + void alpha_blend (std::shared_ptr image, Position pos); + void copy (std::shared_ptr image, Position pos); + void fade (float); + + void read_from_socket (std::shared_ptr); + void write_to_socket (std::shared_ptr) const; - void read_from_socket (boost::shared_ptr); - void write_to_socket (boost::shared_ptr) const; - AVPixelFormat pixel_format () const { return _pixel_format; } - std::string digest () const; + size_t memory_used () const; + + static std::shared_ptr ensure_alignment (std::shared_ptr image, Alignment alignment); private: friend struct pixel_formats_test; - + friend struct make_part_black_test; + void allocate (); void swap (Image &); - float bytes_per_pixel (int) const; + void make_part_black (int x, int w); void yuv_16_black (uint16_t, bool); static uint16_t swap_16 (uint16_t); - + void video_range_to_full_range (); + + 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 pixels (without any alignment padding bytes) - int* _stride; ///< array of strides for each line (including any alignment padding bytes) - bool _aligned; + int* _line_size; ///< array of sizes of the data in each line, in bytes (without any alignment padding bytes) + int* _stride; ///< array of strides for each line, in bytes (including any alignment padding bytes) + Alignment _alignment; }; -extern PositionImage merge (std::list images); +extern PositionImage merge (std::list images, Image::Alignment alignment); extern bool operator== (Image const & a, Image const & b); #endif