scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 17:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement af5d584 and 3adb9a4 from master

Browse Source 
Implement [af5d584](af5d5841d0) and [3adb9a4](3adb9a46cc)
This commit is contained in:
atrivialatomic
2024-09-06 17:25:38 -04:00
parent 0b5714727b
commit bf7e84dde7
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/video_compress/cmpto_j2k.cpp
View File

@@ -248,12 +248,10 @@ struct state_video_compress_j2k {
unsigned int in_frames{}; ///< number of currently encoding frames
mutex lock;
condition_variable frame_popped;
video_desc saved_desc{}; ///< for pool reconfiguration
video_desc precompress_desc{};
video_desc saved_desc{}; ///< pool properties
codec_t precompress_codec = VC_NONE;
video_desc compressed_desc{};
void (*convertFunc)(video_frame *dst, video_frame *src) { nullptr };
// Generic Parameters
double quality = DEFAULT_QUALITY; // default image quality
long long int rate = 0; // bitrate in bits per second
@@ -310,15 +308,18 @@ state_video_compress_j2k::state_video_compress_j2k(struct module *parent, const
module_register(&module_data, parent);
}
static void R12L_to_RG48(video_frame *dst, video_frame *src){
static void parallel_conv(video_frame *dst, video_frame *src){
int src_pitch = vc_get_linesize(src->tiles[0].width, src->color_spec);
int dst_pitch = vc_get_linesize(dst->tiles[0].width, dst->color_spec);
decoder_t vc_copylineR12LtoRG48 = get_decoder_from_to(R12L, RG48);
decoder_t decoder =
get_decoder_from_to(src->color_spec, dst->color_spec);
assert(decoder != nullptr);
parallel_pix_conv((int) src->tiles[0].height, dst->tiles[0].data,
dst_pitch, src->tiles[0].data, src_pitch,
vc_copylineR12LtoRG48, 0);
decoder, 0);
}
static struct {
@@ -332,7 +333,7 @@ static struct {
{RGB, CMPTO_444_U8_P012, VIDEO_CODEC_NONE, nullptr},
{RGBA, CMPTO_444_U8_P012Z, VIDEO_CODEC_NONE, nullptr},
{R10k, CMPTO_444_U10U10U10_MSB32BE_P210, VIDEO_CODEC_NONE, nullptr},
{R12L, CMPTO_444_U12_MSB16LE_P012, RG48, R12L_to_RG48},
{R12L, CMPTO_444_U12_MSB16LE_P012, RG48, nullptr},
};
static bool configure_with(struct state_video_compress_j2k *s, struct video_desc desc){
@@ -342,11 +343,7 @@ static bool configure_with(struct state_video_compress_j2k *s, struct video_desc
for(const auto &codec : codecs){
if(codec.ug_codec == desc.color_spec){
sample_format = codec.cmpto_sf;
s->convertFunc = codec.convertFunc;
s->precompress_desc = desc;
if(codec.convert_codec != VIDEO_CODEC_NONE){
s->precompress_desc.color_spec = codec.convert_codec;
}
s->precompress_codec = codec.convert_codec;
found = true;
break;
}
@@ -379,7 +376,7 @@ static bool configure_with(struct state_video_compress_j2k *s, struct video_desc
s->pool_in_device_memory = false;
#ifdef HAVE_CUDA
if (s->convertFunc == nullptr && cuda_devices_count == 1) {
if (s->precompress_codec == VC_NONE && cuda_devices_count == 1) {
s->pool_in_device_memory = true;
s->pool = std::make_unique<video_frame_pool>(
s->max_in_frames,
@@ -411,8 +408,8 @@ static bool configure_with(struct state_video_compress_j2k *s, struct video_desc
static shared_ptr<video_frame> get_copy(struct state_video_compress_j2k *s, video_frame *frame){
std::shared_ptr<video_frame> ret = s->pool->get_frame();
if (s->convertFunc) {
s->convertFunc(ret.get(), frame);
if (s->precompress_codec != VC_NONE) {
parallel_conv(ret.get(), frame);
} else if (s->pool_in_device_memory) {
#ifdef HAVE_CUDA
cuda_wrapper_set_device((int) cuda_devices[0]);
@@ -915,8 +912,15 @@ static void j2k_compress_push(struct module *state, std::shared_ptr<video_frame>
if (!ret) {
return;
}
s->pool->reconfigure(s->precompress_desc, vc_get_linesize(s->precompress_desc.width, s->precompress_desc.color_spec)
* s->precompress_desc.height);
struct video_desc pool_desc = desc;
if (s->precompress_codec != VC_NONE) {
pool_desc.color_spec = s->precompress_codec;
}
s->pool.reconfigure(
pool_desc, (size_t) vc_get_linesize(pool_desc.width,
pool_desc.color_spec) *
pool_desc.height);
}
assert(tx->tile_count == 1); // TODO