mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

x264enc: Don't assume the order of nal unit

Browse source 
Just for extra safety, let's check the index of the nal unit
through the enum value of the nal type provided by x264.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3014>
This commit is contained in:
Yeongjin Jeong 2018-10-17 23:38:22 +09:00 committed by Tim-Philipp Müller
parent a9ae28d10b
commit 8ebd854454
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
subprojects/gst-plugins-ugly/ext/x264/gstx264enc.c
View file

@ -1930,7 +1930,7 @@ gst_x264_enc_set_profile_and_level (GstX264Enc * encoder, GstCaps * caps)
x264_nal_t *nal; x264_nal_t *nal;
int i_nal; int i_nal;
int header_return; int header_return;
gint sps_ni = 0; gint i;
guint8 *sps; guint8 *sps;
GstStructure *s; GstStructure *s;
const gchar *profile; const gchar *profile;
@ -1946,13 +1946,20 @@ gst_x264_enc_set_profile_and_level (GstX264Enc * encoder, GstCaps * caps)
return FALSE; return FALSE;
} }
/* old x264 returns SEI, SPS and PPS, newer one has SEI last */ sps = NULL;
if (i_nal == 3 && nal[sps_ni].i_type != 7) for (i = 0; i < i_nal; i++) {
sps_ni = 1; if (nal[i].i_type == NAL_SPS) {
sps = nal[i].p_payload + 4;
sps = nal[sps_ni].p_payload + 4;
/* skip NAL unit type */ /* skip NAL unit type */
sps++; sps++;
}
}
if (!sps) {
GST_ELEMENT_ERROR (encoder, STREAM, ENCODE, ("Encode x264 header failed."),
("x264_encoder_headers did not return SPS"));
return FALSE;
}
gst_codec_utils_h264_caps_set_level_and_profile (caps, sps, 3); gst_codec_utils_h264_caps_set_level_and_profile (caps, sps, 3);
@ -2016,9 +2023,10 @@ gst_x264_enc_header_buf (GstX264Enc * encoder)
int header_return; int header_return;
int i_size; int i_size;
int nal_size; int nal_size;
gint i;
guint8 *buffer, *sps; guint8 *buffer, *sps;
gulong buffer_size; gulong buffer_size;
gint sei_ni = 2, sps_ni = 0, pps_ni = 1; gint sei_ni, sps_ni, pps_ni;
if (G_UNLIKELY (encoder->x264enc == NULL)) if (G_UNLIKELY (encoder->x264enc == NULL))
return NULL; return NULL;
@ -2033,25 +2041,31 @@ gst_x264_enc_header_buf (GstX264Enc * encoder)
return NULL; return NULL;
} }
/* old x264 returns SEI, SPS and PPS, newer one has SEI last */ sei_ni = sps_ni = pps_ni = -1;
if (i_nal == 3 && nal[sps_ni].i_type != 7) { for (i = 0; i < i_nal; i++) {
sei_ni = 0; if (nal[i].i_type == NAL_SEI) {
sps_ni = 1; sei_ni = i;
pps_ni = 2; } else if (nal[i].i_type == NAL_SPS) {
sps_ni = i;
} else if (nal[i].i_type == NAL_PPS) {
pps_ni = i;
}
} }
/* x264 is expected to return an SEI (some identification info), /* x264 is expected to return an SEI (some identification info),
* and SPS and PPS */ * and SPS and PPS */
if (i_nal != 3 || nal[sps_ni].i_type != 7 || nal[pps_ni].i_type != 8 || if (sps_ni == -1 || pps_ni == -1 ||
nal[sps_ni].i_payload < 4 || nal[pps_ni].i_payload < 1) { nal[sps_ni].i_payload < 4 || nal[pps_ni].i_payload < 1) {
GST_ELEMENT_ERROR (encoder, STREAM, ENCODE, (NULL), GST_ELEMENT_ERROR (encoder, STREAM, ENCODE, (NULL),
("Unexpected x264 header.")); ("Unexpected x264 header."));
return NULL; return NULL;
} }
GST_MEMDUMP ("SEI", nal[sei_ni].p_payload, nal[sei_ni].i_payload);
GST_MEMDUMP ("SPS", nal[sps_ni].p_payload, nal[sps_ni].i_payload); GST_MEMDUMP ("SPS", nal[sps_ni].p_payload, nal[sps_ni].i_payload);
GST_MEMDUMP ("PPS", nal[pps_ni].p_payload, nal[pps_ni].i_payload); GST_MEMDUMP ("PPS", nal[pps_ni].p_payload, nal[pps_ni].i_payload);
if (sei_ni != -1) {
GST_MEMDUMP ("SEI", nal[sei_ni].p_payload, nal[sei_ni].i_payload);
}
/* nal payloads with emulation_prevention_three_byte, and some header data */ /* nal payloads with emulation_prevention_three_byte, and some header data */
buffer_size = (nal[sps_ni].i_payload + nal[pps_ni].i_payload) * 4 + 100; buffer_size = (nal[sps_ni].i_payload + nal[pps_ni].i_payload) * 4 + 100;