OSDN Git Service

Remove duplicate H264MultiviewHigh and H264StereoHigh in the profile list
authorXiang, Haihao <haihao.xiang@intel.com>
Thu, 3 Mar 2016 04:02:56 +0000 (12:02 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Fri, 4 Mar 2016 04:30:36 +0000 (12:30 +0800)
Otherwise vainfo got duplicate print message that list out the video format
support for H264MultiviewHigh, H264StereoHigh.

Reported-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Tested-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
src/i965_drv_video.c

index b448928..609b757 100644 (file)
@@ -564,9 +564,11 @@ i965_QueryConfigProfiles(VADriverContextP ctx,
         profile_list[i++] = VAProfileH264Main;
         profile_list[i++] = VAProfileH264High;
     }
-    if (HAS_H264_MVC_DECODING_PROFILE(i965, VAProfileH264MultiviewHigh))
+    if (HAS_H264_MVC_DECODING_PROFILE(i965, VAProfileH264MultiviewHigh) ||
+        HAS_H264_MVC_ENCODING(i965))
         profile_list[i++] = VAProfileH264MultiviewHigh;
-    if (HAS_H264_MVC_DECODING_PROFILE(i965, VAProfileH264StereoHigh))
+    if (HAS_H264_MVC_DECODING_PROFILE(i965, VAProfileH264StereoHigh) ||
+        HAS_H264_MVC_ENCODING(i965))
         profile_list[i++] = VAProfileH264StereoHigh;
 
     if (HAS_VC1_DECODING(i965)) {
@@ -589,11 +591,6 @@ i965_QueryConfigProfiles(VADriverContextP ctx,
         profile_list[i++] = VAProfileVP8Version0_3;
     }
 
-    if (HAS_H264_MVC_ENCODING(i965)) {
-        profile_list[i++] = VAProfileH264MultiviewHigh;
-        profile_list[i++] = VAProfileH264StereoHigh;
-    }
-
     if (HAS_HEVC_DECODING(i965)||
         HAS_HEVC_ENCODING(i965)) {
         profile_list[i++] = VAProfileHEVCMain;