frodovdr/vdr-plugin-softhdcuvid
1
0
Fork 0
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git synced 2023-10-10 13:37:41 +02:00
Code Issues Releases Wiki Activity

fixed resized GRAB

Browse Source
This commit is contained in:
jojo61 2018-12-12 11:10:20 +01:00
parent 3d183b0fdc
commit 6787d9601b
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
video.c
View File

@ -2612,6 +2612,8 @@ int get_RGB(CuvidDecoder *decoder) {
struct pl_render_target target = {0}; struct pl_render_target target = {0};
const struct pl_fmt *fmt; const struct pl_fmt *fmt;
VkImage Image; VkImage Image;
int offset,x1,y1,x0,y0;
float faktorx,faktory;
#endif #endif
uint8_t *base; uint8_t *base;
@ -2702,7 +2704,8 @@ int get_RGB(CuvidDecoder *decoder) {
#else #else
faktorx = (float)width / (float)VideoWindowWidth;
faktory = (float)height / (float) VideoWindowHeight;
fmt = pl_find_named_fmt(p->gpu,"bgra8"); fmt = pl_find_named_fmt(p->gpu,"bgra8");
target.fbo = pl_tex_create(p->gpu, &(struct pl_tex_params) { target.fbo = pl_tex_create(p->gpu, &(struct pl_tex_params) {
.w = width, .w = width,
@ -2715,10 +2718,10 @@ int get_RGB(CuvidDecoder *decoder) {
.sample_mode = PL_TEX_SAMPLE_LINEAR, .sample_mode = PL_TEX_SAMPLE_LINEAR,
.address_mode = PL_TEX_ADDRESS_CLAMP, .address_mode = PL_TEX_ADDRESS_CLAMP,
}); });
target.dst_rect.x0 = decoder->OutputX; target.dst_rect.x0 = (float)decoder->OutputX * faktorx;
target.dst_rect.y0 = decoder->OutputY; target.dst_rect.y0 = (float)decoder->OutputY * faktory;
target.dst_rect.x1= decoder->OutputX + decoder->OutputWidth; target.dst_rect.x1 = (float)(decoder->OutputX + decoder->OutputWidth) * faktorx;
target.dst_rect.y1= decoder->OutputY + decoder->OutputHeight; target.dst_rect.y1 = (float)(decoder->OutputY + decoder->OutputHeight) * faktory;
target.repr.sys = PL_COLOR_SYSTEM_RGB; target.repr.sys = PL_COLOR_SYSTEM_RGB;
target.repr.levels = PL_COLOR_LEVELS_PC; target.repr.levels = PL_COLOR_LEVELS_PC;
target.repr.alpha = PL_ALPHA_UNKNOWN; target.repr.alpha = PL_ALPHA_UNKNOWN;
@ -2734,6 +2737,15 @@ int get_RGB(CuvidDecoder *decoder) {
if (ovl) { if (ovl) {
target.overlays = ovl; target.overlays = ovl;
target.num_overlays = 1; target.num_overlays = 1;
x0 = ovl->rect.x0;
y0 = ovl->rect.y0;
x1 = ovl->rect.x1;
y1 = ovl->rect.y1;
ovl->rect.x0 = (float)x0 * faktorx;
ovl->rect.y0 = (float)y0 * faktory;
ovl->rect.x1 = (float)x1 * faktorx;
ovl->rect.y1 = (float)y1 * faktory;
} else { } else {
target.overlays = 0; target.overlays = 0;
target.num_overlays = 0; target.num_overlays = 0;
@ -2744,7 +2756,14 @@ int get_RGB(CuvidDecoder *decoder) {
Fatal(_("Failed rendering frame!\n")); Fatal(_("Failed rendering frame!\n"));
} }
pl_gpu_finish(p->gpu); pl_gpu_finish(p->gpu);
if (ovl) {
ovl->rect.x0 = x0;
ovl->rect.y0 = y0;
ovl->rect.x1 = x1;
ovl->rect.y1 = y1;
}
pl_tex_download(p->gpu,&(struct pl_tex_transfer_params) { // download Data pl_tex_download(p->gpu,&(struct pl_tex_transfer_params) { // download Data
.tex = target.fbo, .tex = target.fbo,
.ptr = base, .ptr = base,
@ -3550,7 +3569,6 @@ static void CuvidMixVideo(CuvidDecoder * decoder, int level)
colors.gamma = VideoGamma; colors.gamma = VideoGamma;
if (ovl) { if (ovl) {
pl_tex_clear(p->gpu,target->fbo,(float[4]){0}); // clear frame
target->overlays = ovl; target->overlays = ovl;
target->num_overlays = 1; target->num_overlays = 1;
} else { } else {