[Pkg-gstreamer-commits] [gstreamer-vaapi] 47/176: utils: add new H.264 profiles.

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch upstream
in repository gstreamer-vaapi.

commit 7f1f879e28a9776ddc001508c08d719c95a833f1
Author: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
Date:   Fri Dec 6 17:34:52 2013 +0100

    utils: add new H.264 profiles.
    
    Add "Constrained Baseline Profile" and "High 10 Profile" definitions
    and helper functiions.
---
 gst-libs/gst/vaapi/gstvaapiprofile.c    | 6 ++++++
 gst-libs/gst/vaapi/gstvaapiprofile.h    | 3 +++
 gst-libs/gst/vaapi/gstvaapiutils_h264.c | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.c b/gst-libs/gst/vaapi/gstvaapiprofile.c
index 6169c4d..91c9fbd 100644
--- a/gst-libs/gst/vaapi/gstvaapiprofile.c
+++ b/gst-libs/gst/vaapi/gstvaapiprofile.c
@@ -80,6 +80,12 @@ static const GstVaapiProfileMap gst_vaapi_profiles[] = {
     { GST_VAAPI_PROFILE_H264_BASELINE, VAProfileH264Baseline,
       "video/x-h264", "baseline"
     },
+#if VA_CHECK_VERSION(0,31,1)
+    { GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE,
+      VAProfileH264ConstrainedBaseline,
+      "video/x-h264", "constrained-baseline"
+    },
+#endif
     { GST_VAAPI_PROFILE_H264_MAIN, VAProfileH264Main,
       "video/x-h264", "main"
     },
diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.h b/gst-libs/gst/vaapi/gstvaapiprofile.h
index 53a683a..750249d 100644
--- a/gst-libs/gst/vaapi/gstvaapiprofile.h
+++ b/gst-libs/gst/vaapi/gstvaapiprofile.h
@@ -112,8 +112,11 @@ typedef enum {
     GST_VAAPI_PROFILE_MPEG4_MAIN            = GST_VAAPI_MAKE_PROFILE(MPEG4,3),
     GST_VAAPI_PROFILE_H263_BASELINE         = GST_VAAPI_MAKE_PROFILE(H263,1),
     GST_VAAPI_PROFILE_H264_BASELINE         = GST_VAAPI_MAKE_PROFILE(H264,1),
+    GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE =
+                                              GST_VAAPI_MAKE_PROFILE(H264,9),
     GST_VAAPI_PROFILE_H264_MAIN             = GST_VAAPI_MAKE_PROFILE(H264,2),
     GST_VAAPI_PROFILE_H264_HIGH             = GST_VAAPI_MAKE_PROFILE(H264,3),
+    GST_VAAPI_PROFILE_H264_HIGH10           = GST_VAAPI_MAKE_PROFILE(H264,7),
     GST_VAAPI_PROFILE_VC1_SIMPLE            = GST_VAAPI_MAKE_PROFILE(VC1,1),
     GST_VAAPI_PROFILE_VC1_MAIN              = GST_VAAPI_MAKE_PROFILE(VC1,2),
     GST_VAAPI_PROFILE_VC1_ADVANCED          = GST_VAAPI_MAKE_PROFILE(VC1,3),
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.c b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
index 8ddc7fb..b6d9085 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
@@ -40,6 +40,9 @@ gst_vaapi_utils_h264_get_profile (guint8 profile_idc)
     case GST_H264_PROFILE_HIGH:
       profile = GST_VAAPI_PROFILE_H264_HIGH;
       break;
+    case GST_H264_PROFILE_HIGH10:
+      profile = GST_VAAPI_PROFILE_H264_HIGH10;
+      break;
     default:
       g_assert (0 && "unsupported profile_idc value");
       profile = GST_VAAPI_PROFILE_UNKNOWN;
@@ -56,6 +59,7 @@ gst_vaapi_utils_h264_get_profile_idc (GstVaapiProfile profile)
 
   switch (profile) {
     case GST_VAAPI_PROFILE_H264_BASELINE:
+    case GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE:
       profile_idc = GST_H264_PROFILE_BASELINE;
       break;
     case GST_VAAPI_PROFILE_H264_MAIN:
@@ -64,6 +68,9 @@ gst_vaapi_utils_h264_get_profile_idc (GstVaapiProfile profile)
     case GST_VAAPI_PROFILE_H264_HIGH:
       profile_idc = GST_H264_PROFILE_HIGH;
       break;
+    case GST_VAAPI_PROFILE_H264_HIGH10:
+      profile_idc = GST_H264_PROFILE_HIGH10;
+      break;
     default:
       g_assert (0 && "unsupported GstVaapiProfile value");
       profile_idc = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gstreamer-vaapi.git