更新typing和示例

Author: Puiching-Memory

README.md

@@ -53,25 +53,52 @@ pip install pylibde265
 
 ```python
 """
-to run this example, you need install pylibde265 and matplotlib and colour-science package.
+to run this example, you need install pylibde265 and matplotlib
 ---
 here is my environment:
-matplotlib==3.10.0
-colour-science==0.4.6
+matplotlib==3.10.1
 """
 
-import pylibde265.pyde265
+import pylibde265.de265
 import matplotlib.pyplot as plt
-import colour
 import os
-
-print(dir(pylibde265.pyde265))
-print(f"libde265 version: {pylibde265.pyde265.get_version()}")
+import numpy as np
+
+def ycbcr_to_rgb(ycbcr_image):
+    """
+    YCbCr --> RGB (BT.601)
+    ---
+  
+    args:
+        ycbcr_image: numpy.ndarray (height, width, 3) [0, 255]
+  
+    return:
+        numpy.ndarray (height, width, 3) [0, 255]
+    """
+    ycbcr = ycbcr_image.astype(np.float32)
+    height, width, _ = ycbcr.shape
+  
+    inv_matrix = np.array([
+        [1.164,  0.0,   1.596],
+        [1.164, -0.813, -0.391],
+        [1.164,  2.018, 0.0]
+    ])
+    shift = np.array([16.0, 128.0, 128.0])
+  
+    ycbcr_shifted = ycbcr - shift
+    rgb_linear = np.dot(ycbcr_shifted, inv_matrix.T)
+    rgb = np.clip(rgb_linear, 0, 255).astype(np.uint8)
+  
+    return rgb
+
+print(dir(pylibde265.de265))
+print(f"libde265 version: {pylibde265.de265.get_version()}")
+print(f"pylibde265 version: {pylibde265.__version__}")
 
 VEDIO_PATH = "./multimedia/video/Kinkaku-ji.h265"
 NUMBER_OF_THREADS = os.cpu_count()
 
-decoder = pylibde265.pyde265.decoder(NUMBER_OF_THREADS)
+decoder = pylibde265.de265.decoder(NUMBER_OF_THREADS)
 
 error = decoder.load(VEDIO_PATH)
 frame = 0
@@ -81,21 +108,15 @@ for image_martix in decoder.decode():
     print(f"frame ------{frame}------")
     print(f"width: {decoder.w} height: {decoder.h}")
     print(f"chroma: {decoder.chroma} bps: {decoder.bps}")
-    print(f"pts: {decoder.pts} ttd: {decoder.ttd} ttd_max: {decoder.ttd_max}")
-
-    image_martix = colour.YCbCr_to_RGB(
-        image_martix,
-        in_bits=8,
-        in_int=True,
-        in_legal=True,
-        out_bits=8,
-        out_legal=True,
-    )
+    print(f"pts: {decoder.pts} matrix_coeff: {decoder.matrix_coeff}")
+    print(f"current TID {decoder.get_current_TID()} / {decoder.get_highest_TID()}")
+
+
+    image_martix = ycbcr_to_rgb(image_martix)
     plt.imshow(image_martix)
     plt.show()
 
     break
-
 ```
 
 ![example_preview.png](./multimedia/image/example.png)

running_example.py

@@ -1,27 +1,50 @@
 """
-to run this example, you need install pylibde265 and matplotlib and colour-science package.
+to run this example, you need install pylibde265 and matplotlib
 ---
 here is my environment:
-matplotlib==3.10.0
-colour-science==0.4.6
+matplotlib==3.10.1
 """
 
-import pylibde265.pyde265
+import pylibde265.de265
 import matplotlib.pyplot as plt
-import colour
 import os
-from pyinstrument import Profiler
+import numpy as np
 
-profiler = Profiler()
-profiler.start()
+def ycbcr_to_rgb(ycbcr_image):
+    """
+    YCbCr --> RGB (BT.601)
+    ---
+    
+    args:
+        ycbcr_image: numpy.ndarray (height, width, 3) [0, 255]
+    
+    return:
+        numpy.ndarray (height, width, 3) [0, 255]
+    """
+    ycbcr = ycbcr_image.astype(np.float32)
+    height, width, _ = ycbcr.shape
+    
+    inv_matrix = np.array([
+        [1.164,  0.0,   1.596],
+        [1.164, -0.813, -0.391],
+        [1.164,  2.018, 0.0]
+    ])
+    shift = np.array([16.0, 128.0, 128.0])
+    
+    ycbcr_shifted = ycbcr - shift
+    rgb_linear = np.dot(ycbcr_shifted, inv_matrix.T)
+    rgb = np.clip(rgb_linear, 0, 255).astype(np.uint8)
+    
+    return rgb
 
-print(dir(pylibde265.pyde265))
-print(f"libde265 version: {pylibde265.pyde265.get_version()}")
+print(dir(pylibde265.de265))
+print(f"libde265 version: {pylibde265.de265.get_version()}")
+print(f"pylibde265 version: {pylibde265.__version__}")
 
 VEDIO_PATH = "./multimedia/video/Kinkaku-ji.h265"
 NUMBER_OF_THREADS = os.cpu_count()
 
-decoder = pylibde265.pyde265.decoder(NUMBER_OF_THREADS)
+decoder = pylibde265.de265.decoder(NUMBER_OF_THREADS)
 
 error = decoder.load(VEDIO_PATH)
 frame = 0
@@ -31,20 +54,12 @@
     print(f"frame ------{frame}------")
     print(f"width: {decoder.w} height: {decoder.h}")
     print(f"chroma: {decoder.chroma} bps: {decoder.bps}")
-    print(f"pts: {decoder.pts} ttd: {decoder.ttd} ttd_max: {decoder.ttd_max}")
-
-    image_martix = colour.YCbCr_to_RGB(
-        image_martix,
-        in_bits=8,
-        in_int=True,
-        in_legal=True,
-        out_bits=8,
-        out_legal=True,
-    )
-    # plt.imshow(image_martix)
-    # plt.show()
-
-    break
-
-profiler.stop()
-print(profiler.output_text(unicode=True, color=True))
+    print(f"pts: {decoder.pts} matrix_coeff: {decoder.matrix_coeff}")
+    print(f"current TID {decoder.get_current_TID()} / {decoder.get_highest_TID()}")
+
+
+    image_martix = ycbcr_to_rgb(image_martix)
+    plt.imshow(image_martix)
+    plt.show()
+
+    break

setup.py

@@ -46,6 +46,6 @@
     ext_modules=cythonize(ext_modules, nthreads=os.cpu_count(), annotate=True),
     data_files=[
         ("", ["./libde265/build/libde265/Release/libde265.dll"]),
-        ("Lib/site-packages/pylibde265", ["typing/pyde265.pyi"]),
+        ("Lib/site-packages/pylibde265", ["typing/de265.pyi"]),
     ],
 )

src/pylibde265/de265.pyx

@@ -4,26 +4,27 @@ from cython.parallel import prange
 import numpy as np
 cimport numpy as cnp
 # from scipy.ndimage import zoom  
+from typing import Union
 from pylibde265 cimport de265
 
-def get_version()->str:
+def get_version() -> str:
     return de265.de265_get_version().decode('ascii')
 
-def get_error_text(err_number:int)->str:
+def get_error_text(err_number: int) -> str:
     return de265.de265_get_error_text(err_number).decode('ascii')
 
-def isOk(err_number:int)->bool:
+def isOk(err_number: int) -> bool:
     return de265.de265_isOK(err_number)
 
-def set_verbosity(level:int)->None:
+def set_verbosity(level: int) -> None:
     de265.de265_set_verbosity(level)
 
 
 cdef class decoder(object):
     cdef int threads
     cdef int buffer_size
     cdef de265.de265_decoder_context* ctx
-    cdef readonly int w,h,chroma,bps,pts,ttd_max,ttd
+    cdef readonly int w,h,chroma,bps,pts,matrix_coeff
     cdef readonly int wC,hC
 
     def __cinit__(self,int threads,int buffer_size=102400):
@@ -85,8 +86,7 @@ cdef class decoder(object):
                 self.chroma = de265.de265_get_chroma_format(image_ptr)
                 self.bps = de265.de265_get_bits_per_pixel(image_ptr,0)
                 self.pts = de265.de265_get_image_PTS(image_ptr)
-                self.ttd_max = de265.de265_get_highest_TID(self.ctx)
-                self.ttd =  de265.de265_get_current_TID(self.ctx)
+                self.matrix_coeff = de265.de265_get_image_matrix_coefficients(image_ptr)
 
                 if self.chroma == 1: # 4:2:0
                     self.wC = self.w // 2
@@ -134,3 +134,28 @@ cdef class decoder(object):
     def free_image(self):
         de265.de265_release_next_picture(self.ctx)
 
+    def get_highest_TID(self) -> int:
+        return de265.de265_get_highest_TID(self.ctx)
+
+    def get_current_TID(self) -> int:
+        return de265.de265_get_current_TID(self.ctx)
+
+    def set_limit_TID(self, ttd: int):
+        de265.de265_set_limit_TID(self.ctx,ttd)
+
+    def set_framerate_ratio(self, percent: int):
+        # 0 ~ 100 (%)
+        de265.de265_set_framerate_ratio(self.ctx, percent)
+
+    def change_framerate(self, more_vs_less: int) -> int:
+        # 1: more, -1: less
+        return de265.de265_change_framerate(self.ctx, more_vs_less)
+
+    def set_parameter(self, param: int, value: Union[int, bool]):
+        if type(value) == bool:
+            de265.de265_set_parameter_bool(self.ctx, param, value)
+        elif type(value) == int:
+            de265.de265_set_parameter_int(self.ctx, param, value)
+
+    def get_parameter(self, param: int) -> bool:
+        return bool(de265.de265_get_parameter_bool(self.ctx, param))

typing/de265.pyi

@@ -0,0 +1,29 @@
+from typing import Union
+
+def get_version() -> str: ...
+def get_error_text(err_number: int) -> str: ...
+def isOk(err_number: int) -> bool: ...
+def set_verbosity(level: int) -> None: ...
+
+class decoder:
+    w: int
+    h: int
+    chroma: int
+    bps: int
+    pts: int
+    matrix_coeff: int
+
+    wC: int
+    hC: int
+
+    def __init__(self, threads: int, buffer_size: int) -> None: ...
+    def load(self, vedio_path: str) -> int: ...
+    def decode(self) -> None: ...
+    def free_image(self) -> None: ...
+    def get_highest_TID(self) -> int: ...
+    def get_current_TID(self) -> int: ...
+    def set_limit_TID(self, ttd: int): ...
+    def set_framerate_ratio(self, percent: int): ...
+    def change_framerate(self, more_vs_less: int) -> int: ...
+    def set_parameter(self, param: int, value: Union[int, bool]): ...
+    def get_parameter(self, param: int) -> bool: ...