Skip to content

Commit

Permalink
#511 tidy up
Browse files Browse the repository at this point in the history
  • Loading branch information
@totaam
totaam committed Jan 21, 2025
1 parent 616a193 commit d9ac564
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 85 deletions.
72 changes: 43 additions & 29 deletions xpra/codecs/amf/amf.pxd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,33 +135,6 @@ cdef inline RESULT_STR(AMF_RESULT res):
}.get(res, "")


cdef extern from "core/Variant.h":
ctypedef enum AMF_VARIANT_TYPE:
AMF_VARIANT_EMPTY # 0
AMF_VARIANT_BOOL # 1
AMF_VARIANT_INT64 # 2
AMF_VARIANT_DOUBLE # 3
AMF_VARIANT_RECT # 4
AMF_VARIANT_SIZE # 5
AMF_VARIANT_POINT # 6
AMF_VARIANT_RATE # 7
AMF_VARIANT_RATIO # 8
AMF_VARIANT_COLOR # 9
AMF_VARIANT_STRING # 10 // value is char*
AMF_VARIANT_WSTRING # 11 // value is wchar_t*
AMF_VARIANT_INTERFACE # 12 // value is AMFInterface*
AMF_VARIANT_FLOAT # 13
AMF_VARIANT_FLOAT_SIZE # 14
AMF_VARIANT_FLOAT_POINT2D # 15
AMF_VARIANT_FLOAT_POINT3D # 16
AMF_VARIANT_FLOAT_VECTOR4D # 17

ctypedef struct AMFVariantStruct:
pass

AMF_RESULT AMFVariantAssignInt64(AMFVariantStruct* pDest, amf_int64 value)


cdef extern from "core/Data.h":
ctypedef enum AMF_DATA_TYPE:
AMF_DATA_BUFFER # 0
Expand All @@ -187,8 +160,8 @@ cdef extern from "core/Data.h":
ctypedef amf_long (*DATA_RELEASE)(AMFData* pThis)
ctypedef AMF_RESULT (*DATA_QUERYINTERFACE)(AMFData* pThis, const AMFGuid *interfaceID, void** ppInterface)
ctypedef amf_size (*DATA_GETPROPERTYCOUNT)(AMFData* pThis)
ctypedef AMF_MEMORY_TYPE (*DATA_GETMEMORYTYPE)(AMFData* pThis);
ctypedef AMF_DATA_TYPE (*DATA_GETDATATYPE)(AMFData* pThis);
ctypedef AMF_MEMORY_TYPE (*DATA_GETMEMORYTYPE)(AMFData* pThis)
ctypedef AMF_DATA_TYPE (*DATA_GETDATATYPE)(AMFData* pThis)

ctypedef struct AMFDataVtbl:
DATA_ACQUIRE Acquire
Expand All @@ -202,6 +175,14 @@ cdef extern from "core/Data.h":
const AMFDataVtbl *pVtbl

cdef extern from "core/Platform.h":
ctypedef struct AMFSize:
amf_int32 width
amf_int32 height

ctypedef struct AMFRate:
amf_uint32 num
amf_uint32 den

ctypedef struct AMFGuid:
amf_uint32 data1
amf_uint16 data2
Expand All @@ -220,6 +201,39 @@ cdef extern from "core/Platform.h":
amf_int32 right
amf_int32 bottom


cdef extern from "core/Variant.h":
ctypedef enum AMF_VARIANT_TYPE:
AMF_VARIANT_EMPTY # 0
AMF_VARIANT_BOOL # 1
AMF_VARIANT_INT64 # 2
AMF_VARIANT_DOUBLE # 3
AMF_VARIANT_RECT # 4
AMF_VARIANT_SIZE # 5
AMF_VARIANT_POINT # 6
AMF_VARIANT_RATE # 7
AMF_VARIANT_RATIO # 8
AMF_VARIANT_COLOR # 9
AMF_VARIANT_STRING # 10 // value is char*
AMF_VARIANT_WSTRING # 11 // value is wchar_t*
AMF_VARIANT_INTERFACE # 12 // value is AMFInterface*
AMF_VARIANT_FLOAT # 13
AMF_VARIANT_FLOAT_SIZE # 14
AMF_VARIANT_FLOAT_POINT2D # 15
AMF_VARIANT_FLOAT_POINT3D # 16
AMF_VARIANT_FLOAT_VECTOR4D # 17


ctypedef struct AMFVariantStruct:
AMF_VARIANT_TYPE type
AMFSize sizeValue
AMFRate rateValue

AMF_RESULT AMFVariantInit(AMFVariantStruct* pDest)
AMF_RESULT AMFVariantAssignInt64(AMFVariantStruct* pDest, amf_int64 value)
AMF_RESULT AMFVariantAssignSize(AMFVariantStruct* pDest, const AMFSize &value)
AMF_RESULT AMFVariantAssignRate(AMFVariantStruct* pDest, const AMFRate &value)

cdef extern from "core/Plane.h":
ctypedef enum AMF_PLANE_TYPE:
AMF_PLANE_UNKNOWN # 0
Expand Down
149 changes: 94 additions & 55 deletions xpra/codecs/amf/encoder.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ log = Logger("encoder", "amf")
from xpra.codecs.constants import VideoSpec, get_subsampling_divs
from xpra.codecs.image import ImageWrapper
from xpra.os_util import WIN32
from xpra.util.env import envbool
from xpra.util.objects import typedict
from xpra.util.env import envbool, first_time
from xpra.util.objects import AtomicInteger, typedict

from libc.stddef cimport wchar_t
from libc.stdint cimport uint8_t, uint64_t, int64_t, uintptr_t
Expand All @@ -27,37 +27,46 @@ from libc.string cimport memset
from xpra.codecs.amf.amf cimport (
set_guid,
RESULT_STR,
AMF_PLANE_TYPE_STR, AMF_SURFACE_FORMAT_STR, AMF_FRAME_TYPE_STR,
AMF_PLANE_TYPE_STR, AMF_SURFACE_FORMAT_STR,
AMF_FRAME_TYPE, AMF_FRAME_TYPE_STR,
AMF_RESULT, AMF_EOF, AMF_REPEAT,
AMF_DX11_0,
AMF_MEMORY_TYPE,
AMF_MEMORY_DX11,
AMF_INPUT_FULL,
AMF_SURFACE_FORMAT, AMF_SURFACE_YUV420P, AMF_SURFACE_NV12, AMF_SURFACE_BGRA,
AMF_VARIANT_TYPE, AMF_VARIANT_INT64, AMF_VARIANT_RECT,
AMF_VARIANT_TYPE, AMF_VARIANT_INT64, AMF_VARIANT_SIZE, AMF_VARIANT_RATE,
AMF_VIDEO_ENCODER_USAGE_ENUM,
AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY,
AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM,
AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY,
AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED,
AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED,
AMF_VIDEO_ENCODER_AV1_LEVEL_5_1,
AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN,
AMF_VIDEO_ENCODER_AV1_USAGE_ULTRA_LOW_LATENCY,
AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_ENUM,
AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_HIGH_QUALITY,
AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_QUALITY,
AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED,
AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_BALANCED,
AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM,
AMF_VIDEO_ENCODER_HEVC_USAGE_ULTRA_LOW_LATENCY,
AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM,
AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_QUALITY,
AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED,
AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_BALANCED,
amf_handle, amf_long, amf_int32,
AMFDataAllocatorCB,
AMFSize, AMFRate,
AMFGuid,
AMFBuffer,
AMFComponentOptimizationCallback,
AMFPlane, AMFPlaneVtbl,
AMFData, AMFDataVtbl,
AMFTrace,
AMFVariantStruct,
AMFVariantAssignInt64,
AMFVariantStruct, AMFVariantInit,
AMFVariantAssignInt64, AMFVariantAssignSize, AMFVariantAssignRate,
AMFSurface, AMFSurfaceVtbl,
AMFContext,
AMFComponent,
Expand Down Expand Up @@ -139,6 +148,31 @@ cdef uint64_t get_c_version():
return 0
return int(version.value)

cdef inline AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM get_h264_preset(int quality, int speed):
if quality >= 80:
return AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY
if speed >= 80:
return AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED
return AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED


cdef inline AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_ENUM get_av1_preset(int quality, int speed):
if quality >= 90:
return AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_HIGH_QUALITY
if quality >= 90:
return AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_QUALITY
if speed >= 80:
return AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED
return AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_BALANCED


cdef inline AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM get_hevc_preset(int quality, int speed):
if quality >= 80:
return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_QUALITY
if speed >= 80:
return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED
return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_BALANCED


def check(res: AMF_RESULT, message: str):
if res == 0:
Expand Down Expand Up @@ -218,6 +252,9 @@ def get_specs(encoding: str, colorspace: str) -> Sequence[VideoSpec]:
)


generation = AtomicInteger()


cdef class Encoder:
cdef AMFContext *context
cdef AMFComponent* encoder
Expand All @@ -231,6 +268,7 @@ cdef class Encoder:
cdef object src_format
cdef int speed
cdef int quality
cdef unsigned int generation
cdef object file

cdef object __weakref__
Expand All @@ -239,7 +277,7 @@ cdef class Encoder:
unsigned int width, unsigned int height,
src_format: str,
options: typedict) -> None:
log("amf init_context%s", (encoding, width, height, src_format, options))
log(f"amf init_context%s {SAVE_TO_FILE=}", (encoding, width, height, src_format, options))
assert encoding in get_encodings(), "invalid encoding: %s" % encoding
assert options.get("scaled-width", width)==width, "amf encoder does not handle scaling"
assert options.get("scaled-height", height)==height, "amf encoder does not handle scaling"
Expand Down Expand Up @@ -271,6 +309,7 @@ cdef class Encoder:
self.amf_surface_init()
self.amf_encoder_init(options)

self.generation = generation.increase()
if SAVE_TO_FILE:
filename = SAVE_TO_FILE+f"amf-{self.generation}.{encoding}"
self.file = open(filename, "wb")
Expand All @@ -291,6 +330,14 @@ cdef class Encoder:
log(f"amf_context_init() InitDX11()={res}")
self.check(res, "AMF DX11 device initialization")
self.device = self.context.pVtbl.GetDX11Device(self.context, AMF_DX11_0)
assert self.device
from xpra.platform.win32.d3d11.device import D3D11Device
device = D3D11Device(<uintptr_t> self.device)
device_info = device.get_info()
log("device: %s", device_info)
descr = device_info.get("description", "")
if descr and first_time(f"GPU:{descr}"):
log.info(f"AMF initialized using DX11 device {descr!r}")
else:
res = self.context.pVtbl.InitOpenGL(self.context, NULL, NULL, NULL)
log(f"amf_context_init() InitOpenGL()={res}")
Expand All @@ -303,14 +350,12 @@ cdef class Encoder:
cdef AMF_MEMORY_TYPE memory = AMF_MEMORY_DX11
cdef AMF_RESULT res = self.context.pVtbl.AllocSurface(self.context, memory, self.surface_format, self.width, self.height, &self.surface)
self.check(res, "AMF surface initialization for {self.width}x{self.height} {self.src_format}")
log(f"amf_surface_init() surface=%#x", <uintptr_t> self.surface)
log(f"amf_surface_init() surface=%s", self.get_surface_info(self.surface))

cdef void set_encoder_property(self, name: str, variant: AMF_VARIANT_TYPE, value):
cdef AMFVariantStruct var
AMFVariantAssignInt64(&var, value)
cdef void set_encoder_property(self, name: str, AMFVariantStruct var):
cdef wchar_t *prop = PyUnicode_AsWideCharString(name, NULL)
ret = self.encoder.pVtbl.SetProperty(self.encoder, prop, var)
self.check(ret, f"AMF encoder setting property {name} to {value}")
self.check(ret, f"AMF encoder setting property {name} to {var!r}")
PyMem_Free(prop)

def amf_encoder_init(self, options: typedict) -> None:
Expand All @@ -328,68 +373,62 @@ cdef class Encoder:
quality = options.intget("quality", 50)
bwlimit = options.intget("bandwidth-limit", 0)

cdef AMFVariantStruct var
cdef AMFSize size
cdef AMFRate rate
def setint64(prop: str, value: int) -> None:
self.set_encoder_property(prop, AMF_VARIANT_INT64, value)
self.check(AMFVariantInit(&var), "AMF variant initialization")
AMFVariantAssignInt64(&var, value)
self.set_encoder_property(prop, var)
def setsize(prop: str) -> None:
self.check(AMFVariantInit(&var), "AMF variant initialization")
var.type = AMF_VARIANT_SIZE
var.sizeValue.width = self.width
var.sizeValue.height = self.height
self.set_encoder_property(prop, var)
def setframerate(prop: str) -> None:
self.check(AMFVariantInit(&var), "AMF variant initialization")
var.type = AMF_VARIANT_RATE
var.rateValue.num = 25
var.rateValue.den = 1
self.set_encoder_property(prop, var)
def setbitrate(prop: str) -> None:
if bwlimit:
setint64(prop, value=bwlimit)

# tune encoder:
if self.encoding == "h264":
setsize("FrameSize")
setframerate("FrameRate")
setbitrate("TargetBitrate")
setint64("Usage", value=AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY)
if quality >= 80:
setint64("QualityPreset", value=AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY)
elif speed >= 80:
setint64("QualityPreset", value=AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED)
else:
setint64("QualityPreset", value=AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED)

if bwlimit:
setint64("TargetBitrate", value=bwlimit)

setint64("QualityPreset", get_h264_preset(quality, speed))
if False:
#AMFRect(w, h)
#self.set_encoder_property("FrameSize", AMF_VARIANT_RECT, rect)
#AMFRate(1, rate)
#self.set_encoder_property("FrameRate", AMF_VARIANT_RATE, rate)
#4K:
setint64("Profile", value=AMF_VIDEO_ENCODER_PROFILE_HIGH)
setint64("ProfileLevel", value=AMF_H264_LEVEL__5_1)

if not options.boolget("b-frames", False):
setint64("BPicturesPattern", value=0)
# can be not supported - check Capability Manager sample
elif self.encoding == "av1":
setsize("Av1FrameSize")
setframerate("Av1FrameRate")
setbitrate("Av1TargetBitrate")
setint64("Av1Usage", value=AMF_VIDEO_ENCODER_AV1_USAGE_ULTRA_LOW_LATENCY)
setint64("Av1QualityPreset", get_av1_preset(quality, speed))
setint64("Av1Profile", AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN)
setint64("Av1Level", AMF_VIDEO_ENCODER_AV1_LEVEL_5_1)

if bwlimit:
setint64("Av1TargetBitrate", bwlimit)

if quality >= 90:
setint64("Av1QualityPreset", value=AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_HIGH_QUALITY)
elif quality >= 90:
setint64("Av1QualityPreset", value=AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_QUALITY)
elif speed >= 80:
setint64("Av1QualityPreset", value=AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED)
else:
setint64("Av1QualityPreset", value=AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_BALANCED)

#"Av1FrameSize", size)
#"Av1FrameRate, rate)
if False:
setint64("Av1AlignmentMode", AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS)
elif self.encoding == "hevc":
setint64("HevcUsage", AMF_VIDEO_ENCODER_HEVC_USAGE_ULTRA_LOW_LATENCY)
setint64("HevcQualityPreset", AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED)
#"HevcFrameRate", framerate)
#"HevcFrameSize", size)
if bwlimit:
setint64("HevcTargetBitrate", bwlimit)

#AMF_ASSIGN_PROPERTY_INT64(res, encoder, AMF_VIDEO_ENCODER_HEVC_TIER, AMF_VIDEO_ENCODER_HEVC_TIER_HIGH)
#AMF_ASSIGN_PROPERTY_INT64(res, encoder, AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, AMF_LEVEL_5_1)
setint64("HevcQualityPreset", get_hevc_preset(quality, speed))
setsize("HevcFrameSize")
setframerate("HevcFrameRate")
setbitrate("HevcTargetBitrate")
# setint64(AMF_VIDEO_ENCODER_HEVC_TIER, AMF_VIDEO_ENCODER_HEVC_TIER_HIGH)
# setint64(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, AMF_LEVEL_5_1)
else:
raise RuntimeError(f"unexpected encoding {self.encoding!r}")

# init:
res = self.encoder.pVtbl.Init(self.encoder, self.surface_format, self.width, self.height)
self.check(res, "AMF {self.encoding!r} encoder initialization for {self.width}x{self.height} {self.src_format}")
Expand Down Expand Up @@ -542,7 +581,7 @@ cdef class Encoder:
dst_texture = <uintptr_t> plane.pVtbl.GetNative(plane)
log("texture=%#x, source=%#x", dst_texture, <uintptr_t> pic_in[plane_index])
assert dst_texture
#dc.update_2dtexture(dst_texture, self.width, self.height,
# dc.update_2dtexture(dst_texture, self.width, self.height,
# <uintptr_t> pic_in[plane_index], strides[plane_index])
dc.flush()

Expand Down Expand Up @@ -629,7 +668,7 @@ cdef class Encoder:
assert surface
cdef const AMFSurfaceVtbl *sfn = surface.pVtbl
fmt = sfn.GetFormat(surface)
ftype = sfn.GetFrameType(surface)
cdef AMF_FRAME_TYPE ftype = sfn.GetFrameType(surface)
return {
"format": AMF_SURFACE_FORMAT_STR(fmt),
"planes": sfn.GetPlanesCount(surface),
Expand Down
2 changes: 1 addition & 1 deletion xpra/platform/win32/d3d11/device.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ cdef class D3D11Device:
"system": desc.DedicatedSystemMemory,
"shared": desc.SharedSystemMemory,
},
"luid": hex(desc.AdapterLuid.HighPart) + ":" + hex(desc.AdapterLuid.LowPart),
"luid": "%#x:%#x" % (desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart),
})
return info

Expand Down

0 comments on commit d9ac564

Please sign in to comment.