diff options
author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2014-06-03 16:50:58 +0200 |
---|---|---|
committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2014-06-16 17:07:04 +0200 |
commit | e86f40500b35aa8a85c734e13e6e10016774a231 (patch) | |
tree | b0b40451f2497caa8008cf5132cff2eca0691fad | |
parent | 0337703ffedc8562299c2d65acfae76c380043c6 (diff) | |
download | libva-e86f40500b35aa8a85c734e13e6e10016774a231.tar.gz |
Merge H.264 MVC profiles from staging branch.
Cherry-pick'ed from:
64f0223: vainfo: add the support for the new VA profiles
b6a6e24: reorder VAProfile{H264MultiviewHigh,StereoHighVP8Version0_3}
7a5a81b: test/basic: update to new API
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-rw-r--r-- | test/basic/test_common.c | 2 | ||||
-rw-r--r-- | test/vainfo/vainfo.c | 2 | ||||
-rw-r--r-- | va/va.h | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/test/basic/test_common.c b/test/basic/test_common.c index 7c4ff89..0486d99 100644 --- a/test/basic/test_common.c +++ b/test/basic/test_common.c @@ -102,6 +102,8 @@ const char *profile2string(VAProfile profile) PROFILE(H264Main) PROFILE(H264High) PROFILE(H264ConstrainedBaseline) + PROFILE(H264MultiviewHigh) + PROFILE(H264StereoHigh) PROFILE(VC1Simple) PROFILE(VC1Main) PROFILE(VC1Advanced) diff --git a/test/vainfo/vainfo.c b/test/vainfo/vainfo.c index 62132ed..658db52 100644 --- a/test/vainfo/vainfo.c +++ b/test/vainfo/vainfo.c @@ -56,6 +56,8 @@ static char * profile_string(VAProfile profile) case VAProfileH264ConstrainedBaseline: return "VAProfileH264ConstrainedBaseline"; case VAProfileJPEGBaseline: return "VAProfileJPEGBaseline"; case VAProfileVP8Version0_3: return "VAProfileVP8Version0_3"; + case VAProfileH264MultiviewHigh: return "VAProfileH264MultiviewHigh"; + case VAProfileH264StereoHigh: return "VAProfileH264StereoHigh"; default: break; @@ -287,7 +287,9 @@ typedef enum VAProfileH263Baseline = 11, VAProfileJPEGBaseline = 12, VAProfileH264ConstrainedBaseline = 13, - VAProfileVP8Version0_3 = 14 + VAProfileVP8Version0_3 = 14, + VAProfileH264MultiviewHigh = 15, + VAProfileH264StereoHigh = 16 } VAProfile; /** |