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

Fix non placebo Version for newer INTEL GPUs (A380)

Browse Source
This commit is contained in:
jojo61 2023-02-15 13:06:44 +01:00
parent 3e9b909685
commit 9714824a5a
2 changed files with 28 additions and 10 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.7.6" static const char *const VERSION = "3.7.7"
#ifdef GIT_REV #ifdef GIT_REV
"-GIT" GIT_REV "-GIT" GIT_REV
#endif #endif

34
video.c
View File

@ -2500,6 +2500,7 @@ void createTextureDst(CuvidDecoder *decoder, int anz, unsigned int size_x, unsig
#endif #endif
} }
} }
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
GlxCheck(); GlxCheck();
#ifdef VAAPI #ifdef VAAPI
@ -2520,11 +2521,23 @@ void createTextureDst(CuvidDecoder *decoder, int anz, unsigned int size_x, unsig
attribs[num_attribs] = EGL_NONE; \ attribs[num_attribs] = EGL_NONE; \
} while (0) } while (0)
#define ADD_PLANE_ATTRIBS(plane) \
#define ADD_DMABUF_PLANE_ATTRIBS(plane, fd, offset, stride) \
do { \ do { \
ADD_ATTRIB(EGL_DMA_BUF_PLANE##plane##_FD_EXT, desc.objects[desc.layers[n].object_index[plane]].fd); \ ADD_ATTRIB(EGL_DMA_BUF_PLANE ## plane ## _FD_EXT, \
ADD_ATTRIB(EGL_DMA_BUF_PLANE##plane##_OFFSET_EXT, desc.layers[n].offset[plane]); \ fd); \
ADD_ATTRIB(EGL_DMA_BUF_PLANE##plane##_PITCH_EXT, desc.layers[n].pitch[plane]); \ ADD_ATTRIB(EGL_DMA_BUF_PLANE ## plane ## _OFFSET_EXT, \
offset); \
ADD_ATTRIB(EGL_DMA_BUF_PLANE ## plane ## _PITCH_EXT, \
stride); \
} while (0)
#define ADD_DMABUF_PLANE_MODIFIERS(plane, mod) \
do { \
ADD_ATTRIB(EGL_DMA_BUF_PLANE ## plane ## _MODIFIER_LO_EXT, \
(uint32_t) ((mod) & 0xFFFFFFFFlu)); \
ADD_ATTRIB(EGL_DMA_BUF_PLANE ## plane ## _MODIFIER_HI_EXT, \
(uint32_t) (((mod) >> 32u) & 0xFFFFFFFFlu)); \
} while (0) } while (0)
void generateVAAPIImage(CuvidDecoder *decoder, VASurfaceID index, const AVFrame *frame, int image_width, void generateVAAPIImage(CuvidDecoder *decoder, VASurfaceID index, const AVFrame *frame, int image_width,
@ -2555,13 +2568,19 @@ void generateVAAPIImage(CuvidDecoder *decoder, VASurfaceID index, const AVFrame
for (int n = 0; n < Planes; n++) { for (int n = 0; n < Planes; n++) {
int attribs[20] = {EGL_NONE}; int attribs[20] = {EGL_NONE};
uint num_attribs = 0; uint num_attribs = 0;
int fd; int id = desc.layers[n].object_index[0];
int fd = desc.objects[id].fd;
#if defined(VAAPI) #if defined(VAAPI)
ADD_ATTRIB(EGL_LINUX_DRM_FOURCC_EXT, desc.layers[n].drm_format); //Debug(3,"Plane %d w %d h %d layers %d planes %d pitch %d format %04x\n",n,image_width,image_height,desc.num_layers,desc.layers[n].num_planes,desc.layers[n].pitch[0],desc.layers[n].drm_format);
ADD_ATTRIB(EGL_WIDTH, n == 0 ? image_width : image_width / 2); ADD_ATTRIB(EGL_WIDTH, n == 0 ? image_width : image_width / 2);
ADD_ATTRIB(EGL_HEIGHT, n == 0 ? image_height : image_height / 2); ADD_ATTRIB(EGL_HEIGHT, n == 0 ? image_height : image_height / 2);
ADD_PLANE_ATTRIBS(0); ADD_DMABUF_PLANE_MODIFIERS(0, desc.objects[id].drm_format_modifier);
ADD_ATTRIB(EGL_LINUX_DRM_FOURCC_EXT, desc.layers[n].drm_format);
ADD_DMABUF_PLANE_ATTRIBS(0, fd, desc.layers[n].offset[0],desc.layers[n].pitch[0]);
#endif #endif
decoder->images[index * Planes + n] = decoder->images[index * Planes + n] =
@ -3471,7 +3490,6 @@ static void CuvidRenderFrame(CuvidDecoder *decoder, const AVCodecContext *video_
if (video_ctx->pix_fmt == PIXEL_FORMAT) { if (video_ctx->pix_fmt == PIXEL_FORMAT) {
int w = decoder->InputWidth; int w = decoder->InputWidth;
int h = decoder->InputHeight; int h = decoder->InputHeight;
decoder->ColorSpace = color; // save colorspace decoder->ColorSpace = color; // save colorspace
decoder->trc = frame->color_trc; decoder->trc = frame->color_trc;
decoder->color_primaries = frame->color_primaries; decoder->color_primaries = frame->color_primaries;