Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vabackend: support 10/12 bit formats #120

Merged
merged 1 commit into from
Oct 20, 2022
Merged

vabackend: support 10/12 bit formats #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/export-buf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ bool initExporter(NVDriver *drv, void *device) {
if (eglQueryDmaBufFormatsEXT(drv->eglDisplay, 64, formats, &formatCount)) {
bool r16 = false, rg1616 = false;
for (int i = 0; i < formatCount; i++) {
const char *fourcc = (const char *)&formats[i];
LOG("Found format: %c%c%c%c", fourcc[0], fourcc[1], fourcc[2], fourcc[3]);
if (formats[i] == DRM_FORMAT_R16) {
r16 = true;
} else if (formats[i] == DRM_FORMAT_RG1616) {
Expand Down Expand Up @@ -406,14 +408,15 @@ BackingImage *allocateBackingImage(NVDriver *drv, const NVSurface *surface) {
CU_EGL_COLOR_FORMAT_YVU420_SEMIPLANAR;
eglframe.cuFormat = CU_AD_FORMAT_UNSIGNED_INT8;
} else if (surface->format == cudaVideoSurfaceFormat_P016) {
//TODO not working, produces this error in mpv:
//EGL_BAD_MATCH error: In eglCreateImageKHR: requested LINUX_DRM_FORMAT is not supported
//this error seems to be coming from the NVIDIA EGL driver
//this might be caused by the DRM_FORMAT_*'s in nvExportSurfaceHandle
if (surface->bitDepth == 10) {
eglframe.eglColorFormat = CU_EGL_COLOR_FORMAT_Y10V10U10_420_SEMIPLANAR;
} else if (surface->bitDepth == 12) {
eglframe.eglColorFormat = CU_EGL_COLOR_FORMAT_Y12V12U12_420_SEMIPLANAR;
// Logically, we should use the explicit 12bit format here, but it fails
// to export to a dmabuf if we do. In practice, that should be fine as the
// data is still stored in 16 bits and they (surely?) aren't going to
// zero out the extra bits.
// eglframe.eglColorFormat = CU_EGL_COLOR_FORMAT_Y12V12U12_420_SEMIPLANAR;
eglframe.eglColorFormat = CU_EGL_COLOR_FORMAT_Y10V10U10_420_SEMIPLANAR;
} else {
LOG("Unknown bitdepth");
}
Expand Down
4 changes: 2 additions & 2 deletions src/hevc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ static cudaVideoCodec computeHEVCCudaCodec(VAProfile profile) {
switch (profile) {
case VAProfileHEVCMain:
case VAProfileHEVCMain10:
//case VAProfileHEVCMain12: //need to wait for ffmpeg to support this via VA-API
case VAProfileHEVCMain12:
return cudaVideoCodec_HEVC;
default:
return cudaVideoCodec_NONE;
Expand All @@ -304,7 +304,7 @@ static cudaVideoCodec computeHEVCCudaCodec(VAProfile profile) {
static const VAProfile hevcSupportedProfiles[] = {
VAProfileHEVCMain,
VAProfileHEVCMain10,
// VAProfileHEVCMain12,
VAProfileHEVCMain12,
};

const DECLARE_CODEC(hevcCodec) = {
Expand Down
Loading