Newer va-api intel drivers support PutImage.

This commit is contained in:
Johns 2014-10-16 14:05:17 +02:00
parent 46e9f23355
commit 0adc02dd78
2 changed files with 7 additions and 6 deletions

View File

@ -1,6 +1,7 @@
User johns User johns
Date: Date:
Newer va-api intel drivers support PutImage.
Use more portable fork for vfork. Use more portable fork for vfork.
Fix crash with VA-API vdpau backend. Fix crash with VA-API vdpau backend.

12
video.c
View File

@ -1446,7 +1446,6 @@ static void AutoCropDetect(AutoCropCtx * autocrop, int width, int height,
static char VaapiBuggyXvBA; ///< fix xvba-video bugs static char VaapiBuggyXvBA; ///< fix xvba-video bugs
static char VaapiBuggyVdpau; ///< fix libva-driver-vdpau bugs static char VaapiBuggyVdpau; ///< fix libva-driver-vdpau bugs
static char VaapiBuggyIntel; ///< fix libva-driver-intel bugs static char VaapiBuggyIntel; ///< fix libva-driver-intel bugs
static char VaapiNewIntel; ///< new libva-driver-intel driver
static VADisplay *VaDisplay; ///< VA-API display static VADisplay *VaDisplay; ///< VA-API display
@ -2000,9 +1999,13 @@ static VaapiDecoder *VaapiNewHwDecoder(VideoStream * stream)
decoder->PTS = AV_NOPTS_VALUE; decoder->PTS = AV_NOPTS_VALUE;
// get/put still not working // old va-api intel driver didn't supported get/put-image.
//decoder->GetPutImage = !VaapiBuggyIntel || VaapiNewIntel; #if VA_CHECK_VERSION(0,33,99)
// FIXME: not the exact version with support
decoder->GetPutImage = 1;
#else
decoder->GetPutImage = !VaapiBuggyIntel; decoder->GetPutImage = !VaapiBuggyIntel;
#endif
VaapiDecoders[VaapiDecoderN++] = decoder; VaapiDecoders[VaapiDecoderN++] = decoder;
@ -2346,9 +2349,6 @@ static int VaapiInit(const char *display_name)
if (strstr(s, "Intel i965")) { if (strstr(s, "Intel i965")) {
VaapiBuggyIntel = 1; VaapiBuggyIntel = 1;
} }
if (strstr(s, "Intel i965 driver - 1.0.16.")) {
VaapiNewIntel = 1;
}
// //
// check which attributes are supported // check which attributes are supported
// //