mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

encoder: h264: clean-ups.

Browse source 
Various clean-ups to improve consistency and readability: rename some
variables, drop unused macro definitions, drop initialization of vars
that are zero-initialized from the base class, drop un-necessary casts.
This commit is contained in:
Gwenole Beauchesne 2014-01-10 14:05:40 +01:00
parent 0c5f69e0d9
commit 45732dcc83
4 changed files with 286 additions and 305 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

551
gst-libs/gst/vaapi/gstvaapiencoder_h264.c
View file

File diff suppressed because it is too large Load diff

3
gst-libs/gst/vaapi/gstvaapiencoder_h264.h
View file

@ -26,6 +26,9 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_VAAPI_ENCODER_H264(encoder) \
((GstVaapiEncoderH264 *) (encoder))
typedef struct _GstVaapiEncoderH264 GstVaapiEncoderH264; typedef struct _GstVaapiEncoderH264 GstVaapiEncoderH264;
/** /**

33
gst-libs/gst/vaapi/gstvaapiencoder_h264_priv.h
View file

@ -22,15 +22,10 @@
#ifndef GST_VAAPI_ENCODER_H264_PRIV_H #ifndef GST_VAAPI_ENCODER_H264_PRIV_H
#define GST_VAAPI_ENCODER_H264_PRIV_H #define GST_VAAPI_ENCODER_H264_PRIV_H
#include <glib.h> #include "gstvaapiencoder_priv.h"
#include <gst/base/gstbitwriter.h>
#include <gst/vaapi/gstvaapiencoder.h>
#include <gst/vaapi/gstvaapiencoder_priv.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_VAAPI_ENCODER_H264(encoder) \
((GstVaapiEncoderH264 *)(encoder))
#define GST_VAAPI_ENCODER_H264_CAST(encoder) \ #define GST_VAAPI_ENCODER_H264_CAST(encoder) \
((GstVaapiEncoderH264 *)(encoder)) ((GstVaapiEncoderH264 *)(encoder))
@ -55,26 +50,22 @@ typedef enum
#define GST_VAAPI_ENCODER_H264_DEFAULT_PROFILE GST_VAAPI_PROFILE_H264_BASELINE #define GST_VAAPI_ENCODER_H264_DEFAULT_PROFILE GST_VAAPI_PROFILE_H264_BASELINE
#define GST_VAAPI_ENCODER_H264_DEFAULT_LEVEL GST_VAAPI_ENCODER_H264_LEVEL_31 #define GST_VAAPI_ENCODER_H264_DEFAULT_LEVEL GST_VAAPI_ENCODER_H264_LEVEL_31
#define GST_VAAPI_ENCODER_H264_DEFAULT_INIT_QP 26
#define GST_VAAPI_ENCODER_H264_DEFAULT_MIN_QP 1
#define GST_VAAPI_ENCODER_H264_MAX_IDR_PERIOD 512 #define GST_VAAPI_ENCODER_H264_MAX_IDR_PERIOD 512
#define GST_VAAPI_ENCODER_H264_DEFAULT_SLICE_NUM 1
struct _GstVaapiEncoderH264 struct _GstVaapiEncoderH264
{ {
GstVaapiEncoder parent; GstVaapiEncoder parent_instance;
/* public */ GstVaapiProfile profile;
guint32 profile; guint32 level_idc;
guint32 level;
guint32 idr_period; guint32 idr_period;
guint32 init_qp; /*default 24 */ guint32 init_qp;
guint32 min_qp; /*default 1 */ guint32 min_qp;
guint32 slice_num; guint32 num_slices;
guint32 b_frame_num; guint32 num_bframes;
guint32 mb_width;
guint32 mb_height;
/* private */
gboolean is_avc; /* avc or bytestream */ gboolean is_avc; /* avc or bytestream */
/* re-ordering */ /* re-ordering */
GQueue reorder_frame_list; GQueue reorder_frame_list;
@ -86,7 +77,7 @@ struct _GstVaapiEncoderH264
/* reference list */ /* reference list */
GQueue ref_list; GQueue ref_list;
guint max_ref_num; guint max_ref_frames;
/* max reflist count */ /* max reflist count */
guint max_reflist0_count; guint max_reflist0_count;
guint max_reflist1_count; guint max_reflist1_count;
@ -104,4 +95,4 @@ struct _GstVaapiEncoderH264
G_END_DECLS G_END_DECLS
#endif /*GST_VAAPI_ENCODER_H264_PRIV_H */ #endif /* GST_VAAPI_ENCODER_H264_PRIV_H */

4
gst/vaapi/gstvaapiencode_h264.c
View file

@ -261,8 +261,8 @@ gst_vaapiencode_h264_alloc_buffer (GstVaapiEncode * base_encode,
GstVaapiCodedBuffer * coded_buf, GstBuffer ** out_buffer_ptr) GstVaapiCodedBuffer * coded_buf, GstBuffer ** out_buffer_ptr)
{ {
GstVaapiEncodeH264 *const encode = GST_VAAPIENCODE_H264_CAST (base_encode); GstVaapiEncodeH264 *const encode = GST_VAAPIENCODE_H264_CAST (base_encode);
GstVaapiEncoderH264 *const encoder = (GstVaapiEncoderH264 *) GstVaapiEncoderH264 *const encoder =
base_encode->encoder; GST_VAAPI_ENCODER_H264 (base_encode->encoder);
GstFlowReturn ret; GstFlowReturn ret;
g_return_val_if_fail (encoder != NULL, GST_FLOW_ERROR); g_return_val_if_fail (encoder != NULL, GST_FLOW_ERROR);