Updated ru_RU translation from Igor Voytovich.

[dcpomatic.git] / src / lib / image.cc

diff --git a/src/lib/image.cc b/src/lib/image.cc
index fcdcca95aad3909353a99e8a60a62edebf929d4e..48a4e16cd9e8f797cf5d0409359ec569d1d05210 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -32,6 +32,7 @@ extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
+#include <libavutil/frame.h>
 }
 #include <iostream>
 
@@ -42,6 +43,7 @@ using std::min;
 using std::cout;
 using std::cerr;
 using std::list;
+using std::runtime_error;
 using boost::shared_ptr;
 using dcp::Size;
 
@@ -101,7 +103,7 @@ Image::planes () const
                throw PixelFormatError ("planes()", _pixel_format);
        }
 
-       if ((d->flags & PIX_FMT_PLANAR) == 0) {
+       if ((d->flags & AV_PIX_FMT_FLAG_PLANAR) == 0) {
                return 1;
        }
 
@@ -137,7 +139,7 @@ Image::crop_scale_window (
                );
 
        if (!scale_context) {
-               throw StringError (N_("Could not allocate SwsContext"));
+               throw runtime_error (N_("Could not allocate SwsContext"));
        }
 
        DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT);
@@ -272,45 +274,45 @@ Image::make_black ()
        static uint16_t const sixteen_bit_uv =  (1 << 15) - 1;
 
        switch (_pixel_format) {
-       case PIX_FMT_YUV420P:
-       case PIX_FMT_YUV422P:
-       case PIX_FMT_YUV444P:
-       case PIX_FMT_YUV411P:
+       case AV_PIX_FMT_YUV420P:
+       case AV_PIX_FMT_YUV422P:
+       case AV_PIX_FMT_YUV444P:
+       case AV_PIX_FMT_YUV411P:
                memset (data()[0], 0, sample_size(0).height * stride()[0]);
                memset (data()[1], eight_bit_uv, sample_size(1).height * stride()[1]);
                memset (data()[2], eight_bit_uv, sample_size(2).height * stride()[2]);
                break;
 
-       case PIX_FMT_YUVJ420P:
-       case PIX_FMT_YUVJ422P:
-       case PIX_FMT_YUVJ444P:
+       case AV_PIX_FMT_YUVJ420P:
+       case AV_PIX_FMT_YUVJ422P:
+       case AV_PIX_FMT_YUVJ444P:
                memset (data()[0], 0, sample_size(0).height * stride()[0]);
                memset (data()[1], eight_bit_uv + 1, sample_size(1).height * stride()[1]);
                memset (data()[2], eight_bit_uv + 1, sample_size(2).height * stride()[2]);
                break;
 
-       case PIX_FMT_YUV422P9LE:
-       case PIX_FMT_YUV444P9LE:
+       case AV_PIX_FMT_YUV422P9LE:
+       case AV_PIX_FMT_YUV444P9LE:
                yuv_16_black (nine_bit_uv, false);
                break;
 
-       case PIX_FMT_YUV422P9BE:
-       case PIX_FMT_YUV444P9BE:
+       case AV_PIX_FMT_YUV422P9BE:
+       case AV_PIX_FMT_YUV444P9BE:
                yuv_16_black (swap_16 (nine_bit_uv), false);
                break;
 
-       case PIX_FMT_YUV422P10LE:
-       case PIX_FMT_YUV444P10LE:
+       case AV_PIX_FMT_YUV422P10LE:
+       case AV_PIX_FMT_YUV444P10LE:
                yuv_16_black (ten_bit_uv, false);
                break;
 
-       case PIX_FMT_YUV422P16LE:
-       case PIX_FMT_YUV444P16LE:
+       case AV_PIX_FMT_YUV422P16LE:
+       case AV_PIX_FMT_YUV444P16LE:
                yuv_16_black (sixteen_bit_uv, false);
                break;
 
-       case PIX_FMT_YUV444P10BE:
-       case PIX_FMT_YUV422P10BE:
+       case AV_PIX_FMT_YUV444P10BE:
+       case AV_PIX_FMT_YUV422P10BE:
                yuv_16_black (swap_16 (ten_bit_uv), false);
                break;
 
@@ -350,18 +352,19 @@ Image::make_black ()
                yuv_16_black (sixteen_bit_uv, true);
                break;
 
-       case PIX_FMT_RGB24:
-       case PIX_FMT_ARGB:
-       case PIX_FMT_RGBA:
-       case PIX_FMT_ABGR:
-       case PIX_FMT_BGRA:
-       case PIX_FMT_RGB555LE:
-       case PIX_FMT_RGB48LE:
-       case PIX_FMT_RGB48BE:
+       case AV_PIX_FMT_RGB24:
+       case AV_PIX_FMT_ARGB:
+       case AV_PIX_FMT_RGBA:
+       case AV_PIX_FMT_ABGR:
+       case AV_PIX_FMT_BGRA:
+       case AV_PIX_FMT_RGB555LE:
+       case AV_PIX_FMT_RGB48LE:
+       case AV_PIX_FMT_RGB48BE:
+       case AV_PIX_FMT_XYZ12LE:
                memset (data()[0], 0, sample_size(0).height * stride()[0]);
                break;
 
-       case PIX_FMT_UYVY422:
+       case AV_PIX_FMT_UYVY422:
        {
                int const Y = sample_size(0).height;
                int const X = line_size()[0];
@@ -385,7 +388,7 @@ Image::make_black ()
 void
 Image::make_transparent ()
 {
-       if (_pixel_format != PIX_FMT_RGBA) {
+       if (_pixel_format != AV_PIX_FMT_RGBA) {
                throw PixelFormatError ("make_transparent()", _pixel_format);
        }
 
@@ -395,7 +398,7 @@ Image::make_transparent ()
 void
 Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 {
-       DCPOMATIC_ASSERT (other->pixel_format() == PIX_FMT_RGBA);
+       DCPOMATIC_ASSERT (other->pixel_format() == AV_PIX_FMT_RGBA);
        int const other_bpp = 4;
 
        int start_tx = position.x;
@@ -415,7 +418,7 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
        }
 
        switch (_pixel_format) {
-       case PIX_FMT_RGB24:
+       case AV_PIX_FMT_RGB24:
        {
                int const this_bpp = 3;
                for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
@@ -433,8 +436,8 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                }
                break;
        }
-       case PIX_FMT_BGRA:
-       case PIX_FMT_RGBA:
+       case AV_PIX_FMT_BGRA:
+       case AV_PIX_FMT_RGBA:
        {
                int const this_bpp = 4;
                for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
@@ -453,7 +456,7 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                }
                break;
        }
-       case PIX_FMT_RGB48LE:
+       case AV_PIX_FMT_RGB48LE:
        {
                int const this_bpp = 6;
                for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
@@ -481,7 +484,7 @@ void
 Image::copy (shared_ptr<const Image> other, Position<int> position)
 {
        /* Only implemented for RGB24 onto RGB24 so far */
-       DCPOMATIC_ASSERT (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGB24);
+       DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB24 && other->pixel_format() == AV_PIX_FMT_RGB24);
        DCPOMATIC_ASSERT (position.x >= 0 && position.y >= 0);
 
        int const N = min (position.x + other->size().width, size().width) - position.x;
@@ -543,7 +546,7 @@ Image::bytes_per_pixel (int c) const
                bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
        }
 
-       if ((d->flags & PIX_FMT_PLANAR) == 0) {
+       if ((d->flags & AV_PIX_FMT_FLAG_PLANAR) == 0) {
                /* Not planar; sum them up */
                return bpp[0] + bpp[1] + bpp[2] + bpp[3];
        }
@@ -787,19 +790,19 @@ void
 Image::fade (float f)
 {
        switch (_pixel_format) {
-       case PIX_FMT_YUV420P:
-       case PIX_FMT_YUV422P:
-       case PIX_FMT_YUV444P:
-       case PIX_FMT_YUV411P:
-       case PIX_FMT_YUVJ420P:
-       case PIX_FMT_YUVJ422P:
-       case PIX_FMT_YUVJ444P:
-       case PIX_FMT_RGB24:
-       case PIX_FMT_ARGB:
-       case PIX_FMT_RGBA:
-       case PIX_FMT_ABGR:
-       case PIX_FMT_BGRA:
-       case PIX_FMT_RGB555LE:
+       case AV_PIX_FMT_YUV420P:
+       case AV_PIX_FMT_YUV422P:
+       case AV_PIX_FMT_YUV444P:
+       case AV_PIX_FMT_YUV411P:
+       case AV_PIX_FMT_YUVJ420P:
+       case AV_PIX_FMT_YUVJ422P:
+       case AV_PIX_FMT_YUVJ444P:
+       case AV_PIX_FMT_RGB24:
+       case AV_PIX_FMT_ARGB:
+       case AV_PIX_FMT_RGBA:
+       case AV_PIX_FMT_ABGR:
+       case AV_PIX_FMT_BGRA:
+       case AV_PIX_FMT_RGB555LE:
                /* 8-bit */
                for (int c = 0; c < 3; ++c) {
                        uint8_t* p = data()[c];
@@ -815,12 +818,12 @@ Image::fade (float f)
                }
                break;
 
-       case PIX_FMT_YUV422P9LE:
-       case PIX_FMT_YUV444P9LE:
-       case PIX_FMT_YUV422P10LE:
-       case PIX_FMT_YUV444P10LE:
-       case PIX_FMT_YUV422P16LE:
-       case PIX_FMT_YUV444P16LE:
+       case AV_PIX_FMT_YUV422P9LE:
+       case AV_PIX_FMT_YUV444P9LE:
+       case AV_PIX_FMT_YUV422P10LE:
+       case AV_PIX_FMT_YUV444P10LE:
+       case AV_PIX_FMT_YUV422P16LE:
+       case AV_PIX_FMT_YUV444P16LE:
        case AV_PIX_FMT_YUVA420P9LE:
        case AV_PIX_FMT_YUVA422P9LE:
        case AV_PIX_FMT_YUVA444P9LE:
@@ -828,6 +831,7 @@ Image::fade (float f)
        case AV_PIX_FMT_YUVA422P10LE:
        case AV_PIX_FMT_YUVA444P10LE:
        case AV_PIX_FMT_RGB48LE:
+       case AV_PIX_FMT_XYZ12LE:
                /* 16-bit little-endian */
                for (int c = 0; c < 3; ++c) {
                        int const stride_pixels = stride()[c] / 2;
@@ -845,10 +849,10 @@ Image::fade (float f)
                }
                break;
 
-       case PIX_FMT_YUV422P9BE:
-       case PIX_FMT_YUV444P9BE:
-       case PIX_FMT_YUV444P10BE:
-       case PIX_FMT_YUV422P10BE:
+       case AV_PIX_FMT_YUV422P9BE:
+       case AV_PIX_FMT_YUV444P9BE:
+       case AV_PIX_FMT_YUV444P10BE:
+       case AV_PIX_FMT_YUV422P10BE:
        case AV_PIX_FMT_YUVA420P9BE:
        case AV_PIX_FMT_YUVA422P9BE:
        case AV_PIX_FMT_YUVA444P9BE:
@@ -876,7 +880,7 @@ Image::fade (float f)
                }
                break;
 
-       case PIX_FMT_UYVY422:
+       case AV_PIX_FMT_UYVY422:
        {
                int const Y = sample_size(0).height;
                int const X = line_size()[0];