From a991c734ebfedb5456cec827d5eaf2583fdbb9a1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Jun 2013 12:06:04 +0100 Subject: Detect CPU info on OS X. --- src/lib/cross.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ src/lib/cross.h | 3 +++ src/lib/film.cc | 1 + src/lib/util.cc | 26 -------------------------- src/lib/util.h | 1 - 5 files changed, 47 insertions(+), 27 deletions(-) (limited to 'src/lib') diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 2c66ab53a..1f1be907f 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -24,6 +24,12 @@ #ifdef DVDOMATIC_WINDOWS #include "windows.h" #endif +#ifdef DVDOMATIC_OSX +#include +#endif + +using std::pair; +using std::string; void dvdomatic_sleep (int s) @@ -35,3 +41,40 @@ dvdomatic_sleep (int s) Sleep (s * 1000); #endif } + +/** @return A pair containing CPU model name and the number of processors */ +pair +cpu_info () +{ + pair info; + info.second = 0; + +#ifdef DVDOMATIC_LINUX + ifstream f (N_("/proc/cpuinfo")); + while (f.good ()) { + string l; + getline (f, l); + if (boost::algorithm::starts_with (l, N_("model name"))) { + string::size_type const c = l.find (':'); + if (c != string::npos) { + info.first = l.substr (c + 2); + } + } else if (boost::algorithm::starts_with (l, N_("processor"))) { + ++info.second; + } + } +#endif + +#ifdef DVDOMATIC_OSX + size_t N = sizeof (info.second); + sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0); + char buffer[64]; + N = sizeof (buffer); + if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) { + info.first = buffer; + } +#endif + + return info; +} + diff --git a/src/lib/cross.h b/src/lib/cross.h index 110660b16..970bf3e9d 100644 --- a/src/lib/cross.h +++ b/src/lib/cross.h @@ -17,8 +17,11 @@ */ +#include + #ifdef DVDOMATIC_WINDOWS #define WEXITSTATUS(w) (w) #endif void dvdomatic_sleep (int); +extern std::pair cpu_info (); diff --git a/src/lib/film.cc b/src/lib/film.cc index 5573ee9d2..8aedd7639 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -52,6 +52,7 @@ #include "audio_decoder.h" #include "sndfile_decoder.h" #include "analyse_audio_job.h" +#include "cross.h" #include "i18n.h" diff --git a/src/lib/util.cc b/src/lib/util.cc index b8b60c6f6..4cf57368a 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -942,32 +942,6 @@ still_image_file (string f) return (ext == N_(".tif") || ext == N_(".tiff") || ext == N_(".jpg") || ext == N_(".jpeg") || ext == N_(".png") || ext == N_(".bmp")); } -/** @return A pair containing CPU model name and the number of processors */ -pair -cpu_info () -{ - pair info; - info.second = 0; - -#ifdef DVDOMATIC_POSIX - ifstream f (N_("/proc/cpuinfo")); - while (f.good ()) { - string l; - getline (f, l); - if (boost::algorithm::starts_with (l, N_("model name"))) { - string::size_type const c = l.find (':'); - if (c != string::npos) { - info.first = l.substr (c + 2); - } - } else if (boost::algorithm::starts_with (l, N_("processor"))) { - ++info.second; - } - } -#endif - - return info; -} - string audio_channel_name (int c) { diff --git a/src/lib/util.h b/src/lib/util.h index 3e1d7f4b4..0d745e50c 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -299,7 +299,6 @@ private: extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second); extern bool still_image_file (std::string); -extern std::pair cpu_info (); class LocaleGuard { -- cgit v1.2.3 From 43b4e55710271c797b5d251c891047ed4da20e10 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 21:24:56 +0100 Subject: Add somewhat empirical support for YUVJ42{0,2,4}P pixels. --- src/lib/image.cc | 14 +++++++++++--- test/make_black_test.cc | 6 ++++++ test/test.cc | 3 +++ 3 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/image.cc b/src/lib/image.cc index bd527e91e..f28652d4e 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -273,11 +273,11 @@ void Image::make_black () { /* U/V black value for 8-bit colour */ - static uint8_t const eight_bit_uv = (1 << 7) - 1; + static uint8_t const eight_bit_uv = (1 << 7) - 1; /* U/V black value for 9-bit colour */ - static uint16_t const nine_bit_uv = (1 << 8) - 1; + 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; + static uint16_t const ten_bit_uv = (1 << 9) - 1; /* U/V black value for 16-bit colour */ static uint16_t const sixteen_bit_uv = (1 << 15) - 1; @@ -290,6 +290,14 @@ Image::make_black () memset (data()[2], eight_bit_uv, lines(2) * stride()[2]); break; + case PIX_FMT_YUVJ420P: + case PIX_FMT_YUVJ422P: + case PIX_FMT_YUVJ444P: + memset (data()[0], 0, lines(0) * stride()[0]); + memset (data()[1], eight_bit_uv + 1, lines(1) * stride()[1]); + memset (data()[2], eight_bit_uv + 1, lines(2) * stride()[2]); + break; + case PIX_FMT_YUV422P9LE: case PIX_FMT_YUV444P9LE: yuv_16_black (nine_bit_uv); diff --git a/test/make_black_test.cc b/test/make_black_test.cc index 3c0b979ff..714621762 100644 --- a/test/make_black_test.cc +++ b/test/make_black_test.cc @@ -35,6 +35,9 @@ BOOST_AUTO_TEST_CASE (make_black_test) pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE); pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE); pix_fmts.push_back (AV_PIX_FMT_UYVY422); + pix_fmts.push_back (AV_PIX_FMT_YUVJ420P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ422P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ444P); int N = 0; for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { @@ -46,6 +49,9 @@ BOOST_AUTO_TEST_CASE (make_black_test) for (int y = 0; y < bar->size().height; ++y) { uint8_t* q = p; for (int x = 0; x < bar->line_size()[0]; ++x) { + if (*q != 0) { + std::cerr << "x=" << x << ", (x%3)=" << (x%3) << "\n"; + } BOOST_CHECK_EQUAL (*q++, 0); } p += bar->stride()[0]; diff --git a/test/test.cc b/test/test.cc index 91c876412..65b1f9056 100644 --- a/test/test.cc +++ b/test/test.cc @@ -62,6 +62,8 @@ struct TestConfig Config::instance()->set_servers (vector ()); Config::instance()->set_server_port (61920); Config::instance()->set_default_dci_metadata (DCIMetadata ()); + Config::instance()->set_default_format (static_cast (0)); + Config::instance()->set_default_dcp_content_type (static_cast (0)); } }; @@ -101,3 +103,4 @@ new_test_film (string name) #include "job_test.cc" #include "client_server_test.cc" #include "image_test.cc" + -- cgit v1.2.3 From 8af74cd10c9568513aec0326231f5228b4782adf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 23:23:36 +0100 Subject: Try to fix build. --- src/lib/cross.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 1f1be907f..b654be6df 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -17,6 +17,8 @@ */ +#include +#include #include "cross.h" #ifdef DVDOMATIC_POSIX #include @@ -50,16 +52,16 @@ cpu_info () info.second = 0; #ifdef DVDOMATIC_LINUX - ifstream f (N_("/proc/cpuinfo")); + ifstream f ("/proc/cpuinfo"); while (f.good ()) { string l; getline (f, l); - if (boost::algorithm::starts_with (l, N_("model name"))) { + if (boost::algorithm::starts_with (l, "model name")) { string::size_type const c = l.find (':'); if (c != string::npos) { info.first = l.substr (c + 2); } - } else if (boost::algorithm::starts_with (l, N_("processor"))) { + } else if (boost::algorithm::starts_with (l, "processor")) { ++info.second; } } -- cgit v1.2.3 From 4fe7c89e54205c56f0fba2da24db66734ce23674 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 23:40:41 +0100 Subject: Fix build again. --- src/lib/cross.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib') diff --git a/src/lib/cross.cc b/src/lib/cross.cc index b654be6df..7fbba86f9 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -31,6 +31,7 @@ #endif using std::pair; +using std::ifstream; using std::string; void -- cgit v1.2.3