frodovdr/vdr-plugin-softhdcuvid
1
0
Fork 0
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git synced 2025-03-01 10:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jojo61/vdr-plugin-softhdcuvid

Browse Source 
Fix
This commit is contained in:
jojo61 2024-01-25 12:42:12 +01:00
commit b2fd6ba240
4 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -82,9 +82,6 @@ You have to adapt the Makefile. There are 3 possible Version that you can build:
runs without X Server. There are several commandline options to select the resolution and refresh rate.
I recommend to use libplacebo and set LIBPLACEBO_GL=1 in the Makefile.
You should use the following libplacebo Version:
https://github.com/haasn/libplacebo/archive/f2c4da9d6121bb330c9fff640aad40e98c081190.zip
Newer Versions may not work.
Install:

5
codec.c
View File

@ -490,7 +490,7 @@ void CodecVideoDecode(VideoDecoder *decoder, const AVPacket *avpkt) {
decoder->filter = 2;
}
}
if (decoder->filter == 2 && (frame->height != 720)) { // broken ZDF sends Interlaced flag
if (decoder->filter == 2) {
push_filters(video_ctx, decoder->HwDecoder, frame);
continue;
}
@ -561,8 +561,7 @@ next_part:
decoder->filter = 2;
}
}
if (frame->interlaced_frame && decoder->filter == 2 &&
(frame->height != 720)) { // broken ZDF sends Interlaced flag
if (decoder->filter == 2) {
ret = push_filters(video_ctx, decoder->HwDecoder, frame);
// av_frame_unref(frame);
continue;

6
softhdcuvid.cpp
View File

@ -1167,9 +1167,9 @@ void cMenuSetupSoft::Create(void) {
if (scalers == 0) {
scalingtest[0] = (char *)"Off";
for (scalers = 0; pl_named_filters[scalers].name != NULL; scalers++) {
scaling[scalers] = (char *)pl_named_filters[scalers].name;
scalingtest[scalers + 1] = (char *)pl_named_filters[scalers].name;
for (scalers = 0; pl_filter_presets[scalers].name != NULL; scalers++) {
scaling[scalers] = (char *)pl_filter_presets[scalers].name;
scalingtest[scalers + 1] = (char *)pl_filter_presets[scalers].name;
// printf("Scaler %s\n",pl_named_filters[scalers].name);
}
// scalers -= 2;

42
video.c
View File

@ -2691,8 +2691,6 @@ int push_filters(AVCodecContext *dec_ctx, CuvidDecoder *decoder, AVFrame *frame)
while ((ret = av_buffersink_get_frame(decoder->buffersink_ctx, filt_frame)) >= 0) {
filt_frame->pts /= 2;
decoder->Interlaced = 0;
// printf("vaapideint video:new %#012" PRIx64 " old %#012" PRIx64
// "\n",filt_frame->pts,frame->pts);
CuvidSyncRenderFrame(decoder, dec_ctx, filt_frame);
filt_frame = av_frame_alloc(); // get new frame
}
@ -2981,18 +2979,18 @@ static enum AVPixelFormat Cuvid_get_format(CuvidDecoder *decoder, AVCodecContext
CuvidUpdateOutput(decoder); // update aspect/scaling
}
#ifdef YADIF
if (VideoDeinterlace[decoder->Resolution] == VideoDeinterlaceYadif) {
deint = 0;
ist->filter = 1; // init yadif_cuda
} else {
deint = 2;
ist->filter = 0;
}
CuvidMessage(2, "deint = %s\n", deint == 0 ? "Yadif" : "Cuda");
if (av_opt_set_int(video_ctx->priv_data, "deint", deint, 0) < 0) { // adaptive
Fatal(_("codec: can't set option deint to video codec!\n"));
}
#if defined YADIF && defined CUVID
if (VideoDeinterlace[decoder->Resolution] == VideoDeinterlaceYadif) {
deint = 0;
ist->filter = 1; // init yadif_cuda
} else {
deint = 2;
ist->filter = 0;
}
CuvidMessage(2, "deint = %s\n", deint == 0 ? "Yadif" : "Cuda");
if (av_opt_set_int(video_ctx->priv_data, "deint", deint, 0) < 0) { // adaptive
Fatal(_("codec: can't set option deint to video codec!\n"));
}
#endif
CuvidMessage(2, "GetFormat Init ok %dx%d\n", video_ctx->width, video_ctx->height);
@ -4090,8 +4088,8 @@ static void CuvidMixVideo(CuvidDecoder *decoder, __attribute__((unused)) int lev
// render_params.upscaler = &pl_filter_ewa_lanczos;
render_params.upscaler = pl_named_filters[VideoScaling[decoder->Resolution]].filter;
render_params.downscaler = pl_named_filters[VideoScaling[decoder->Resolution]].filter;
render_params.upscaler = pl_filter_presets[VideoScaling[decoder->Resolution]].filter;
render_params.downscaler = pl_filter_presets[VideoScaling[decoder->Resolution]].filter;
if (level)
render_params.skip_target_clearing = 1;
@ -4161,8 +4159,8 @@ static void CuvidMixVideo(CuvidDecoder *decoder, __attribute__((unused)) int lev
if (!pl_render_image(p->renderer, &decoder->pl_frames[current], target, &render_params)) {
Debug(4, "Failed rendering frame!\n");
}
if (level)
pl_gpu_finish(p->gpu);
// printf("Rendertime %ld -- \n,",GetusTicks() - tt);
if (VideoScalerTest) { // left side test scaler
@ -4185,8 +4183,8 @@ static void CuvidMixVideo(CuvidDecoder *decoder, __attribute__((unused)) int lev
target->crop.y1 = dst_video_rect.y1;
#endif
render_params.upscaler = pl_named_filters[VideoScalerTest - 1].filter;
render_params.downscaler = pl_named_filters[VideoScalerTest - 1].filter;
render_params.upscaler = pl_filter_presets[VideoScalerTest - 1].filter;
render_params.downscaler = pl_filter_presets[VideoScalerTest - 1].filter;
// render_params.lut = NULL;
render_params.num_hooks = 0;
@ -4476,7 +4474,9 @@ static void CuvidDisplayFrame(void) {
decoder->grab = 0;
}
}
#ifdef PLACEBO
pl_gpu_finish(p->gpu);
#endif
#ifndef PLACEBO
// add osd to surface