Merge branch 'master' into i18n

diff --git a/ChangeLog b/ChangeLog
index 8facb96c06cf9bcc3b21a7d127120bfb65edc557..38a4f78fab620daa4ee77358591cbd17896af3b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-27  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.75beta1 released.
+
+       * Fix support for some YUV444 pixel formats.
+
+2013-02-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.74 released.
+
+2013-02-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.74beta1 released.
+
 2013-02-21  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.73 released.

diff --git a/debian/changelog b/debian/changelog
index 9aaab999dd6a9c5754d8702c16945fc737b66411..e8c5dfd6aab69e30887b62d41a6c2a1bc39521ee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+dvdomatic (0.75beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Wed, 27 Feb 2013 08:20:42 +0000
+
+dvdomatic (0.74-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sat, 23 Feb 2013 22:57:20 +0000
+
+dvdomatic (0.74beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sat, 23 Feb 2013 21:44:22 +0000
+
 dvdomatic (0.73-1) UNRELEASED; urgency=low
 
   * New upstream release.

diff --git a/src/lib/image.cc b/src/lib/image.cc
index ae87304c256b7490b63804e7651d29fa110a7913..b7ac13ab17e4ad3087810393e3cd47d7e0553cc7 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -68,6 +68,11 @@ Image::lines (int n) const
        case PIX_FMT_RGBA:
        case PIX_FMT_YUV422P10LE:
        case PIX_FMT_YUV422P:
+       case PIX_FMT_YUV444P:
+       case PIX_FMT_YUV444P9BE:
+       case PIX_FMT_YUV444P9LE:
+       case PIX_FMT_YUV444P10BE:
+       case PIX_FMT_YUV444P10LE:
                return size().height;
        default:
                throw PixelFormatError ("lines()", _pixel_format);
@@ -84,6 +89,11 @@ Image::components () const
        case PIX_FMT_YUV420P:
        case PIX_FMT_YUV422P10LE:
        case PIX_FMT_YUV422P:
+       case PIX_FMT_YUV444P:
+       case PIX_FMT_YUV444P9BE:
+       case PIX_FMT_YUV444P9LE:
+       case PIX_FMT_YUV444P10BE:
+       case PIX_FMT_YUV444P10LE:
                return 3;
        case PIX_FMT_RGB24:
        case PIX_FMT_RGBA:
@@ -201,6 +211,12 @@ Image::post_process (string pp, bool aligned) const
        case PIX_FMT_YUV422P:
                pp_format = PP_FORMAT_422;
                break;
+       case PIX_FMT_YUV444P:
+       case PIX_FMT_YUV444P9BE:
+       case PIX_FMT_YUV444P9LE:
+       case PIX_FMT_YUV444P10BE:
+       case PIX_FMT_YUV444P10LE:
+               pp_format = PP_FORMAT_444;
        default:
                throw PixelFormatError ("post_process", pixel_format());
        }
@@ -248,30 +264,65 @@ Image::crop (Crop crop, bool aligned) const
        return out;
 }
 
+/** Blacken a YUV image whose bits per pixel is rounded up to 16 */
+void
+Image::yuv_16_black (uint16_t v)
+{
+       memset (data()[0], 0, lines(0) * stride()[0]);
+       for (int i = 1; i < 3; ++i) {
+               int16_t* p = reinterpret_cast<int16_t*> (data()[i]);
+               for (int y = 0; y < size().height; ++y) {
+                       for (int x = 0; x < line_size()[i] / 2; ++x) {
+                               p[x] = v;
+                       }
+                       p += stride()[i] / 2;
+               }
+       }
+}
+
+uint16_t
+Image::swap_16 (uint16_t v)
+{
+       return ((v >> 8) & 0xff) | ((v & 0xff) << 8);
+}
+
 void
 Image::make_black ()
 {
+       /* U/V black value for 9-bit colour */
+       static uint16_t const nine_bit_uv = (1 << 8) - 1;
+
+       /* U/V black value for 10-bit colour */
+       static uint16_t const ten_bit_uv =  (1 << 9) - 1;
+       
        switch (_pixel_format) {
        case PIX_FMT_YUV420P:
        case PIX_FMT_YUV422P:
+       case PIX_FMT_YUV444P:
                memset (data()[0], 0, lines(0) * stride()[0]);
                memset (data()[1], 0x7f, lines(1) * stride()[1]);
                memset (data()[2], 0x7f, lines(2) * stride()[2]);
                break;
 
+       case PIX_FMT_YUV422P9LE:
+       case PIX_FMT_YUV444P9LE:
+               yuv_16_black (nine_bit_uv);
+               break;
+
+       case PIX_FMT_YUV422P9BE:
+       case PIX_FMT_YUV444P9BE:
+               yuv_16_black (swap_16 (nine_bit_uv));
+               break;
+               
        case PIX_FMT_YUV422P10LE:
-               memset (data()[0], 0, lines(0) * stride()[0]);
-               for (int i = 1; i < 3; ++i) {
-                       int16_t* p = reinterpret_cast<int16_t*> (data()[i]);
-                       for (int y = 0; y < size().height; ++y) {
-                               for (int x = 0; x < line_size()[i] / 2; ++x) {
-                                       p[x] = (1 << 9) - 1;
-                               }
-                               p += stride()[i] / 2;
-                       }
-               }
+       case PIX_FMT_YUV444P10LE:
+               yuv_16_black (ten_bit_uv);
                break;
                
+       case PIX_FMT_YUV444P10BE:
+       case PIX_FMT_YUV422P10BE:
+               yuv_16_black (swap_16 (ten_bit_uv));
+               
        case PIX_FMT_RGB24:             
                memset (data()[0], 0, lines(0) * stride()[0]);
                break;
@@ -375,6 +426,13 @@ Image::bytes_per_pixel (int c) const
                } else {
                        return 1;
                }
+       case PIX_FMT_YUV444P:
+               return 3;
+       case PIX_FMT_YUV444P9BE:
+       case PIX_FMT_YUV444P9LE:
+       case PIX_FMT_YUV444P10LE:
+       case PIX_FMT_YUV444P10BE:
+               return 6;
        default:
                assert (false);
        }

diff --git a/src/lib/image.h b/src/lib/image.h
index f40ea92809a476babadefbbef113a86504c26828..6b9ade99eefccb8b3d92e7c023300c14f9ac9601 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -92,7 +92,10 @@ protected:
        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
 };
 

diff --git a/src/lib/job.cc b/src/lib/job.cc
index bde2c8cfd69ca47bffb84f837d17199508e454ef..bfad65a0a61f18d6566fa937b528232b91fe38f2 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -272,10 +272,11 @@ Job::status () const
        }
 
        stringstream s;
-       if (!finished () && p >= 0 && t > 10 && r > 0) {
-               s << pc << "%; " << seconds_to_approximate_hms (r) << " remaining";
-       } else if (!finished () && (t <= 10 || r == 0)) {
+       if (!finished ()) {
                s << pc << "%";
+               if (p >= 0 && t > 10 && r > 0) {
+                       s << "; " << seconds_to_approximate_hms (r) << " remaining";
+               }
        } else if (finished_ok ()) {
                s << "OK (ran for " << seconds_to_hms (_ran_for) << ")";
        } else if (finished_in_error ()) {

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 54eccb4f107bb2e74a96ceefb96cc0c2069b991d..68291a812df03d5414d76dd258caae838a736940 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -124,7 +124,7 @@ FilmEditor::make_film_panel ()
        _dcp_content_type = new wxChoice (_film_panel, wxID_ANY);
        grid->Add (_dcp_content_type);
 
-       video_control (add_label_to_sizer (grid, _film_panel, _("Frames Per Second")));
+       video_control (add_label_to_sizer (grid, _film_panel, _("Original Frame Rate")));
        _frames_per_second = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
        grid->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL);
        

diff --git a/test/test.cc b/test/test.cc
index 386aead2eca463f2b9671fcd112f6291acd5223e..8cfc6e4674dc8c539fc90e0bbbcc4a1d5180e484 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -94,25 +94,18 @@ BOOST_AUTO_TEST_CASE (make_black_test)
        libdcp::Size in_size (512, 512);
        libdcp::Size out_size (1024, 1024);
 
-       {
-               /* Plain RGB input */
-               boost::shared_ptr<Image> foo (new SimpleImage (AV_PIX_FMT_RGB24, in_size, true));
-               foo->make_black ();
-               boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, 0, Scaler::from_id ("bicubic"), true);
-               
-               uint8_t* p = bar->data()[0];
-               for (int y = 0; y < bar->size().height; ++y) {
-                       uint8_t* q = p;
-                       for (int x = 0; x < bar->line_size()[0]; ++x) {
-                               BOOST_CHECK_EQUAL (*q++, 0);
-                       }
-                       p += bar->stride()[0];
-               }
-       }
-
-       {
-               /* YUV420P input */
-               boost::shared_ptr<Image> foo (new SimpleImage (AV_PIX_FMT_YUV420P, in_size, true));
+       list<AVPixelFormat> pix_fmts;
+       pix_fmts.push_back (AV_PIX_FMT_RGB24);
+       pix_fmts.push_back (AV_PIX_FMT_YUV420P);
+       pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE);
+       pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE);
+       pix_fmts.push_back (AV_PIX_FMT_YUV444P9BE);
+       pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE);
+       pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE);
+
+       int N = 0;
+       for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
+               boost::shared_ptr<Image> foo (new SimpleImage (*i, in_size, true));
                foo->make_black ();
                boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, 0, Scaler::from_id ("bicubic"), true);
                
@@ -124,22 +117,8 @@ BOOST_AUTO_TEST_CASE (make_black_test)
                        }
                        p += bar->stride()[0];
                }
-       }
 
-       {
-               /* YUV422P10LE input */
-               boost::shared_ptr<Image> foo (new SimpleImage (AV_PIX_FMT_YUV422P10LE, in_size, true));
-               foo->make_black ();
-               boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, 0, Scaler::from_id ("bicubic"), true);
-               
-               uint8_t* p = bar->data()[0];
-               for (int y = 0; y < bar->size().height; ++y) {
-                       uint8_t* q = p;
-                       for (int x = 0; x < bar->line_size()[0]; ++x) {
-                               BOOST_CHECK_EQUAL (*q++, 0);
-                       }
-                       p += bar->stride()[0];
-               }
+               ++N;
        }
 }
 

diff --git a/wscript b/wscript
index 2a5c549518e944ec4270192f37db4b1887031a17..edf01784bd094ecba926d77208c57b8bdd568032 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.74pre'
+VERSION = '0.75beta1'
 
 def options(opt):
     opt.load('compiler_cxx')