Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #21538 from edman007:fixup-21536

Browse Source
pull/21555/head
Alexander Alekhin 3 years ago
parent d37bcbdc92 dc29632d4e
commit a351e05a17
1 changed files with 67 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      modules/core/src/va_intel.cpp

71
modules/core/src/va_intel.cpp
Unescape View File

@ -606,10 +606,36 @@ void convertToVASurface(VADisplay display, InputArray src, VASurfaceID surface,
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaSyncSurface failed");
bool indirect_buffer = false;
VAImage image;
status = vaDeriveImage(display, surface, &image);
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaDeriveImage failed");
if (status != VA_STATUS_SUCCESS){
//try vaCreateImage + vaPutImage
//pick a format
indirect_buffer = true;
int num_formats = vaMaxNumImageFormats(display);
if (num_formats <= 0)
CV_Error(cv::Error::StsError, "VA-API: vaMaxNumImageFormats failed");
std::vector<VAImageFormat> fmt_list(num_formats);
status = vaQueryImageFormats(display, fmt_list.data(), &num_formats);
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaQueryImageFormats failed");
VAImageFormat *selected_format = nullptr;
for (auto &fmt : fmt_list){
if (fmt.fourcc == VA_FOURCC_NV12 || fmt.fourcc == VA_FOURCC_YV12){
selected_format = &fmt;
break;
}
}
if (selected_format == nullptr)
CV_Error(cv::Error::StsError, "VA-API: vaQueryImageFormats did not return a supported format");
status = vaCreateImage(display, selected_format, size.width, size.height, &image);
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaCreateImage failed");
}
unsigned char* buffer = 0;
status = vaMapBuffer(display, image.buf, (void **)&buffer);
@ -627,6 +653,14 @@ void convertToVASurface(VADisplay display, InputArray src, VASurfaceID surface,
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaUnmapBuffer failed");
if (indirect_buffer){
status = vaPutImage(display, surface, image.image_id, 0, 0, size.width, size.height, 0, 0, size.width, size.height);
if (status != VA_STATUS_SUCCESS){
vaDestroyImage(display, image.image_id);
CV_Error(cv::Error::StsError, "VA-API: vaPutImage failed");
}
}
status = vaDestroyImage(display, image.image_id);
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaDestroyImage failed");
@ -711,8 +745,37 @@ void convertFromVASurface(VADisplay display, VASurfaceID surface, Size size, Out
VAImage image;
status = vaDeriveImage(display, surface, &image);
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaDeriveImage failed");
if (status != VA_STATUS_SUCCESS){
//try vaCreateImage + vaGetImage
//pick a format
int num_formats = vaMaxNumImageFormats(display);
if (num_formats <= 0)
CV_Error(cv::Error::StsError, "VA-API: vaMaxNumImageFormats failed");
std::vector<VAImageFormat> fmt_list(num_formats);
status = vaQueryImageFormats(display, fmt_list.data(), &num_formats);
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaQueryImageFormats failed");
VAImageFormat *selected_format = nullptr;
for (auto &fmt : fmt_list){
if (fmt.fourcc == VA_FOURCC_NV12 || fmt.fourcc == VA_FOURCC_YV12){
selected_format = &fmt;
break;
}
}
if (selected_format == nullptr)
CV_Error(cv::Error::StsError, "VA-API: vaQueryImageFormats did not return a supported format");
status = vaCreateImage(display, selected_format, size.width, size.height, &image);
if (status != VA_STATUS_SUCCESS)
CV_Error(cv::Error::StsError, "VA-API: vaCreateImage failed");
status = vaGetImage(display, surface, 0, 0, size.width, size.height, image.image_id);
if (status != VA_STATUS_SUCCESS){
vaDestroyImage(display, image.image_id);
CV_Error(cv::Error::StsError, "VA-API: vaPutImage failed");
}
}
unsigned char* buffer = 0;
status = vaMapBuffer(display, image.buf, (void **)&buffer);

Write Preview
Loading…
Cancel
Save