a new version requiring x265 v4.1 and higher

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fits_web_ql"
-version = "4.5.0"
+version = "4.5.1"
 authors = ["jvo203 <chris.zapart@nao.ac.jp>"]
 edition = "2021"
 
@@ -10,7 +10,6 @@ jvo = []
 use-intrinsics = []
 hevc = []
 vp9 = []
-production = []
 cdn = []
 cuda = []
 opencl = ["ocl", "rand"]

Makefile

@@ -13,7 +13,7 @@ thor:
 #-s ALLOW_MEMORY_GROWTH=1
 EMCC_TOTAL_MEMORY=536870912
 
-WASM_STRING = WASM2024-09-06.0
+WASM_STRING = WASM2025-01-20.0
 
 hevc:
 #em++ -O3 -Wno-deprecated -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s EXTRA_EXPORTED_RUNTIME_METHODS='["cwrap"]' -s EXPORTED_FUNCTIONS="['_malloc','_free']"  -I$(HOME)/jctvc-hm/source/Lib $(HOME)/jctvc-hm/source/Lib/TLibCommon/*.cpp $(HOME)/jctvc-hm/source/Lib/TLibDecoder/*.cpp src/colourmap.c src/hevc_decoder.cpp -o build/hevc.js
@@ -24,7 +24,7 @@ hevc:
 vpx:
 	emcc -Oz -s ALLOW_MEMORY_GROWTH=1 -s EXTRA_EXPORTED_RUNTIME_METHODS='["cwrap"]' -s EXPORTED_FUNCTIONS="['_malloc','_free']" -I/home/chris/ogv.js/build/js/root/include -L/home/chris/ogv.js/build/js/root/lib /home/chris/ogv.js/build/js/root/lib/libvpx.so src/colourmap.c src/vpx_decoder.c -o build/vpx.js
 
-FPZIP_STRING = WASM2024-09-06.0
+FPZIP_STRING = WASM2025-01-20.0
 
 FPZIP=fpzip
 SRC=$(FPZIP)/src/*.cpp

README.md

@@ -152,24 +152,22 @@ sudo make install
 (when compiling from source enforce -fPIC by means of the configure flag --enable-pic)
 
 ##
-install x265 version 2.8 or higher
+install x265 version 4.1 or higher (the code does not work with 4.0 or lower due to API changes in the x265 library)
 
 macOS: "brew install x265"
 
 other systems follow:
 
 http://www.linuxfromscratch.org/blfs/view/svn/multimedia/x265.html
 
-cd x265_2.9
+wget https://bitbucket.org/multicoreware/x265_git/downloads/x265_4.1.tar.gz
+tar zxvf x265_4.1.tar.gz
+cd x265_4.1
 
 mkdir -p build
-
 cd build
-
 cmake ../source
-
 make
-
 sudo make install
 
 please be sure to have nasm installed beforehand when building from source, plus NUMA API: numactl and numa development library libnuma (package libnuma-dev on Ubuntu)
@@ -214,23 +212,23 @@ target/release/fits_web_ql --port 8080 --interface 0.0.0.0 --home /a/path/to/you
 # How to Run the Production Server (only at the Japanese Virtual Observatory)
 cd into the fits_web_ql directory and execute
 
-cargo run --features 'jvo production cdn zfp' --release
+cargo run --features 'jvo cdn zfp' --release
 
 or
 
-cargo run --features 'jvo production cdn zfp' --release -- --path fitswebql_v4
+cargo run --features 'jvo cdn zfp' --release -- --path fitswebql_v4
 
 # extra features and options
 
-The "--features" option enables extra functionality. JVO-reserved features are "jvo" and "production". "cdn" can be used by anyone to speed up delivery of static resources by utilising a jsDelivr open-source content delivery network (https://www.jsdelivr.com). "cdn" is especially recommended if many users are accessing a remote FITSWebQL server. There is no need to use it on your personal computer. "zfp" enables ZFP compression for FITS data cubes held in an internal FITSWebQL cache in order to (theoretically) speed-up loading times (see a note at the end of this README). "ipp" enables use of the Intel Integrated Performance Primitives (IPP) library in some places (for example rescaling images/videos).
+The "--features" option enables extra functionality. A JVO-reserved feature is named "jvo". "cdn" can be used by anyone to speed up delivery of static resources by utilising a jsDelivr open-source content delivery network (https://www.jsdelivr.com). "cdn" is especially recommended if many users are accessing a remote FITSWebQL server. There is no need to use it on your personal computer. "zfp" enables ZFP compression for FITS data cubes held in an internal FITSWebQL cache in order to (theoretically) speed-up loading times (see a note at the end of this README). "ipp" enables use of the Intel Integrated Performance Primitives (IPP) library in some places (for example rescaling images/videos).
 
 an alternative HTTP port
 
 cargo run --features 'cdn' --release -- --port 8000
 
 an alternative URL path (JVO-specific)
 
-cargo run --features 'jvo production cdn zfp' --release -- --path fitswebql_v4
+cargo run --features 'jvo cdn zfp' --release -- --path fitswebql_v4
 
 an alternative network interface (only needed to make the local version operate in a remote-server mode)
 

src/fits.rs

@@ -244,18 +244,9 @@ static JVO_FITS_DB: &'static str = "alma";
 #[cfg(feature = "jvo")]
 pub static FITSHOME: &'static str = "/home";
 
-//#[cfg(not(feature = "production"))]
 pub static FITSCACHE: &'static str = "FITSCACHE";
-
-//#[cfg(not(feature = "production"))]
 pub static IMAGECACHE: &'static str = "IMAGECACHE";
 
-/*#[cfg(feature = "production")]
-pub static FITSCACHE: &'static str = "/ssd0/chris/fitswebql/FITSCACHE";
-
-#[cfg(feature = "production")]
-pub static IMAGECACHE: &'static str = "/ssd0/chris/fitswebql/IMAGECACHE";*/
-
 #[cfg(feature = "raid")]
 pub static RAID_PREFIX: &'static str = "/Volumes/SSD";
 

src/main.rs

@@ -2677,10 +2677,10 @@ lazy_static! {
 #[cfg(feature = "jvo")]
 static LOG_DIRECTORY: &'static str = "LOGS";
 
-static SERVER_STRING: &'static str = "FITSWebQL v4.5.0";
-static VERSION_STRING: &'static str = "R/SV2025-01-17.0";
-static WASM_STRING: &'static str = "WASM2024-09-06.0";
-static FPZIP_STRING: &'static str = "WASM2024-09-06.0";
+static SERVER_STRING: &'static str = "FITSWebQL v4.5.1";
+static VERSION_STRING: &'static str = "R/SV2025-01-20.0";
+static WASM_STRING: &'static str = "WASM2025-01-20.0";
+static FPZIP_STRING: &'static str = "WASM2025-01-20.0";
 
 #[cfg(not(feature = "jvo"))]
 static SERVER_MODE: &'static str = "LOCAL";