Skip to content

Commit

Permalink
Kodi: Backport VAAPI hevc10 bit from fernet (vaapi hevc 10 bit - test…
Browse files Browse the repository at this point in the history 
…ing only)
  • Loading branch information
@fritsch
fritsch committed Feb 24, 2017
1 parent adc60df commit c2500b0
Show file tree
Hide file tree
Showing 3 changed files with 224 additions and 0 deletions.
168 changes: 168 additions & 0 deletions packages/mediacenter/kodi/patches/kodi-999.98-vaapi-hevc10.patch
View file
@@ -0,0 +1,168 @@
From ee41bc539fa4dd1f69ddc1f5ca98d26371b483cc Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Fri, 16 Dec 2016 17:34:06 +0100
Subject: [PATCH] vaapi: hevc 10bit

---
xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 102 +++++++++++++++++++++--
1 file changed, 95 insertions(+), 7 deletions(-)

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index 84743be..b085b8d 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -559,8 +559,8 @@ bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum A
if (!CVAAPIContext::EnsureContext(&m_vaapiConfig.context, this))
return false;

- if(avctx->coded_width == 0
- || avctx->coded_height == 0)
+ if(avctx->coded_width == 0 ||
+ avctx->coded_height == 0)
{
CLog::Log(LOGWARNING,"VAAPI::Open: no width/height available, can't init");
return false;
@@ -617,7 +617,12 @@ bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum A
}
case AV_CODEC_ID_HEVC:
{
- profile = VAProfileHEVCMain;
+ if (avctx->profile == FF_PROFILE_HEVC_MAIN_10)
+ profile = VAProfileHEVCMain10;
+ else if (avctx->profile == FF_PROFILE_HEVC_MAIN)
+ profile = VAProfileHEVCMain;
+ else
+ profile = VAProfileNone;
if (!m_vaapiConfig.context->SupportsProfile(profile))
return false;
break;
@@ -647,7 +652,7 @@ bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum A

m_vaapiConfig.profile = profile;
m_vaapiConfig.attrib = m_vaapiConfig.context->GetAttrib(profile);
- if ((m_vaapiConfig.attrib.value & VA_RT_FORMAT_YUV420) == 0)
+ if ((m_vaapiConfig.attrib.value & (VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10BPP)) == 0)
{
CLog::Log(LOGERROR, "VAAPI - invalid yuv format %x", m_vaapiConfig.attrib.value);
return false;
@@ -1071,7 +1076,7 @@ bool CDecoder::ConfigVAAPI()

m_vaapiConfig.dpy = m_vaapiConfig.context->GetDisplay();
m_vaapiConfig.attrib = m_vaapiConfig.context->GetAttrib(m_vaapiConfig.profile);
- if ((m_vaapiConfig.attrib.value & VA_RT_FORMAT_YUV420) == 0)
+ if ((m_vaapiConfig.attrib.value & (VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10BPP)) == 0)
{
CLog::Log(LOGERROR, "VAAPI - invalid yuv format %x", m_vaapiConfig.attrib.value);
return false;
@@ -1084,9 +1089,12 @@ bool CDecoder::ConfigVAAPI()

// create surfaces
VASurfaceID surfaces[32];
+ unsigned int format = VA_RT_FORMAT_YUV420;
+ if (m_vaapiConfig.profile == VAProfileHEVCMain10)
+ format = VA_RT_FORMAT_YUV420_10BPP;
int nb_surfaces = m_vaapiConfig.maxReferences;
if (!CheckSuccess(vaCreateSurfaces(m_vaapiConfig.dpy,
- VA_RT_FORMAT_YUV420,
+ format,
m_vaapiConfig.surfaceWidth,
m_vaapiConfig.surfaceHeight,
surfaces,
@@ -1361,6 +1369,83 @@ bool CVaapiRenderPicture::GLMapSurface()

break;
}
+ case VA_FOURCC('P','0','1','0'):
+ {
+ attrib = attribs;
+ *attrib++ = EGL_LINUX_DRM_FOURCC_EXT;
+ *attrib++ = fourcc_code('R', '1', '6', ' ');
+ *attrib++ = EGL_WIDTH;
+ *attrib++ = glInterop.vaImage.width;
+ *attrib++ = EGL_HEIGHT;
+ *attrib++ = glInterop.vaImage.height;
+ *attrib++ = EGL_DMA_BUF_PLANE0_FD_EXT;
+ *attrib++ = (intptr_t)glInterop.vBufInfo.handle;
+ *attrib++ = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
+ *attrib++ = glInterop.vaImage.offsets[0];
+ *attrib++ = EGL_DMA_BUF_PLANE0_PITCH_EXT;
+ *attrib++ = glInterop.vaImage.pitches[0];
+ *attrib++ = EGL_NONE;
+ glInterop.eglImageY = glInterop.eglCreateImageKHR(glInterop.eglDisplay,
+ EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, (EGLClientBuffer)NULL,
+ attribs);
+ if (!glInterop.eglImageY)
+ {
+ EGLint err = eglGetError();
+ CLog::Log(LOGERROR, "failed to import VA buffer NV12 into EGL image: %d", err);
+ return false;
+ }
+
+ attrib = attribs;
+ *attrib++ = EGL_LINUX_DRM_FOURCC_EXT;
+ *attrib++ = fourcc_code('G', 'R', '1', '6');
+ *attrib++ = EGL_WIDTH;
+ *attrib++ = (glInterop.vaImage.width + 1) >> 1;
+ *attrib++ = EGL_HEIGHT;
+ *attrib++ = (glInterop.vaImage.height + 1) >> 1;
+ *attrib++ = EGL_DMA_BUF_PLANE0_FD_EXT;
+ *attrib++ = (intptr_t)glInterop.vBufInfo.handle;
+ *attrib++ = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
+ *attrib++ = glInterop.vaImage.offsets[1];
+ *attrib++ = EGL_DMA_BUF_PLANE0_PITCH_EXT;
+ *attrib++ = glInterop.vaImage.pitches[1];
+ *attrib++ = EGL_NONE;
+ glInterop.eglImageVU = glInterop.eglCreateImageKHR(glInterop.eglDisplay,
+ EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, (EGLClientBuffer)NULL,
+ attribs);
+ if (!glInterop.eglImageVU)
+ {
+ EGLint err = eglGetError();
+ CLog::Log(LOGERROR, "failed to import VA buffer NV12 into EGL image: %d", err);
+ return false;
+ }
+
+ GLint format;
+
+ glGenTextures(1, &textureY);
+ glEnable(glInterop.textureTarget);
+ glBindTexture(glInterop.textureTarget, textureY);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glInterop.glEGLImageTargetTexture2DOES(glInterop.textureTarget, glInterop.eglImageY);
+ glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &format);
+
+ glGenTextures(1, &textureVU);
+ glEnable(glInterop.textureTarget);
+ glBindTexture(glInterop.textureTarget, textureVU);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(glInterop.textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glInterop.glEGLImageTargetTexture2DOES(glInterop.textureTarget, glInterop.eglImageVU);
+ glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &format);
+
+ glBindTexture(glInterop.textureTarget, 0);
+ glDisable(glInterop.textureTarget);
+
+ break;
+ }
case VA_FOURCC('B','G','R','A'):
{
attrib = attribs;
@@ -2605,9 +2690,12 @@ bool CVppPostproc::PreInit(CVaapiConfig &config, SDiMethods *methods)

// create surfaces
VASurfaceID surfaces[32];
+ unsigned int format = VA_RT_FORMAT_YUV420;
+ if (m_config.profile == VAProfileHEVCMain10)
+ format = VA_RT_FORMAT_YUV420_10BPP;
int nb_surfaces = NUM_RENDER_PICS;
if (!CheckSuccess(vaCreateSurfaces(m_config.dpy,
- VA_RT_FORMAT_YUV420,
+ format,
m_config.surfaceWidth,
m_config.surfaceHeight,
surfaces,
31 changes: 31 additions & 0 deletions packages/mediacenter/kodi/patches/kodi-999.99-vaapi-hevc10-0.patch
View file
@@ -0,0 +1,31 @@
From 443901836f27239982f4b1bdbe52832c637c7992 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Fri, 16 Dec 2016 19:08:36 +0100
Subject: [PATCH] VAAPI: Fix log message

---
xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index b085b8d..2a12a41 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -1391,7 +1391,7 @@ bool CVaapiRenderPicture::GLMapSurface()
if (!glInterop.eglImageY)
{
EGLint err = eglGetError();
- CLog::Log(LOGERROR, "failed to import VA buffer NV12 into EGL image: %d", err);
+ CLog::Log(LOGERROR, "failed to import VA buffer P010 into EGL image: %d", err);
return false;
}

@@ -1415,7 +1415,7 @@ bool CVaapiRenderPicture::GLMapSurface()
if (!glInterop.eglImageVU)
{
EGLint err = eglGetError();
- CLog::Log(LOGERROR, "failed to import VA buffer NV12 into EGL image: %d", err);
+ CLog::Log(LOGERROR, "failed to import VA buffer P010 into EGL image: %d", err);
return false;
}

25 changes: 25 additions & 0 deletions packages/mediacenter/kodi/patches/kodi-999.99-vaapi-hevc10-1.patch
View file
@@ -0,0 +1,25 @@
From 0486251e085dff790b85fcd61f9cde63f200c6ba Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 5 Jan 2017 17:35:16 +0100
Subject: [PATCH] vaapi: adapt to change of kernel patch for h265

---
xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index 3c5214e..0149b47 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -1400,7 +1400,7 @@ bool CVaapiRenderPicture::GLMapSurface()

attrib = attribs;
*attrib++ = EGL_LINUX_DRM_FOURCC_EXT;
- *attrib++ = fourcc_code('G', 'R', '1', '6');
+ *attrib++ = fourcc_code('G', 'R', '3', '2');
*attrib++ = EGL_WIDTH;
*attrib++ = (glInterop.vaImage.width + 1) >> 1;
*attrib++ = EGL_HEIGHT;
--
2.7.4

0 comments on commit c2500b0

Please sign in to comment.