update transient include definitions

Signed-off-by: Ralf Zerres <[email protected]>
bootlin · Apr 16, 2019 · f3a0ea3 · f3a0ea3
1 parent 21cd2f3
commit f3a0ea3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/config.c b/src/config.c
@@ -24,16 +24,15 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
-#include "request.h"
-
 #include <assert.h>
 #include <string.h>
 
 #include <sys/ioctl.h>
 
 #include <linux/videodev2.h>
 
+#include "config.h"
+#include "request.h"
 #include "utils.h"
 #include "v4l2.h"
 
@@ -122,9 +121,11 @@ VAStatus RequestQueryConfigProfiles(VADriverContextP context,
 		profiles[index++] = VAProfileMPEG2Main;
 	}
 
+	/*
 	found = v4l2_find_format(driver_data->video_fd,
 				 V4L2_BUF_TYPE_VIDEO_OUTPUT,
 				 V4L2_PIX_FMT_H264_SLICE);
+	*/
 	if (found && index < (V4L2_REQUEST_MAX_CONFIG_ATTRIBUTES - 5)) {
 		profiles[index++] = VAProfileH264Main;
 		profiles[index++] = VAProfileH264High;
@@ -133,9 +134,11 @@ VAStatus RequestQueryConfigProfiles(VADriverContextP context,
 		profiles[index++] = VAProfileH264StereoHigh;
 	}
 
+	/*
 	found = v4l2_find_format(driver_data->video_fd,
 				 V4L2_BUF_TYPE_VIDEO_OUTPUT,
 				 V4L2_PIX_FMT_HEVC_SLICE);
+	*/
 	if (found && index < (V4L2_REQUEST_MAX_CONFIG_ATTRIBUTES - 1))
 		profiles[index++] = VAProfileHEVCMain;
 

diff --git a/src/context.c b/src/context.c
@@ -95,17 +95,21 @@ VAStatus RequestCreateContext(VADriverContextP context, VAConfigID config_id,
 		pixelformat = V4L2_PIX_FMT_MPEG2_SLICE;
 		break;
 
+#ifdef V4L2_PIX_FMT_H264_SLICE
 	case VAProfileH264Main:
 	case VAProfileH264High:
 	case VAProfileH264ConstrainedBaseline:
 	case VAProfileH264MultiviewHigh:
 	case VAProfileH264StereoHigh:
 		pixelformat = V4L2_PIX_FMT_H264_SLICE;
 		break;
+#endif
 
+#ifdef V4L2_PIX_FMT_HEVC_SLICE
 	case VAProfileHEVCMain:
 		pixelformat = V4L2_PIX_FMT_HEVC_SLICE;
 		break;
+#endif
 
 	default:
 		status = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;