mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

encoder: h264: drop extraneous definitions.

Browse source 
Re-use definitions from the codecparser headers instead of duplicating
them here again. That covers NALU definitions and slice types.
This commit is contained in:
Gwenole Beauchesne 2014-06-03 14:30:39 +02:00
parent e1976df1a1
commit 885ebf4c72
1 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#include <va/va.h> #include <va/va.h>
#include <va/va_enc_h264.h> #include <va/va_enc_h264.h>
#include <gst/base/gstbitwriter.h> #include <gst/base/gstbitwriter.h>
#include <gst/codecparsers/gsth264parser.h>
#include "gstvaapicompat.h" #include "gstvaapicompat.h"
#include "gstvaapiencoder_priv.h" #include "gstvaapiencoder_priv.h"
#include "gstvaapiencoder_h264.h" #include "gstvaapiencoder_h264.h"
@ -73,23 +74,10 @@
VA_ENC_PACKED_HEADER_SLICE | \ VA_ENC_PACKED_HEADER_SLICE | \
VA_ENC_PACKED_HEADER_RAW_DATA) VA_ENC_PACKED_HEADER_RAW_DATA)
#define GST_VAAPI_ENCODER_H264_NAL_REF_IDC_NONE 0 #define GST_H264_NAL_REF_IDC_NONE 0
#define GST_VAAPI_ENCODER_H264_NAL_REF_IDC_LOW 1 #define GST_H264_NAL_REF_IDC_LOW 1
#define GST_VAAPI_ENCODER_H264_NAL_REF_IDC_MEDIUM 2 #define GST_H264_NAL_REF_IDC_MEDIUM 2
#define GST_VAAPI_ENCODER_H264_NAL_REF_IDC_HIGH 3 #define GST_H264_NAL_REF_IDC_HIGH 3
typedef enum
{
GST_VAAPI_ENCODER_H264_NAL_UNKNOWN = 0,
GST_VAAPI_ENCODER_H264_NAL_NON_IDR = 1,
GST_VAAPI_ENCODER_H264_NAL_IDR = 5, /* ref_idc != 0 */
GST_VAAPI_ENCODER_H264_NAL_SEI = 6, /* ref_idc == 0 */
GST_VAAPI_ENCODER_H264_NAL_SPS = 7,
GST_VAAPI_ENCODER_H264_NAL_PPS = 8,
GST_VAAPI_ENCODER_H264_NAL_PREFIX = 14, /* mvc nal prefix */
GST_VAAPI_ENCODER_H264_NAL_SUBSET_SPS = 15,
GST_VAAPI_ENCODER_H264_NAL_SLICE_EXT = 20
} GstVaapiEncoderH264NalType;
typedef struct typedef struct
{ {
@ -134,13 +122,13 @@ h264_get_slice_type (GstVaapiPictureType type)
{ {
switch (type) { switch (type) {
case GST_VAAPI_PICTURE_TYPE_I: case GST_VAAPI_PICTURE_TYPE_I:
return 2; return GST_H264_I_SLICE;
case GST_VAAPI_PICTURE_TYPE_P: case GST_VAAPI_PICTURE_TYPE_P:
return 0; return GST_H264_P_SLICE;
case GST_VAAPI_PICTURE_TYPE_B: case GST_VAAPI_PICTURE_TYPE_B:
return 1; return GST_H264_B_SLICE;
default: default:
return -1; break;
} }
return -1; return -1;
} }
@ -905,17 +893,17 @@ _check_sps_pps_status (GstVaapiEncoderH264 * encoder,
nal_type = nal[0] & 0x1F; nal_type = nal[0] & 0x1F;
switch (nal_type) { switch (nal_type) {
case GST_VAAPI_ENCODER_H264_NAL_SPS: case GST_H264_NAL_SPS:
encoder->sps_data = gst_buffer_new_allocate (NULL, size, NULL); encoder->sps_data = gst_buffer_new_allocate (NULL, size, NULL);
ret = gst_buffer_fill (encoder->sps_data, 0, nal, size); ret = gst_buffer_fill (encoder->sps_data, 0, nal, size);
g_assert (ret == size); g_assert (ret == size);
break; break;
case GST_VAAPI_ENCODER_H264_NAL_SUBSET_SPS: case GST_H264_NAL_SUBSET_SPS:
encoder->subset_sps_data = gst_buffer_new_allocate (NULL, size, NULL); encoder->subset_sps_data = gst_buffer_new_allocate (NULL, size, NULL);
ret = gst_buffer_fill (encoder->subset_sps_data, 0, nal, size); ret = gst_buffer_fill (encoder->subset_sps_data, 0, nal, size);
g_assert (ret == size); g_assert (ret == size);
break; break;
case GST_VAAPI_ENCODER_H264_NAL_PPS: case GST_H264_NAL_PPS:
encoder->pps_data = gst_buffer_new_allocate (NULL, size, NULL); encoder->pps_data = gst_buffer_new_allocate (NULL, size, NULL);
ret = gst_buffer_fill (encoder->pps_data, 0, nal, size); ret = gst_buffer_fill (encoder->pps_data, 0, nal, size);
g_assert (ret == size); g_assert (ret == size);
@ -1253,8 +1241,7 @@ add_packed_sequence_header (GstVaapiEncoderH264 * encoder,
gst_bit_writer_init (&bs, 128 * 8); gst_bit_writer_init (&bs, 128 * 8);
WRITE_UINT32 (&bs, 0x00000001, 32); /* start code */ WRITE_UINT32 (&bs, 0x00000001, 32); /* start code */
bs_write_nal_header (&bs, bs_write_nal_header (&bs, GST_H264_NAL_REF_IDC_HIGH, GST_H264_NAL_SPS);
GST_VAAPI_ENCODER_H264_NAL_REF_IDC_HIGH, GST_VAAPI_ENCODER_H264_NAL_SPS);
/* Set High profile for encoding the MVC base view. Otherwise, some /* Set High profile for encoding the MVC base view. Otherwise, some
traditional decoder cannot recognize MVC profile streams with traditional decoder cannot recognize MVC profile streams with
@ -1312,9 +1299,7 @@ add_packed_sequence_header_mvc (GstVaapiEncoderH264 * encoder,
/* non-base layer, pack one subset sps */ /* non-base layer, pack one subset sps */
gst_bit_writer_init (&bs, 128 * 8); gst_bit_writer_init (&bs, 128 * 8);
WRITE_UINT32 (&bs, 0x00000001, 32); /* start code */ WRITE_UINT32 (&bs, 0x00000001, 32); /* start code */
bs_write_nal_header (&bs, bs_write_nal_header (&bs, GST_H264_NAL_REF_IDC_HIGH, GST_H264_NAL_SUBSET_SPS);
GST_VAAPI_ENCODER_H264_NAL_REF_IDC_HIGH,
GST_VAAPI_ENCODER_H264_NAL_SUBSET_SPS);
bs_write_subset_sps (&bs, seq_param, encoder->profile, encoder->num_views, bs_write_subset_sps (&bs, seq_param, encoder->profile, encoder->num_views,
&hrd_params); &hrd_params);
@ -1364,8 +1349,7 @@ add_packed_picture_header (GstVaapiEncoderH264 * encoder,
gst_bit_writer_init (&bs, 128 * 8); gst_bit_writer_init (&bs, 128 * 8);
WRITE_UINT32 (&bs, 0x00000001, 32); /* start code */ WRITE_UINT32 (&bs, 0x00000001, 32); /* start code */
bs_write_nal_header (&bs, bs_write_nal_header (&bs, GST_H264_NAL_REF_IDC_HIGH, GST_H264_NAL_PPS);
GST_VAAPI_ENCODER_H264_NAL_REF_IDC_HIGH, GST_VAAPI_ENCODER_H264_NAL_PPS);
bs_write_pps (&bs, pic_param, encoder->profile); bs_write_pps (&bs, pic_param, encoder->profile);
g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0); g_assert (GST_BIT_WRITER_BIT_SIZE (&bs) % 8 == 0);
data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs); data_bit_size = GST_BIT_WRITER_BIT_SIZE (&bs);
@ -1403,19 +1387,19 @@ get_nal_hdr_attributes (GstVaapiEncPicture * picture,
{ {
switch (picture->type) { switch (picture->type) {
case GST_VAAPI_PICTURE_TYPE_I: case GST_VAAPI_PICTURE_TYPE_I:
*nal_ref_idc = GST_VAAPI_ENCODER_H264_NAL_REF_IDC_HIGH; *nal_ref_idc = GST_H264_NAL_REF_IDC_HIGH;
if (GST_VAAPI_ENC_PICTURE_IS_IDR (picture)) if (GST_VAAPI_ENC_PICTURE_IS_IDR (picture))
*nal_unit_type = GST_VAAPI_ENCODER_H264_NAL_IDR; *nal_unit_type = GST_H264_NAL_SLICE_IDR;
else else
*nal_unit_type = GST_VAAPI_ENCODER_H264_NAL_NON_IDR; *nal_unit_type = GST_H264_NAL_SLICE;
break; break;
case GST_VAAPI_PICTURE_TYPE_P: case GST_VAAPI_PICTURE_TYPE_P:
*nal_ref_idc = GST_VAAPI_ENCODER_H264_NAL_REF_IDC_MEDIUM; *nal_ref_idc = GST_H264_NAL_REF_IDC_MEDIUM;
*nal_unit_type = GST_VAAPI_ENCODER_H264_NAL_NON_IDR; *nal_unit_type = GST_H264_NAL_SLICE;
break; break;
case GST_VAAPI_PICTURE_TYPE_B: case GST_VAAPI_PICTURE_TYPE_B:
*nal_ref_idc = GST_VAAPI_ENCODER_H264_NAL_REF_IDC_NONE; *nal_ref_idc = GST_H264_NAL_REF_IDC_NONE;
*nal_unit_type = GST_VAAPI_ENCODER_H264_NAL_NON_IDR; *nal_unit_type = GST_H264_NAL_SLICE;
break; break;
default: default:
return FALSE; return FALSE;
@ -1441,7 +1425,7 @@ add_packed_prefix_nal_header (GstVaapiEncoderH264 * encoder,
if (!get_nal_hdr_attributes (picture, &nal_ref_idc, &nal_unit_type)) if (!get_nal_hdr_attributes (picture, &nal_ref_idc, &nal_unit_type))
goto bs_error; goto bs_error;
nal_unit_type = GST_VAAPI_ENCODER_H264_NAL_PREFIX; nal_unit_type = GST_H264_NAL_PREFIX_UNIT;
bs_write_nal_header (&bs, nal_ref_idc, nal_unit_type); bs_write_nal_header (&bs, nal_ref_idc, nal_unit_type);
bs_write_nal_header_mvc_extension (&bs, picture, encoder->view_idx); bs_write_nal_header_mvc_extension (&bs, picture, encoder->view_idx);