[Pkg-gstreamer-commits] [gstreamer-vaapi] 86/176: utils: h264: expose levels in public header.
Vincent Cheng
vcheng at moszumanska.debian.org
Tue Jun 3 08:09:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
vcheng pushed a commit to branch upstream
in repository gstreamer-vaapi.
commit 589078f2a4390aefc1da25aed2709408a6d9c3ab
Author: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
Date: Fri Jan 10 18:27:20 2014 +0100
utils: h264: expose levels in public header.
Instal <gst/vaapi/gstvaapiutils_h264.h> header but only expose the
H.264 levels in there. The additional helper functions are meant
to be private for now.
---
gst-libs/gst/vaapi/Makefile.am | 3 +-
gst-libs/gst/vaapi/gstvaapidecoder_h264.c | 2 +-
gst-libs/gst/vaapi/gstvaapiutils_h264.c | 2 +-
gst-libs/gst/vaapi/gstvaapiutils_h264.h | 61 ----------------------
...vaapiutils_h264.h => gstvaapiutils_h264_priv.h} | 54 ++-----------------
5 files changed, 9 insertions(+), 113 deletions(-)
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 6fc4583..f429c07 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -94,6 +94,7 @@ libgstvaapi_source_h = \
gstvaapisurfacepool.h \
gstvaapisurfaceproxy.h \
gstvaapitypes.h \
+ gstvaapiutils_h264.h \
gstvaapivalue.h \
gstvaapivideopool.h \
gstvaapiwindow.h \
@@ -121,7 +122,7 @@ libgstvaapi_source_priv_h = \
gstvaapisurface_priv.h \
gstvaapisurfaceproxy_priv.h \
gstvaapiutils.h \
- gstvaapiutils_h264.h \
+ gstvaapiutils_h264_priv.h \
gstvaapiversion.h \
gstvaapivideopool_priv.h \
gstvaapiwindow_priv.h \
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
index 8d8efa0..b523cbc 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
@@ -34,7 +34,7 @@
#include "gstvaapidecoder_priv.h"
#include "gstvaapidisplay_priv.h"
#include "gstvaapiobject_priv.h"
-#include "gstvaapiutils_h264.h"
+#include "gstvaapiutils_h264_priv.h"
#define DEBUG 1
#include "gstvaapidebug.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.c b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
index 54d8dd7..e78adda 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
@@ -22,7 +22,7 @@
#include "sysdeps.h"
#include <gst/codecparsers/gsth264parser.h>
-#include "gstvaapiutils_h264.h"
+#include "gstvaapiutils_h264_priv.h"
/* Table A-1 - Level limits */
/* *INDENT-OFF* */
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.h b/gst-libs/gst/vaapi/gstvaapiutils_h264.h
index cbd7217..2aee036 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264.h
@@ -71,67 +71,6 @@ typedef enum
GST_VAAPI_LEVEL_H264_L5_2,
} GstVaapiLevelH264;
-/**
- * GstVaapiH264LevelLimits:
- * @level: the #GstVaapiLevelH264
- * @level_idc: the H.264 level_idc value
- * @MaxMBPS: the maximum macroblock processing rate (MB/sec)
- * @MaxFS: the maximum frame size (MBs)
- * @MaxDpbMbs: the maxium decoded picture buffer size (MBs)
- * @MaxBR: the maximum video bit rate (kbps)
- *
- * The data structure that describes the limits of an H.264 level.
- */
-typedef struct
-{
- GstVaapiLevelH264 level;
- guint8 level_idc;
- guint32 MaxMBPS;
- guint32 MaxFS;
- guint32 MaxDpbMbs;
- guint32 MaxBR;
-} GstVaapiH264LevelLimits;
-
-/* Returns GstVaapiProfile from H.264 profile_idc value */
-G_GNUC_INTERNAL
-GstVaapiProfile
-gst_vaapi_utils_h264_get_profile (guint8 profile_idc);
-
-/* Returns H.264 profile_idc value from GstVaapiProfile */
-G_GNUC_INTERNAL
-guint8
-gst_vaapi_utils_h264_get_profile_idc (GstVaapiProfile profile);
-
-/* Returns GstVaapiLevelH264 from H.264 level_idc value */
-G_GNUC_INTERNAL
-GstVaapiLevelH264
-gst_vaapi_utils_h264_get_level (guint8 level_idc);
-
-/* Returns H.264 level_idc value from GstVaapiLevelH264 */
-G_GNUC_INTERNAL
-guint8
-gst_vaapi_utils_h264_get_level_idc (GstVaapiLevelH264 level);
-
-/* Returns level limits as specified in Table A-1 of the H.264 standard */
-G_GNUC_INTERNAL
-const GstVaapiH264LevelLimits *
-gst_vaapi_utils_h264_get_level_limits (GstVaapiLevelH264 level);
-
-/* Returns the Table A-1 specification */
-G_GNUC_INTERNAL
-const GstVaapiH264LevelLimits *
-gst_vaapi_utils_h264_get_level_limits_table (guint *out_length_ptr);
-
-/* Returns GstVaapiChromaType from H.264 chroma_format_idc value */
-G_GNUC_INTERNAL
-GstVaapiChromaType
-gst_vaapi_utils_h264_get_chroma_type (guint chroma_format_idc);
-
-/* Returns H.264 chroma_format_idc value from GstVaapiChromaType */
-G_GNUC_INTERNAL
-guint
-gst_vaapi_utils_h264_get_chroma_format_idc (GstVaapiChromaType chroma_type);
-
G_END_DECLS
#endif /* GST_VAAPI_UTILS_H264_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.h b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h
similarity index 63%
copy from gst-libs/gst/vaapi/gstvaapiutils_h264.h
copy to gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h
index cbd7217..1c7db35 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h
@@ -1,5 +1,5 @@
/*
- * gstvaapiutils_h264.h - H.264 related utilities
+ * gstvaapiutils_h264_priv.h - H.264 related utilities
*
* Copyright (C) 2011-2013 Intel Corporation
* Author: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
@@ -20,58 +20,14 @@
* Boston, MA 02110-1301 USA
*/
-#ifndef GST_VAAPI_UTILS_H264_H
-#define GST_VAAPI_UTILS_H264_H
+#ifndef GST_VAAPI_UTILS_H264_PRIV_H
+#define GST_VAAPI_UTILS_H264_PRIV_H
-#include <va/va.h>
-#include <gst/vaapi/gstvaapiprofile.h>
-#include <gst/vaapi/gstvaapisurface.h>
+#include "gstvaapiutils_h264.h"
G_BEGIN_DECLS
/**
- * GstVaapiLevelH264:
- * @GST_VAAPI_LEVEL_H264_L1: H.264 level 1.
- * @GST_VAAPI_LEVEL_H264_L1_1: H.264 level 1.1.
- * @GST_VAAPI_LEVEL_H264_L1_2: H.264 level 1.2.
- * @GST_VAAPI_LEVEL_H264_L1_3: H.264 level 1.3.
- * @GST_VAAPI_LEVEL_H264_L2: H.264 level 2.
- * @GST_VAAPI_LEVEL_H264_L2_1: H.264 level 2.1.
- * @GST_VAAPI_LEVEL_H264_L2_2: H.264 level 2.2.
- * @GST_VAAPI_LEVEL_H264_L3: H.264 level 3.
- * @GST_VAAPI_LEVEL_H264_L3_1: H.264 level 3.1.
- * @GST_VAAPI_LEVEL_H264_L3_2: H.264 level 3.2.
- * @GST_VAAPI_LEVEL_H264_L4: H.264 level 4.
- * @GST_VAAPI_LEVEL_H264_L4_1: H.264 level 4.1.
- * @GST_VAAPI_LEVEL_H264_L4_2: H.264 level 4.2.
- * @GST_VAAPI_LEVEL_H264_L5: H.264 level 5.
- * @GST_VAAPI_LEVEL_H264_L5_1: H.264 level 5.1.
- * @GST_VAAPI_LEVEL_H264_L5_2: H.264 level 5.2.
- *
- * The set of all levels for #GstVaapiLevelH264.
- */
-typedef enum
-{
- GST_VAAPI_LEVEL_H264_L1 = 1,
- GST_VAAPI_LEVEL_H264_L1b,
- GST_VAAPI_LEVEL_H264_L1_1,
- GST_VAAPI_LEVEL_H264_L1_2,
- GST_VAAPI_LEVEL_H264_L1_3,
- GST_VAAPI_LEVEL_H264_L2,
- GST_VAAPI_LEVEL_H264_L2_1,
- GST_VAAPI_LEVEL_H264_L2_2,
- GST_VAAPI_LEVEL_H264_L3,
- GST_VAAPI_LEVEL_H264_L3_1,
- GST_VAAPI_LEVEL_H264_L3_2,
- GST_VAAPI_LEVEL_H264_L4,
- GST_VAAPI_LEVEL_H264_L4_1,
- GST_VAAPI_LEVEL_H264_L4_2,
- GST_VAAPI_LEVEL_H264_L5,
- GST_VAAPI_LEVEL_H264_L5_1,
- GST_VAAPI_LEVEL_H264_L5_2,
-} GstVaapiLevelH264;
-
-/**
* GstVaapiH264LevelLimits:
* @level: the #GstVaapiLevelH264
* @level_idc: the H.264 level_idc value
@@ -134,4 +90,4 @@ gst_vaapi_utils_h264_get_chroma_format_idc (GstVaapiChromaType chroma_type);
G_END_DECLS
-#endif /* GST_VAAPI_UTILS_H264_H */
+#endif /* GST_VAAPI_UTILS_H264_PRIV_H */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gstreamer-vaapi.git
More information about the Pkg-gstreamer-commits
mailing list