jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'issue227' into devel

Browse source
This commit is contained in:
John Evans 2014-04-27 14:16:08 -04:00
commit 9fc3395693
3 changed files with 70 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

67
glymur/core.py
View file

@ -38,56 +38,47 @@ CINEMA2K_24 = 1
CINEMA2K_48 = 2 CINEMA2K_48 = 2
CINEMA4K_24 = 3 CINEMA4K_24 = 3
CINEMA_MODE = { OPJ_OFF = 0 # Not Digital Cinema
'off': OFF, OPJ_CINEMA2K_24 = 1 # 2K Digital Cinema at 24 fps
'cinema2k_24': CINEMA2K_24, OPJ_CINEMA2K_48 = 2 # 2K Digital Cinema at 48 fps
'cinema2k_48': CINEMA2K_48, OPJ_CINEMA4K_24 = 3 # 4K Digital Cinema at 24 fps
'cinema4k_24': CINEMA4K_24, }
PROFILE = {
# no profile, conform to 15444-1 # no profile, conform to 15444-1
'none': 0x0000, OPJ_PROFILE_NONE = 0x0000
# profile 0 as described in 15444-1,Table A.45 # Profile 0 as described in 15444-1,Table A.45
'0': 0x0001, OPJ_PROFILE_0 = 0x0001
'zero': 0x0001, # Profile 1 as described in 15444-1,Table A.45
0: 0x0001, OPJ_PROFILE_1 = 0x0002
# profile 1 as described in 15444-1,Table A.45 # At least 1 extension defined in 15444-2 (Part-2)
'1': 0x0002, OPJ_PROFILE_PART2 = 0x8000
'one': 0x0002,
1: 0x0002,
# at least 1 extension defined in 15444-2 (Part-2)
'2': 0x8000,
2: 0x8000,
'two': 0x8000,
# 2K cinema profile defined in 15444-1 AMD1 # 2K cinema profile defined in 15444-1 AMD1
'cinema_2k': 0x0003, OPJ_PROFILE_CINEMA_2K = 0x0003
# 4K cinema profile defined in 15444-1 AMD1 # 4K cinema profile defined in 15444-1 AMD1
'cinema_4k': 0x0004, OPJ_PROFILE_CINEMA_4K = 0x0004
# scalable 2K cinema profile defined in 15444-1 AMD2 # Scalable 2K cinema profile defined in 15444-1 AMD2
'cinema_s2k': 0x0005, OPJ_PROFILE_CINEMA_S2K = 0x0005
# scalable 4K cinema profile defined in 15444-1 AMD2 # Scalable 4K cinema profile defined in 15444-1 AMD2
'cinema_s4k': 0x0006, OPJ_PROFILE_CINEMA_S4K = 0x0006
# long term storage cinema profile defined in 15444-1 AMD2 # Long term storage cinema profile defined in 15444-1 AMD2
'cinema_lts': 0x0007, OPJ_PROFILE_CINEMA_LTS = 0x0007
# Single Multi Tile Broadcast profile defined in 15444-1 AMD3 # Single Tile Broadcast profile defined in 15444-1 AMD3
'bc_single': 0x0100, OPJ_PROFILE_BC_SINGLE = 0x0100
# Multi Tile Broadcast profile defined in 15444-1 AMD3 # Multi Tile Broadcast profile defined in 15444-1 AMD3
'bc_multi': 0x0200, OPJ_PROFILE_BC_MULTI = 0x0200
# Multi Tile Reversible Broadcast profile defined in 15444-1 AMD3 # Multi Tile Reversible Broadcast profile defined in 15444-1 AMD3
'bc_multi_r': 0x0300, OPJ_PROFILE_BC_MULTI_R = 0x0300
# 2K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 # 2K Single Tile Lossy IMF profile defined in 15444-1 AMD 8
'imf_2k': 0x0400, OPJ_PROFILE_IMF_2K = 0x0400
# 4K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 # 4K Single Tile Lossy IMF profile defined in 15444-1 AMD 8
'imf_4k': 0x0401, OPJ_PROFILE_IMF_4K = 0x0401
# 8K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 # 8K Single Tile Lossy IMF profile defined in 15444-1 AMD 8
'imf_8k': 0x0402, OPJ_PROFILE_IMF_8K = 0x0402
# 2K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 # 2K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8
'imf_2k_r': 0x0403, OPJ_PROFILE_IMF_2K_R = 0x0403
# 4K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 # 4K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8
'imf_4k_r': 0x0800, OPJ_PROFILE_IMF_4K_R = 0x0800
# 8K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 # 8K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8
'imf_8k_r': 0x0801, OPJ_PROFILE_IMF_8K_R = 0x0801
}
# JPEG 2000 codestream and component size limits in cinema profiles # JPEG 2000 codestream and component size limits in cinema profiles
# #

28
glymur/jp2k.py
View file

@ -180,28 +180,28 @@ class Jp2k(Jp2kBox):
if re.match("2.0", version.openjpeg_version) is not None: if re.match("2.0", version.openjpeg_version) is not None:
# 2.0 API # 2.0 API
if fps == 24: if fps == 24:
cparams.cp_cinema = core.CINEMA_MODE['cinema2k_24'] cparams.cp_cinema = core.OPJ_CINEMA_2K_24
else: else:
cparams.cp_cinema = core.CINEMA_MODE['cinema2k_48'] cparams.cp_cinema = core.OPJ_CINEMA_2K_48
else: else:
# 2.1 API # 2.1 API
if fps == 24: if fps == 24:
cparams.rsiz = core.PROFILE['cinema_2k'] cparams.rsiz = core.OPJ_PROFILE_CINEMA_2K
cparams.max_comp_size = core.CINEMA_24_COMP cparams.max_comp_size = core.OPJ_CINEMA_24_COMP
cparams.max_cs_size = core.CINEMA_24_CS cparams.max_cs_size = core.OPJ_CINEMA_24_CS
else: else:
cparams.rsiz = core.PROFILE['cinema_2k'] cparams.rsiz = core.OPJ_PROFILE_CINEMA_2K
cparams.max_comp_size = core.CINEMA_48_COMP cparams.max_comp_size = core.OPJ_CINEMA_48_COMP
cparams.max_cs_size = core.CINEMA_48_CS cparams.max_cs_size = core.OPJ_CINEMA_48_CS
else: else:
# cinema4k # cinema4k
if re.match("2.0", version.openjpeg_version) is not None: if re.match("2.0", version.openjpeg_version) is not None:
# 2.0 API # 2.0 API
cparams.cp_cinema = core.CINEMA_MODE['cinema4k_24'] cparams.cp_cinema = core.OPJ_CINEMA_4K_24
else: else:
# 2.1 API # 2.1 API
cparams.rsiz = core.PROFILE['cinema_4k'] cparams.rsiz = core.OPJ_PROFILE_CINEMA_4K
return return
@ -1642,9 +1642,17 @@ def _populate_image_struct(cparams, image, imgdata):
# Stage the image data to the openjpeg data structure. # Stage the image data to the openjpeg data structure.
for k in range(0, num_comps): for k in range(0, num_comps):
if re.match("2.0", version.openjpeg_version) is not None:
# 2.0 API
if cparams.cp_cinema: if cparams.cp_cinema:
image.contents.comps[k].prec = 12 image.contents.comps[k].prec = 12
image.contents.comps[k].bpp = 12 image.contents.comps[k].bpp = 12
else:
# 2.1 API
if cparams.rsiz in (core.OPJ_PROFILE_CINEMA_2K,
core.OPJ_PROFILE_CINEMA_4K):
image.contents.comps[k].prec = 12
image.contents.comps[k].bpp = 12
layer = np.ascontiguousarray(imgdata[:, :, k], dtype=np.int32) layer = np.ascontiguousarray(imgdata[:, :, k], dtype=np.int32)
dest = image.contents.comps[k].data dest = image.contents.comps[k].data

7
glymur/test/test_opj_suite_write.py
View file

@ -11,6 +11,7 @@ import re
import sys import sys
import tempfile import tempfile
import unittest import unittest
import warnings
try: try:
import skimage.io import skimage.io
@ -156,6 +157,9 @@ class TestSuiteWriteCinema(unittest.TestCase):
data = skimage.io.imread(infile) data = skimage.io.imread(infile)
with tempfile.NamedTemporaryFile(suffix='.j2k') as tfile: with tempfile.NamedTemporaryFile(suffix='.j2k') as tfile:
j = Jp2k(tfile.name, 'wb') j = Jp2k(tfile.name, 'wb')
with warnings.catch_warnings():
# Just turn off warnings.
warnings.simplefilter("ignore")
j.write(data, cinema4k=True) j.write(data, cinema4k=True)
codestream = j.get_codestream() codestream = j.get_codestream()
@ -216,6 +220,9 @@ class TestSuiteWriteCinema(unittest.TestCase):
data = skimage.io.imread(infile) data = skimage.io.imread(infile)
with tempfile.NamedTemporaryFile(suffix='.j2k') as tfile: with tempfile.NamedTemporaryFile(suffix='.j2k') as tfile:
j = Jp2k(tfile.name, 'wb') j = Jp2k(tfile.name, 'wb')
with warnings.catch_warnings():
# Just turn off warnings.
warnings.simplefilter("ignore")
j.write(data, cinema2k=48) j.write(data, cinema2k=48)
codestream = j.get_codestream() codestream = j.get_codestream()