Mesa (master): vl: add more avc profiles

[Christian König]

Module: Mesa
Branch: master
Commit: 4722c326ceb5ebf1ca42499df0e7055694815ca2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4722c326ceb5ebf1ca42499df0e7055694815ca2

Author: Leo Liu <leo.liu at amd.com>
Date:   Fri May 30 15:57:26 2014 -0400

vl: add more avc profiles

Signed-off-by: Leo Liu <leo.liu at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>

---

 src/gallium/auxiliary/util/u_video.h     |    4 ++++
 src/gallium/include/pipe/p_video_enums.h |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/util/u_video.h b/src/gallium/auxiliary/util/u_video.h
index da65a58..d1ca736 100644
--- a/src/gallium/auxiliary/util/u_video.h
+++ b/src/gallium/auxiliary/util/u_video.h
@@ -60,7 +60,11 @@ u_reduce_video_profile(enum pipe_video_profile profile)
 
       case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE:
       case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN:
+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_EXTENDED:
       case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH:
+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH10:
+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH422:
+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH444:
          return PIPE_VIDEO_FORMAT_MPEG4_AVC;
 
       default:
diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h
index 10205ac..e28d57d 100644
--- a/src/gallium/include/pipe/p_video_enums.h
+++ b/src/gallium/include/pipe/p_video_enums.h
@@ -50,7 +50,11 @@ enum pipe_video_profile
    PIPE_VIDEO_PROFILE_VC1_ADVANCED,
    PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE,
    PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN,
-   PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH
+   PIPE_VIDEO_PROFILE_MPEG4_AVC_EXTENDED,
+   PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH,
+   PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH10,
+   PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH422,
+   PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH444
 };
 
 /* Video caps, can be different for each codec/profile */