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

Remove vaapi Lock for DRM

Browse Source
This commit is contained in:
jojo61 2023-04-21 12:22:44 +02:00
parent 7b41b9b45a
commit 9219f06c5a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
softhdcuvid.cpp
View File

@ -61,7 +61,7 @@ extern void ToggleLUT();
/// vdr-plugin version number. /// vdr-plugin version number.
/// Makefile extracts the version number for generating the file name /// Makefile extracts the version number for generating the file name
/// for the distribution archive. /// for the distribution archive.
static const char *const VERSION = "3.8" static const char *const VERSION = "3.9"
#ifdef GIT_REV #ifdef GIT_REV
"-GIT" GIT_REV "-GIT" GIT_REV
#endif #endif

8
video.c
View File

@ -2375,7 +2375,11 @@ void generateVAAPIImage(CuvidDecoder *decoder, int index, const AVFrame *frame,
return; return;
} }
// vaSyncSurface(decoder->VaDisplay, (unsigned int)frame->data[3]); // vaSyncSurface(decoder->VaDisplay, (unsigned int)frame->data[3]);
#ifdef USE_DRM
SharedContext;
#else
Lock_and_SharedContext; Lock_and_SharedContext;
#endif
for (n = 0; n < 2; n++) { // Set DMA_BUF from VAAPI decoder to Textures for (n = 0; n < 2; n++) { // Set DMA_BUF from VAAPI decoder to Textures
int id = desc.layers[n].object_index[0]; int id = desc.layers[n].object_index[0];
int fd = desc.objects[id].fd; int fd = desc.objects[id].fd;
@ -2448,7 +2452,11 @@ void generateVAAPIImage(CuvidDecoder *decoder, int index, const AVFrame *frame,
decoder->pl_frames[index].planes[n].texture = pl_tex_create(p->gpu, &tex_params); decoder->pl_frames[index].planes[n].texture = pl_tex_create(p->gpu, &tex_params);
} }
#ifdef USE_DRM
NoContext;
#else
Unlock_and_NoContext; Unlock_and_NoContext;
#endif
} }
#endif #endif