#include <gst/rtp/gstrtpbuffer.h>
#include <gst/pbutils/pbutils.h>
+#include <gst/video/video.h>
/* Included to not duplicate gst_rtp_h265_add_vps_sps_pps () */
#include "gstrtph265depay.h"
#include "gstrtph265pay.h"
+#include "gstrtputils.h"
+#include "gstbuffermemory.h"
+#define AP_TYPE_ID 48
+#define FU_TYPE_ID 49
GST_DEBUG_CATEGORY_STATIC (rtph265pay_debug);
#define GST_CAT_DEFAULT (rtph265pay_debug)
+#define GST_TYPE_RTP_H265_AGGREGATE_MODE \
+ (gst_rtp_h265_aggregate_mode_get_type ())
+
+
+static GType
+gst_rtp_h265_aggregate_mode_get_type (void)
+{
+ static GType type = 0;
+ static const GEnumValue values[] = {
+ {GST_RTP_H265_AGGREGATE_NONE, "Do not aggregate NAL units", "none"},
+ {GST_RTP_H265_AGGREGATE_ZERO_LATENCY,
+ "Aggregate NAL units until a VCL or suffix unit is included",
+ "zero-latency"},
+ {GST_RTP_H265_AGGREGATE_MAX,
+ "Aggregate all NAL units with the same timestamp (adds one frame of"
+ " latency)", "max"},
+ {0, NULL, NULL},
+ };
+
+ if (!type) {
+ type = g_enum_register_static ("GstRtpH265AggregateMode", values);
+ }
+ return type;
+}
+
+
+
/* references:
*
* Internet Draft RTP Payload Format for High Efficiency Video Coding
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
- /* Only bytestream format supported for now */
+ /* only hvc1 and byte-stream formats supported for now */
+ "video/x-h265, stream-format = (string) hvc1, alignment = (string) au; "
/* "video/x-h265, "
- "stream-format = (string) hvc1, alignment = (string) au; "
- "video/x-h265, "
"stream-format = (string) hev1, alignment = (string) au; " */
- "video/x-h265, "
- "stream-format = (string) byte-stream, alignment = (string) { nal, au }")
+ "video/x-h265, stream-format = (string) byte-stream, "
+ "alignment = (string) { nal, au }")
);
static GstStaticPadTemplate gst_rtp_h265_pay_src_template =
"media = (string) \"video\", "
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
"clock-rate = (int) 90000, " "encoding-name = (string) \"H265\"")
- /** optional parameters **/
+ /* optional parameters */
/* "profile-space = (int) [ 0, 3 ], " */
/* "profile-id = (int) [ 0, 31 ], " */
/* "tier-flag = (int) [ 0, 1 ], " */
/* "dec-parallel-cap = (string) ANY, " */
);
-#define DEFAULT_SPROP_PARAMETER_SETS NULL
-#define DEFAULT_CONFIG_INTERVAL 0
+#define DEFAULT_CONFIG_INTERVAL 0
+#define DEFAULT_AGGREGATE_MODE GST_RTP_H265_AGGREGATE_NONE
enum
{
PROP_0,
- PROP_SPROP_PARAMETER_SETS,
- PROP_CONFIG_INTERVAL
+ PROP_CONFIG_INTERVAL,
+ PROP_AGGREGATE_MODE,
};
-#define IS_ACCESS_UNIT(x) (((x) > 0x00) && ((x) < 0x06))
-
static void gst_rtp_h265_pay_finalize (GObject * object);
static void gst_rtp_h265_pay_set_property (GObject * object, guint prop_id,
GstEvent * event);
static GstStateChangeReturn gst_rtp_h265_pay_change_state (GstElement *
element, GstStateChange transition);
+static gboolean gst_rtp_h265_pay_src_query (GstPad * pad, GstObject * parent,
+ GstQuery * query);
+
+static void gst_rtp_h265_pay_reset_bundle (GstRtpH265Pay * rtph265pay);
#define gst_rtp_h265_pay_parent_class parent_class
G_DEFINE_TYPE (GstRtpH265Pay, gst_rtp_h265_pay, GST_TYPE_RTP_BASE_PAYLOAD);
gobject_class->get_property = gst_rtp_h265_pay_get_property;
g_object_class_install_property (G_OBJECT_CLASS (klass),
- PROP_SPROP_PARAMETER_SETS, g_param_spec_string ("sprop-parameter-sets",
- "sprop-parameter-sets",
- "The base64 sprop-parameter-sets to set in out caps (set to NULL to "
- "extract from stream)",
- DEFAULT_SPROP_PARAMETER_SETS,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_CONFIG_INTERVAL,
- g_param_spec_uint ("config-interval",
+ g_param_spec_int ("config-interval",
"VPS SPS PPS Send Interval",
"Send VPS, SPS and PPS Insertion Interval in seconds (sprop parameter sets "
- "will be multiplexed in the data stream when detected.) (0 = disabled)",
- 0, 3600, DEFAULT_CONFIG_INTERVAL,
+ "will be multiplexed in the data stream when detected.) "
+ "(0 = disabled, -1 = send with every IDR frame)",
+ -1, 3600, DEFAULT_CONFIG_INTERVAL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
);
+ /**
+ * GstRtpH265Pay:aggregate-mode
+ *
+ * Bundle suitable SPS/PPS NAL units into STAP-A aggregate packets.
+ *
+ * This can potentially reduce RTP packetization overhead but not all
+ * RTP implementations handle it correctly.
+ *
+ * For best compatibility, it is recommended to set this to "none" (the
+ * default) for RTSP and for WebRTC to "zero-latency".
+ *
+ * Since: 1.18
+ */
+ g_object_class_install_property (G_OBJECT_CLASS (klass),
+ PROP_AGGREGATE_MODE,
+ g_param_spec_enum ("aggregate-mode",
+ "Attempt to use aggregate packets",
+ "Bundle suitable SPS/PPS NAL units into aggregate packets.",
+ GST_TYPE_RTP_H265_AGGREGATE_MODE,
+ DEFAULT_AGGREGATE_MODE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
+ );
+
gobject_class->finalize = gst_rtp_h265_pay_finalize;
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&gst_rtp_h265_pay_src_template));
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&gst_rtp_h265_pay_sink_template));
+ gst_element_class_add_static_pad_template (gstelement_class,
+ &gst_rtp_h265_pay_src_template);
+ gst_element_class_add_static_pad_template (gstelement_class,
+ &gst_rtp_h265_pay_sink_template);
gst_element_class_set_static_metadata (gstelement_class, "RTP H265 payloader",
"Codec/Payloader/Network/RTP",
- "Payload-encode H265 video into RTP packets (based on draft-ietf-payload-rtp-h265-03.txt)",
+ "Payload-encode H265 video into RTP packets (RFC 7798)",
"Jurgen Slowack <jurgenslowack@gmail.com>");
gstelement_class->change_state =
GST_DEBUG_CATEGORY_INIT (rtph265pay_debug, "rtph265pay", 0,
"H265 RTP Payloader");
+
+#ifndef TIZEN_FEATURE_GST_UPSTREAM_AVOID_BUILD_BREAK
+ gst_type_mark_as_plugin_api (GST_TYPE_RTP_H265_AGGREGATE_MODE, 0);
+#endif
}
static void
gst_rtp_h265_pay_init (GstRtpH265Pay * rtph265pay)
{
rtph265pay->queue = g_array_new (FALSE, FALSE, sizeof (guint));
- rtph265pay->profile = 0;
rtph265pay->sps = g_ptr_array_new_with_free_func (
(GDestroyNotify) gst_buffer_unref);
rtph265pay->pps = g_ptr_array_new_with_free_func (
(GDestroyNotify) gst_buffer_unref);
rtph265pay->last_vps_sps_pps = -1;
rtph265pay->vps_sps_pps_interval = DEFAULT_CONFIG_INTERVAL;
+ rtph265pay->aggregate_mode = DEFAULT_AGGREGATE_MODE;
rtph265pay->adapter = gst_adapter_new ();
+
+ gst_pad_set_query_function (GST_RTP_BASE_PAYLOAD_SRCPAD (rtph265pay),
+ gst_rtp_h265_pay_src_query);
}
static void
g_ptr_array_free (rtph265pay->pps, TRUE);
g_ptr_array_free (rtph265pay->vps, TRUE);
- g_free (rtph265pay->sprop_parameter_sets);
-
g_object_unref (rtph265pay->adapter);
+ gst_rtp_h265_pay_reset_bundle (rtph265pay);
+
G_OBJECT_CLASS (parent_class)->finalize (object);
}
+static gboolean
+gst_rtp_h265_pay_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
+{
+ GstRtpH265Pay *rtph265pay = GST_RTP_H265_PAY (parent);
+
+ if (GST_QUERY_TYPE (query) == GST_QUERY_LATENCY) {
+ gboolean retval;
+ gboolean live;
+ GstClockTime min_latency, max_latency;
+
+ retval = gst_pad_query_default (pad, parent, query);
+ if (!retval)
+ return retval;
+
+ if (rtph265pay->stream_format == GST_H265_STREAM_FORMAT_UNKNOWN ||
+ rtph265pay->alignment == GST_H265_ALIGNMENT_UNKNOWN)
+ return FALSE;
+
+ gst_query_parse_latency (query, &live, &min_latency, &max_latency);
+
+ if (rtph265pay->aggregate_mode == GST_RTP_H265_AGGREGATE_MAX &&
+ rtph265pay->alignment != GST_H265_ALIGNMENT_AU && rtph265pay->fps_num) {
+ GstClockTime one_frame = gst_util_uint64_scale_int (GST_SECOND,
+ rtph265pay->fps_denum, rtph265pay->fps_num);
+
+ min_latency += one_frame;
+ max_latency += one_frame;
+ gst_query_set_latency (query, live, min_latency, max_latency);
+ }
+ return TRUE;
+ }
+
+ return gst_pad_query_default (pad, parent, query);
+}
+
+
static const gchar all_levels[][4] = {
"1",
"2",
"6.2"
};
+static gboolean
+parse_field (GstStructure * s, const gchar * field, gulong min, gulong max,
+ guint8 * result)
+{
+ const gchar *str;
+
+ g_assert (result != NULL);
+
+ str = gst_structure_get_string (s, field);
+ if (str != NULL && *str != '\0') {
+ gulong value;
+ gchar *end;
+
+ value = strtoul (str, &end, 10);
+ if (*end == '\0' && value >= min && value <= max) {
+ *result = (guint8) value;
+ } else {
+ return FALSE;
+ }
+ } else {
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
static GstCaps *
gst_rtp_h265_pay_getcaps (GstRTPBasePayload * payload, GstPad * pad,
GstCaps * filter)
GstCaps *allowed_caps;
GstCaps *caps;
GstCaps *icaps;
- gboolean append_unrestricted;
guint i;
allowed_caps =
}
caps = gst_caps_new_empty ();
-
- append_unrestricted = FALSE;
for (i = 0; i < gst_caps_get_size (allowed_caps); i++) {
GstStructure *s = gst_caps_get_structure (allowed_caps, i);
GstStructure *new_s = gst_structure_new_empty ("video/x-h265");
- const gchar *profile_level_id;
-
- profile_level_id = gst_structure_get_string (s, "profile-level-id");
+ guint8 ptl[12] = { 0, };
+ guint8 value;
- if (profile_level_id && strlen (profile_level_id) == 6) { /* Code taken from gstrtph264pay.c, needs to be revised for H.265 */
+ if (parse_field (s, "profile-id", 0, 31, &value)) {
const gchar *profile;
- const gchar *level;
- long int spsint;
- guint8 sps[3];
-
- spsint = strtol (profile_level_id, NULL, 16);
- sps[0] = spsint >> 16;
- sps[1] = spsint >> 8;
- sps[2] = spsint;
-
- profile = gst_codec_utils_h265_get_profile (sps, 3);
- level = gst_codec_utils_h265_get_level (sps, 3);
-
- if (profile && level) {
- GST_LOG_OBJECT (payload, "In caps, have profile %s and level %s",
- profile, level);
- if (!strcmp (profile, "main"))
- gst_structure_set (new_s, "profile", G_TYPE_STRING, profile, NULL);
- else {
- GValue val = { 0, };
- GValue profiles = { 0, };
-
- g_value_init (&profiles, GST_TYPE_LIST);
- g_value_init (&val, G_TYPE_STRING);
+ ptl[0] = value;
+ profile = gst_codec_utils_h265_get_profile (ptl, sizeof (ptl));
+ if (profile != NULL) {
+ GST_DEBUG_OBJECT (payload, "profile %s", profile);
+ gst_structure_set (new_s, "profile", G_TYPE_STRING, profile, NULL);
+ } else {
+ GST_WARNING_OBJECT (payload, "invalid profile-id %d in caps", value);
+ }
+ } else {
+ GST_DEBUG_OBJECT (payload, "no valid profile-id in caps");
+ }
- g_value_set_static_string (&val, profile);
- gst_value_list_append_value (&profiles, &val);
+ if (parse_field (s, "tier-flag", 0, 1, &value)) {
+ const gchar *tier;
- g_value_set_static_string (&val, "main");
- gst_value_list_append_value (&profiles, &val);
+ ptl[0] |= value << 5;
+ tier = gst_codec_utils_h265_get_tier (ptl, sizeof (ptl));
+ GST_DEBUG_OBJECT (payload, "tier %s", tier);
+ gst_structure_set (new_s, "tier", G_TYPE_STRING, tier, NULL);
+ } else {
+ GST_DEBUG_OBJECT (payload, "no valid tier-flag in caps");
+ }
- gst_structure_take_value (new_s, "profile", &profiles);
- }
+ if (parse_field (s, "level-id", 0, 255, &value)) {
+ const gchar *level;
- if (!strcmp (level, "1"))
+ ptl[11] = value;
+ level = gst_codec_utils_h265_get_level (ptl, sizeof (ptl));
+ if (level != NULL) {
+ GST_DEBUG_OBJECT (payload, "level %s", level);
+ if (strcmp (level, "1") == 0) {
gst_structure_set (new_s, "level", G_TYPE_STRING, level, NULL);
- else {
+ } else {
GValue levels = { 0, };
GValue val = { 0, };
int j;
gst_structure_take_value (new_s, "level", &levels);
}
} else {
- /* Invalid profile-level-id means main */
-
- gst_structure_set (new_s, "profile", G_TYPE_STRING, "main", NULL);
+ GST_WARNING_OBJECT (payload, "invalid level-id %d in caps", value);
}
} else {
- /* No profile-level-id means main or unrestricted */
-
- gst_structure_set (new_s, "profile", G_TYPE_STRING, "main", NULL);
- append_unrestricted = TRUE;
+ GST_DEBUG_OBJECT (payload, "no valid level-id in caps");
}
caps = gst_caps_merge_structure (caps, new_s);
}
- if (append_unrestricted) {
- caps =
- gst_caps_merge_structure (caps, gst_structure_new ("video/x-h265", NULL,
- NULL));
- }
-
icaps = gst_caps_intersect (caps, template_caps);
gst_caps_unref (caps);
caps = icaps;
done:
+ if (filter) {
+ GstCaps *tmp;
+
+ GST_DEBUG_OBJECT (payload, "Intersect %" GST_PTR_FORMAT " and filter %"
+ GST_PTR_FORMAT, caps, filter);
+ tmp = gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
+ gst_caps_unref (caps);
+ caps = tmp;
+ }
+
gst_caps_unref (template_caps);
gst_caps_unref (allowed_caps);
return caps;
}
-/* take the currently configured VPS, SPS and PPS lists and set them on the caps as
- * sprop-parameter-sets */
+/* take the currently configured VPS, SPS and PPS lists and set them on the
+ * caps */
static gboolean
gst_rtp_h265_pay_set_vps_sps_pps (GstRTPBasePayload * basepayload)
{
GstRtpH265Pay *payloader = GST_RTP_H265_PAY (basepayload);
- gchar *profile;
gchar *set;
- GString *sprops;
+ GString *vps;
+ GString *sps;
+ GString *pps;
guint count;
gboolean res;
GstMapInfo map;
guint i;
- sprops = g_string_new ("");
+ vps = g_string_new ("");
+ sps = g_string_new ("");
+ pps = g_string_new ("");
count = 0;
- GST_DEBUG_OBJECT (payloader,
- "Entering function gst_rtp_h265_pay_set_vps_sps_pps");
-
- /* build the sprop-parameter-sets */
for (i = 0; i < payloader->vps->len; i++) {
GstBuffer *vps_buf =
GST_BUFFER_CAST (g_ptr_array_index (payloader->vps, i));
set = g_base64_encode (map.data, map.size);
gst_buffer_unmap (vps_buf, &map);
- g_string_append_printf (sprops, "%s%s", count ? "," : "", set);
+ g_string_append_printf (vps, "%s%s", i ? "," : "", set);
g_free (set);
count++;
}
set = g_base64_encode (map.data, map.size);
gst_buffer_unmap (sps_buf, &map);
- g_string_append_printf (sprops, "%s%s", count ? "," : "", set);
+ g_string_append_printf (sps, "%s%s", i ? "," : "", set);
g_free (set);
count++;
}
set = g_base64_encode (map.data, map.size);
gst_buffer_unmap (pps_buf, &map);
- g_string_append_printf (sprops, "%s%s", count ? "," : "", set);
+ g_string_append_printf (pps, "%s%s", i ? "," : "", set);
g_free (set);
count++;
}
if (G_LIKELY (count)) {
- /* profile is 24 bit. Force it to respect the limit */
- profile = g_strdup_printf ("%06x", payloader->profile & 0xffffff);
/* combine into output caps */
res = gst_rtp_base_payload_set_outcaps (basepayload,
- "sprop-parameter-sets", G_TYPE_STRING, sprops->str, NULL);
- g_free (profile);
+ "sprop-vps", G_TYPE_STRING, vps->str,
+ "sprop-sps", G_TYPE_STRING, sps->str,
+ "sprop-pps", G_TYPE_STRING, pps->str, NULL);
} else {
res = gst_rtp_base_payload_set_outcaps (basepayload, NULL);
}
- g_string_free (sprops, TRUE);
+ g_string_free (vps, TRUE);
+ g_string_free (sps, TRUE);
+ g_string_free (pps, TRUE);
return res;
}
rtph265pay->stream_format = GST_H265_STREAM_FORMAT_BYTESTREAM;
}
+ if (!gst_structure_get_fraction (str, "framerate", &rtph265pay->fps_num,
+ &rtph265pay->fps_denum))
+ rtph265pay->fps_num = rtph265pay->fps_denum = 0;
+
+
/* packetized HEVC video has a codec_data */
if ((value = gst_structure_get_value (str, "codec_data"))) {
guint num_vps, num_sps, num_pps;
goto wrong_version;
/* profile_space | tier_flag | profile_idc */
- rtph265pay->profile = data[1];
- GST_DEBUG_OBJECT (rtph265pay, "profile %06x", rtph265pay->profile);
+ GST_DEBUG_OBJECT (rtph265pay, "profile %06x", data[1]);
/* profile_compatibility_flags */
for (i = 2; i < 6; i++) {
size -= 23;
if (num_arrays > 0) {
- if (data[0] == (0x00 | 0x20)) { /* VPS */
+ if ((data[0] & 0x3f) == 0x20) { /* VPS */
data++;
num_vps = data[0] << 8 | data[1];
}
if (num_arrays > 0) {
- if (data[0] == (0x00 | 0x21)) { /* SPS */
+ if ((data[0] & 0x3f) == 0x21) { /* SPS */
data++;
num_sps = data[0] << 8 | data[1];
}
if (num_arrays > 0) {
- if (data[0] == (0x00 | 0x22)) { /* PPS */
+ if ((data[0] & 0x3f) == 0x22) { /* PPS */
data++;
num_pps = data[0] << 8 | data[1];
}
}
-static void
-gst_rtp_h265_pay_parse_sprop_parameter_sets (GstRtpH265Pay * rtph265pay)
-{
- const gchar *ps;
- gchar **params;
- guint len;
- gint i;
- GstBuffer *buf;
-
- ps = rtph265pay->sprop_parameter_sets;
- if (ps == NULL)
- return;
-
- gst_rtp_h265_pay_clear_vps_sps_pps (rtph265pay);
-
- params = g_strsplit (ps, ",", 0);
- len = g_strv_length (params);
-
- GST_DEBUG_OBJECT (rtph265pay, "we have %d params", len);
-
- for (i = 0; params[i]; i++) {
- gsize nal_len;
- GstMapInfo map;
- guint8 *nalp;
- guint save = 0;
- gint state = 0;
-
- nal_len = strlen (params[i]);
- buf = gst_buffer_new_and_alloc (nal_len);
-
- gst_buffer_map (buf, &map, GST_MAP_WRITE);
- nalp = map.data;
- nal_len = g_base64_decode_step (params[i], nal_len, nalp, &state, &save);
- gst_buffer_unmap (buf, &map);
- gst_buffer_resize (buf, 0, nal_len);
-
- if (!nal_len) {
- gst_buffer_unref (buf);
- continue;
- }
-
- gst_rtp_h265_add_vps_sps_pps (GST_ELEMENT (rtph265pay), rtph265pay->vps,
- rtph265pay->sps, rtph265pay->pps, buf);
- }
- g_strfreev (params);
-}
-
static guint
next_start_code (const guint8 * data, guint size)
{
* sense because our search 'alphabet' is binary - 0 & 1 only.
* This allow us to simplify the general BM algorithm to a very
* simple form. */
- /* assume 1 is in the 3th byte */
+ /* assume 1 is in the 3rd byte */
guint offset = 2;
while (offset < size) {
gst_rtp_h265_pay_decode_nal (GstRtpH265Pay * payloader,
const guint8 * data, guint size, GstClockTime dts, GstClockTime pts)
{
- guint8 header, type;
+ guint8 type;
gboolean updated;
/* default is no update */
updated = FALSE;
- GST_DEBUG ("NAL payload len=%u", size);
+ GST_DEBUG_OBJECT (payloader, "NAL payload size %u", size);
- header = data[0];
- type = header & 0x3f;
+ type = (data[0] >> 1) & 0x3f;
/* We record the timestamp of the last SPS/PPS so
* that we can insert them at regular intervals and when needed. */
|| GST_H265_NAL_PPS == type) {
GstBuffer *nal;
+ /* trailing 0x0 are not part of the VPS/SPS/PPS */
+ while (size > 0 && data[size - 1] == 0x0)
+ size--;
+
/* encode the entire NAL in base64 */
- GST_DEBUG ("Found %s %x %x %x Len=%u",
- type == GST_H265_NAL_VPS ? "VPS" : type ==
- GST_H265_NAL_SPS ? "SPS" : "PPS", (header >> 7), (header >> 5) & 3,
- type, size);
+ GST_DEBUG_OBJECT (payloader, "found %s (type 0x%x), size %u",
+ type == GST_H265_NAL_VPS ? "VPS" : type == GST_H265_NAL_SPS ?
+ "SPS" : "PPS", type, size);
nal = gst_buffer_new_allocate (NULL, size, NULL);
gst_buffer_fill (nal, 0, data, size);
payloader->vps, payloader->sps, payloader->pps, nal);
/* remember when we last saw VPS */
- if (updated && pts != -1)
- payloader->last_vps_sps_pps = pts;
+ if (pts != -1)
+ payloader->last_vps_sps_pps =
+ gst_segment_to_running_time (&GST_RTP_BASE_PAYLOAD_CAST
+ (payloader)->segment, GST_FORMAT_TIME, pts);
} else {
- GST_DEBUG ("NAL: %x %x %x Len = %u", (header >> 7),
- (header >> 5) & 3, type, size);
+ GST_DEBUG_OBJECT (payloader, "NALU type 0x%x, size %u", type, size);
}
return updated;
}
-static GstFlowReturn
-gst_rtp_h265_pay_payload_nal (GstRTPBasePayload * basepayload,
- GstBuffer * paybuf, GstClockTime dts, GstClockTime pts, gboolean end_of_au);
+static GstFlowReturn gst_rtp_h265_pay_payload_nal (GstRTPBasePayload *
+ basepayload, GPtrArray * paybufs, GstClockTime dts, GstClockTime pts);
+static GstFlowReturn gst_rtp_h265_pay_payload_nal_single (GstRTPBasePayload *
+ basepayload, GstBuffer * paybuf, GstClockTime dts, GstClockTime pts,
+ gboolean marker);
+static GstFlowReturn gst_rtp_h265_pay_payload_nal_fragment (GstRTPBasePayload *
+ basepayload, GstBuffer * paybuf, GstClockTime dts, GstClockTime pts,
+ gboolean marker, guint mtu, guint8 nal_type, const guint8 * nal_header,
+ int size);
+static GstFlowReturn gst_rtp_h265_pay_payload_nal_bundle (GstRTPBasePayload *
+ basepayload, GstBuffer * paybuf, GstClockTime dts, GstClockTime pts,
+ gboolean marker, guint8 nal_type, const guint8 * nal_header, int size);
static GstFlowReturn
gst_rtp_h265_pay_send_vps_sps_pps (GstRTPBasePayload * basepayload,
GstFlowReturn ret = GST_FLOW_OK;
gboolean sent_all_vps_sps_pps = TRUE;
guint i;
+ GPtrArray *bufs;
+
+ bufs = g_ptr_array_new ();
for (i = 0; i < rtph265pay->vps->len; i++) {
GstBuffer *vps_buf =
GST_BUFFER_CAST (g_ptr_array_index (rtph265pay->vps, i));
GST_DEBUG_OBJECT (rtph265pay, "inserting VPS in the stream");
- /* resend VPS */
- ret = gst_rtp_h265_pay_payload_nal (basepayload, gst_buffer_ref (vps_buf),
- dts, pts, FALSE);
- /* Not critical here; but throw a warning */
- if (ret != GST_FLOW_OK) {
- sent_all_vps_sps_pps = FALSE;
- GST_WARNING ("Problem pushing VPS");
- }
+ g_ptr_array_add (bufs, gst_buffer_ref (vps_buf));
}
for (i = 0; i < rtph265pay->sps->len; i++) {
GstBuffer *sps_buf =
GST_BUFFER_CAST (g_ptr_array_index (rtph265pay->sps, i));
GST_DEBUG_OBJECT (rtph265pay, "inserting SPS in the stream");
- /* resend SPS */
- ret = gst_rtp_h265_pay_payload_nal (basepayload, gst_buffer_ref (sps_buf),
- dts, pts, FALSE);
- /* Not critical here; but throw a warning */
- if (ret != GST_FLOW_OK) {
- sent_all_vps_sps_pps = FALSE;
- GST_WARNING ("Problem pushing SPS");
- }
+ g_ptr_array_add (bufs, gst_buffer_ref (sps_buf));
}
for (i = 0; i < rtph265pay->pps->len; i++) {
GstBuffer *pps_buf =
GST_BUFFER_CAST (g_ptr_array_index (rtph265pay->pps, i));
GST_DEBUG_OBJECT (rtph265pay, "inserting PPS in the stream");
- /* resend PPS */
- ret = gst_rtp_h265_pay_payload_nal (basepayload, gst_buffer_ref (pps_buf),
- dts, pts, FALSE);
- /* Not critical here; but throw a warning */
- if (ret != GST_FLOW_OK) {
- sent_all_vps_sps_pps = FALSE;
- GST_WARNING ("Problem pushing PPS");
- }
+ g_ptr_array_add (bufs, gst_buffer_ref (pps_buf));
+ }
+
+ ret = gst_rtp_h265_pay_payload_nal (basepayload, bufs, dts, pts);
+ if (ret != GST_FLOW_OK) {
+ /* not critical but warn */
+ GST_WARNING_OBJECT (basepayload, "failed pushing VPS/SPS/PPS");
+
+ sent_all_vps_sps_pps = FALSE;
}
if (pts != -1 && sent_all_vps_sps_pps)
- rtph265pay->last_vps_sps_pps = pts;
+ rtph265pay->last_vps_sps_pps =
+ gst_segment_to_running_time (&basepayload->segment, GST_FORMAT_TIME,
+ pts);
return ret;
}
+static void
+gst_rtp_h265_pay_reset_bundle (GstRtpH265Pay * rtph265pay)
+{
+ g_clear_pointer (&rtph265pay->bundle, gst_buffer_list_unref);
+ rtph265pay->bundle_size = 0;
+ rtph265pay->bundle_contains_vcl_or_suffix = FALSE;
+}
+
static GstFlowReturn
gst_rtp_h265_pay_payload_nal (GstRTPBasePayload * basepayload,
- GstBuffer * paybuf, GstClockTime dts, GstClockTime pts, gboolean end_of_au)
+ GPtrArray * paybufs, GstClockTime dts, GstClockTime pts)
{
GstRtpH265Pay *rtph265pay;
+ guint mtu;
GstFlowReturn ret;
- guint8 nalHeader[2];
- guint8 nalType;
- guint packet_len, payload_len, mtu;
- GstBuffer *outbuf;
- guint8 *payload;
- GstBufferList *list = NULL;
- gboolean send_vps_sps_pps;
- GstRTPBuffer rtp = { NULL };
- guint size = gst_buffer_get_size (paybuf);
+ gint i;
+ gboolean sent_ps;
rtph265pay = GST_RTP_H265_PAY (basepayload);
mtu = GST_RTP_BASE_PAYLOAD_MTU (rtph265pay);
- gst_buffer_extract (paybuf, 0, nalHeader, 2);
- nalType = (nalHeader[0] >> 1) & 0x3f;
-
- GST_DEBUG_OBJECT (rtph265pay, "Processing Buffer with NAL TYPE=%d", nalType);
-
/* should set src caps before pushing stuff,
* and if we did not see enough VPS/SPS/PPS, that may not be the case */
if (G_UNLIKELY (!gst_pad_has_current_caps (GST_RTP_BASE_PAYLOAD_SRCPAD
(basepayload))))
gst_rtp_h265_pay_set_vps_sps_pps (basepayload);
- send_vps_sps_pps = FALSE;
-
- /* check if we need to emit an VPS/SPS/PPS now */
- if (((nalType == GST_H265_NAL_SLICE_TRAIL_N)
- || (nalType == GST_H265_NAL_SLICE_TRAIL_R)
- || (nalType == GST_H265_NAL_SLICE_TSA_N)
- || (nalType == GST_H265_NAL_SLICE_TSA_R)
- || (nalType == GST_H265_NAL_SLICE_STSA_N)
- || (nalType == GST_H265_NAL_SLICE_STSA_R)
- || (nalType == GST_H265_NAL_SLICE_RASL_N)
- || (nalType == GST_H265_NAL_SLICE_RASL_R)
- || (nalType == GST_H265_NAL_SLICE_BLA_W_LP)
- || (nalType == GST_H265_NAL_SLICE_BLA_W_RADL)
- || (nalType == GST_H265_NAL_SLICE_BLA_N_LP)
- || (nalType == GST_H265_NAL_SLICE_IDR_W_RADL)
- || (nalType == GST_H265_NAL_SLICE_IDR_N_LP)
- || (nalType == GST_H265_NAL_SLICE_CRA_NUT))
- && rtph265pay->vps_sps_pps_interval > 0) {
-
- if (rtph265pay->last_vps_sps_pps != -1) {
- guint64 diff;
-
- GST_LOG_OBJECT (rtph265pay,
- "now %" GST_TIME_FORMAT ", last VPS/SPS/PPS %" GST_TIME_FORMAT,
- GST_TIME_ARGS (pts), GST_TIME_ARGS (rtph265pay->last_vps_sps_pps));
-
- /* calculate diff between last SPS/PPS in milliseconds */
- if (pts > rtph265pay->last_vps_sps_pps)
- diff = pts - rtph265pay->last_vps_sps_pps;
- else
- diff = 0;
+ ret = GST_FLOW_OK;
+ sent_ps = FALSE;
+ for (i = 0; i < paybufs->len; i++) {
+ guint8 nal_header[2];
+ guint8 nal_type;
+ GstBuffer *paybuf;
+ gboolean send_ps;
+ guint size;
+ gboolean marker;
- GST_DEBUG_OBJECT (rtph265pay,
- "interval since last VPS/SPS/PPS %" GST_TIME_FORMAT,
- GST_TIME_ARGS (diff));
+ paybuf = g_ptr_array_index (paybufs, i);
- /* bigger than interval, queue SPS/PPS */
- if (GST_TIME_AS_SECONDS (diff) >= rtph265pay->vps_sps_pps_interval) {
- GST_DEBUG_OBJECT (rtph265pay, "time to send VPS/SPS/PPS");
- send_vps_sps_pps = TRUE;
+ if (ret != GST_FLOW_OK) {
+ /* unref buffers that will not be payloaded after a flow error */
+ gst_buffer_unref (paybuf);
+ continue;
+ }
+
+ marker = GST_BUFFER_FLAG_IS_SET (paybuf, GST_BUFFER_FLAG_MARKER);
+
+ size = gst_buffer_get_size (paybuf);
+ gst_buffer_extract (paybuf, 0, nal_header, 2);
+ nal_type = (nal_header[0] >> 1) & 0x3f;
+
+ GST_DEBUG_OBJECT (rtph265pay, "payloading NAL Unit: datasize=%u type=%d"
+ " pts=%" GST_TIME_FORMAT, size, nal_type, GST_TIME_ARGS (pts));
+
+ send_ps = FALSE;
+
+ /* check if we need to emit an VPS/SPS/PPS now */
+ if ((nal_type == GST_H265_NAL_SLICE_TRAIL_N)
+ || (nal_type == GST_H265_NAL_SLICE_TRAIL_R)
+ || (nal_type == GST_H265_NAL_SLICE_TSA_N)
+ || (nal_type == GST_H265_NAL_SLICE_TSA_R)
+ || (nal_type == GST_H265_NAL_SLICE_STSA_N)
+ || (nal_type == GST_H265_NAL_SLICE_STSA_R)
+ || (nal_type == GST_H265_NAL_SLICE_RASL_N)
+ || (nal_type == GST_H265_NAL_SLICE_RASL_R)
+ || (nal_type == GST_H265_NAL_SLICE_BLA_W_LP)
+ || (nal_type == GST_H265_NAL_SLICE_BLA_W_RADL)
+ || (nal_type == GST_H265_NAL_SLICE_BLA_N_LP)
+ || (nal_type == GST_H265_NAL_SLICE_IDR_W_RADL)
+ || (nal_type == GST_H265_NAL_SLICE_IDR_N_LP)
+ || (nal_type == GST_H265_NAL_SLICE_CRA_NUT)) {
+ if (rtph265pay->vps_sps_pps_interval > 0) {
+ if (rtph265pay->last_vps_sps_pps != -1) {
+ guint64 diff;
+ GstClockTime running_time =
+ gst_segment_to_running_time (&basepayload->segment,
+ GST_FORMAT_TIME, pts);
+
+ GST_LOG_OBJECT (rtph265pay,
+ "now %" GST_TIME_FORMAT ", last VPS/SPS/PPS %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (running_time),
+ GST_TIME_ARGS (rtph265pay->last_vps_sps_pps));
+
+ /* calculate diff between last SPS/PPS in milliseconds */
+ if (running_time > rtph265pay->last_vps_sps_pps)
+ diff = running_time - rtph265pay->last_vps_sps_pps;
+ else
+ diff = 0;
+
+ GST_DEBUG_OBJECT (rtph265pay,
+ "interval since last VPS/SPS/PPS %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (diff));
+
+ /* bigger than interval, queue SPS/PPS */
+ if (GST_TIME_AS_SECONDS (diff) >= rtph265pay->vps_sps_pps_interval) {
+ GST_DEBUG_OBJECT (rtph265pay, "time to send VPS/SPS/PPS");
+ send_ps = TRUE;
+ }
+ } else {
+ /* no known previous SPS/PPS time, send now */
+ GST_DEBUG_OBJECT (rtph265pay,
+ "no previous VPS/SPS/PPS time, send now");
+ send_ps = TRUE;
+ }
+ } else if (rtph265pay->vps_sps_pps_interval == -1
+ && (nal_type == GST_H265_NAL_SLICE_IDR_W_RADL
+ || nal_type == GST_H265_NAL_SLICE_IDR_N_LP)) {
+ /* send VPS/SPS/PPS before every IDR frame */
+ send_ps = TRUE;
}
- } else {
- /* no known previous SPS/PPS time, send now */
- GST_DEBUG_OBJECT (rtph265pay, "no previous VPS/SPS/PPS time, send now");
- send_vps_sps_pps = TRUE;
}
- }
- if (send_vps_sps_pps || rtph265pay->send_vps_sps_pps) {
- /* we need to send SPS/PPS now first. FIXME, don't use the pts for
- * checking when we need to send SPS/PPS but convert to running_time first. */
- rtph265pay->send_vps_sps_pps = FALSE;
- ret = gst_rtp_h265_pay_send_vps_sps_pps (basepayload, rtph265pay, dts, pts);
- if (ret != GST_FLOW_OK)
- return ret;
+ if (!sent_ps && (send_ps || rtph265pay->send_vps_sps_pps)) {
+ /* we need to send SPS/PPS now first. FIXME, don't use the pts for
+ * checking when we need to send SPS/PPS but convert to running_time
+ * first */
+ rtph265pay->send_vps_sps_pps = FALSE;
+ sent_ps = TRUE;
+ GST_DEBUG_OBJECT (rtph265pay, "sending VPS/SPS/PPS before current frame");
+ ret =
+ gst_rtp_h265_pay_send_vps_sps_pps (basepayload, rtph265pay, dts, pts);
+ if (ret != GST_FLOW_OK) {
+ gst_buffer_unref (paybuf);
+ continue;
+ }
+ }
+
+ if (rtph265pay->aggregate_mode != GST_RTP_H265_AGGREGATE_NONE)
+ ret = gst_rtp_h265_pay_payload_nal_bundle (basepayload, paybuf, dts, pts,
+ marker, nal_type, nal_header, size);
+ else
+ ret = gst_rtp_h265_pay_payload_nal_fragment (basepayload, paybuf, dts,
+ pts, marker, mtu, nal_type, nal_header, size);
}
- packet_len = gst_rtp_buffer_calc_packet_len (size, 0, 0);
+ g_ptr_array_free (paybufs, TRUE);
+
+ return ret;
+}
+
+static GstFlowReturn
+gst_rtp_h265_pay_payload_nal_single (GstRTPBasePayload * basepayload,
+ GstBuffer * paybuf, GstClockTime dts, GstClockTime pts, gboolean marker)
+{
+ GstBufferList *outlist;
+ GstBuffer *outbuf;
+ GstRTPBuffer rtp = GST_RTP_BUFFER_INIT;
+
+ /* use buffer lists
+ * create buffer without payload containing only the RTP header
+ * (memory block at index 0) */
+ outbuf = gst_rtp_buffer_new_allocate (0, 0, 0);
+
+ gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
+
+ /* Mark the end of a frame */
+ gst_rtp_buffer_set_marker (&rtp, marker);
+
+ /* timestamp the outbuffer */
+ GST_BUFFER_PTS (outbuf) = pts;
+ GST_BUFFER_DTS (outbuf) = dts;
- GST_FIXME_OBJECT (rtph265pay, "Set RTP marker bit appropriately");
+ /* insert payload memory block */
+ gst_rtp_copy_video_meta (basepayload, outbuf, paybuf);
+ outbuf = gst_buffer_append (outbuf, paybuf);
- if (packet_len < mtu) {
+ outlist = gst_buffer_list_new ();
+
+ /* add the buffer to the buffer list */
+ gst_buffer_list_add (outlist, outbuf);
+
+ gst_rtp_buffer_unmap (&rtp);
+
+ /* push the list to the next element in the pipe */
+ return gst_rtp_base_payload_push_list (basepayload, outlist);
+}
+
+static GstFlowReturn
+gst_rtp_h265_pay_payload_nal_fragment (GstRTPBasePayload * basepayload,
+ GstBuffer * paybuf, GstClockTime dts, GstClockTime pts, gboolean marker,
+ guint mtu, guint8 nal_type, const guint8 * nal_header, int size)
+{
+ GstRtpH265Pay *rtph265pay = (GstRtpH265Pay *) basepayload;
+ GstFlowReturn ret;
+ guint max_fragment_size, ii, pos;
+ GstBuffer *outbuf;
+ GstBufferList *outlist = NULL;
+ GstRTPBuffer rtp = GST_RTP_BUFFER_INIT;
+ guint8 *payload;
+
+ if (gst_rtp_buffer_calc_packet_len (size, 0, 0) < mtu) {
GST_DEBUG_OBJECT (rtph265pay,
"NAL Unit fit in one packet datasize=%d mtu=%d", size, mtu);
/* will fit in one packet */
+ return gst_rtp_h265_pay_payload_nal_single (basepayload, paybuf, dts, pts,
+ marker);
+ }
+
+ GST_DEBUG_OBJECT (basepayload,
+ "NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", size, mtu);
+
+ GST_DEBUG_OBJECT (basepayload, "Using FU fragmentation for data size=%d",
+ size - 2);
+
+ /* We keep 3 bytes for PayloadHdr and FU Header */
+ max_fragment_size = gst_rtp_buffer_calc_payload_len (mtu - 3, 0, 0);
+
+ outlist = gst_buffer_list_new ();
+
+ for (pos = 2, ii = 0; pos < size; pos += max_fragment_size, ii++) {
+ guint remaining, fragment_size;
+ gboolean first_fragment, last_fragment;
+
+ remaining = size - pos;
+ fragment_size = MIN (remaining, max_fragment_size);
+ first_fragment = (pos == 2);
+ last_fragment = (remaining <= max_fragment_size);
+
+ GST_DEBUG_OBJECT (basepayload,
+ "Inside FU fragmentation fragment_size=%u iteration=%d %s%s",
+ fragment_size, ii, first_fragment ? "first" : "",
+ last_fragment ? "last" : "");
/* use buffer lists
* create buffer without payload containing only the RTP header
- * (memory block at index 0) */
- outbuf = gst_rtp_buffer_new_allocate (0, 0, 0);
+ * (memory block at index 0), and with space for PayloadHdr and FU header */
+ outbuf = gst_rtp_buffer_new_allocate (3, 0, 0);
gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
- /* FIXME : only set the marker bit on packets containing access units */
- /* if (IS_ACCESS_UNIT (nalType) && end_of_au) {
- gst_rtp_buffer_set_marker (&rtp, 1);
- } */
-
- /* timestamp the outbuffer */
- GST_BUFFER_PTS (outbuf) = pts;
GST_BUFFER_DTS (outbuf) = dts;
+ GST_BUFFER_PTS (outbuf) = pts;
+ payload = gst_rtp_buffer_get_payload (&rtp);
- /* insert payload memory block */
- outbuf = gst_buffer_append (outbuf, paybuf);
+ /* PayloadHdr (type = FU_TYPE_ID (49)) */
+ payload[0] = (nal_header[0] & 0x81) | (FU_TYPE_ID << 1);
+ payload[1] = nal_header[1];
- list = gst_buffer_list_new ();
+ /* If it's the last fragment and the end of this au, mark the end of
+ * slice */
+ gst_rtp_buffer_set_marker (&rtp, last_fragment && marker);
- /* add the buffer to the buffer list */
- gst_buffer_list_add (list, outbuf);
+ /* FU Header */
+ payload[2] = (first_fragment << 7) | (last_fragment << 6) |
+ (nal_type & 0x3f);
gst_rtp_buffer_unmap (&rtp);
- /* push the list to the next element in the pipe */
- ret = gst_rtp_base_payload_push_list (basepayload, list);
+ /* insert payload memory block */
+ gst_rtp_copy_video_meta (rtph265pay, outbuf, paybuf);
+ gst_buffer_copy_into (outbuf, paybuf, GST_BUFFER_COPY_MEMORY, pos,
+ fragment_size);
+ /* add the buffer to the buffer list */
+ gst_buffer_list_add (outlist, outbuf);
+ }
+
+ ret = gst_rtp_base_payload_push_list (basepayload, outlist);
+ gst_buffer_unref (paybuf);
+
+ return ret;
+}
+
+static GstFlowReturn
+gst_rtp_h265_pay_send_bundle (GstRtpH265Pay * rtph265pay, gboolean marker)
+{
+ GstRTPBasePayload *basepayload;
+ GstBufferList *bundle;
+ guint length, bundle_size;
+ GstBuffer *first, *outbuf;
+ GstClockTime dts, pts;
+
+ bundle_size = rtph265pay->bundle_size;
+
+ if (bundle_size == 0) {
+ GST_DEBUG_OBJECT (rtph265pay, "no bundle, nothing to send");
+ return GST_FLOW_OK;
+ }
+
+ basepayload = GST_RTP_BASE_PAYLOAD (rtph265pay);
+ bundle = rtph265pay->bundle;
+ length = gst_buffer_list_length (bundle);
+
+ first = gst_buffer_list_get (bundle, 0);
+ dts = GST_BUFFER_DTS (first);
+ pts = GST_BUFFER_PTS (first);
+
+ if (length == 1) {
+ /* Push unaggregated NALU */
+ outbuf = gst_buffer_ref (first);
+
+ GST_DEBUG_OBJECT (rtph265pay,
+ "sending NAL Unit unaggregated: datasize=%u", bundle_size - 2);
} else {
- /* fragmentation Units */
- guint limitedSize;
- int ii = 0, start = 1, end = 0, pos = 0;
+ guint8 ap_header[2];
+ guint i;
+ guint8 layer_id = 0xFF;
+ guint8 temporal_id = 0xFF;
+
+ outbuf = gst_buffer_new_allocate (NULL, sizeof ap_header, NULL);
+
+ for (i = 0; i < length; i++) {
+ GstBuffer *buf = gst_buffer_list_get (bundle, i);
+ guint8 nal_header[2];
+ GstMemory *size_header;
+ GstMapInfo map;
+ guint8 nal_layer_id;
+ guint8 nal_temporal_id;
+
+ gst_buffer_extract (buf, 0, &nal_header, sizeof nal_header);
+
+ /* Propagate F bit */
+ if ((nal_header[0] & 0x80))
+ ap_header[0] |= 0x80;
+
+ /* Select lowest layer_id & temporal_id */
+ nal_layer_id = ((nal_header[0] & 0x01) << 5) |
+ ((nal_header[1] >> 3) & 0x1F);
+ nal_temporal_id = nal_header[1] & 0x7;
+ layer_id = MIN (layer_id, nal_layer_id);
+ temporal_id = MIN (temporal_id, nal_temporal_id);
+
+ /* append NALU size */
+ size_header = gst_allocator_alloc (NULL, 2, NULL);
+ gst_memory_map (size_header, &map, GST_MAP_WRITE);
+ GST_WRITE_UINT16_BE (map.data, gst_buffer_get_size (buf));
+ gst_memory_unmap (size_header, &map);
+ gst_buffer_append_memory (outbuf, size_header);
+
+ /* append NALU data */
+ outbuf = gst_buffer_append (outbuf, gst_buffer_ref (buf));
+ }
- GST_DEBUG_OBJECT (basepayload,
- "NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", size, mtu);
+ ap_header[0] = (AP_TYPE_ID << 1) | (layer_id & 0x20);
+ ap_header[1] = ((layer_id & 0x1F) << 3) | (temporal_id & 0x07);
- pos += 2;
- size -= 2;
+ gst_buffer_fill (outbuf, 0, &ap_header, sizeof ap_header);
- GST_DEBUG_OBJECT (basepayload, "Using FU fragmentation for data size=%d",
- size);
+ GST_DEBUG_OBJECT (rtph265pay,
+ "sending AP bundle: n=%u header=%02x%02x datasize=%u",
+ length, ap_header[0], ap_header[1], bundle_size);
+ }
- /* We keep 3 bytes for PayloadHdr and FU Header */
- payload_len = gst_rtp_buffer_calc_payload_len (mtu - 3, 0, 0);
+ gst_rtp_h265_pay_reset_bundle (rtph265pay);
+ return gst_rtp_h265_pay_payload_nal_single (basepayload, outbuf, dts, pts,
+ marker);
+}
- list = gst_buffer_list_new ();
+static gboolean
+gst_rtp_h265_pay_payload_nal_bundle (GstRTPBasePayload * basepayload,
+ GstBuffer * paybuf, GstClockTime dts, GstClockTime pts,
+ gboolean marker, guint8 nal_type, const guint8 * nal_header, int size)
+{
+ GstRtpH265Pay *rtph265pay;
+ GstFlowReturn ret;
+ guint pay_size, bundle_size;
+ GstBufferList *bundle;
+ gboolean start_of_au;
+ guint mtu;
- while (end == 0) {
- limitedSize = size < payload_len ? size : payload_len;
- GST_DEBUG_OBJECT (basepayload,
- "Inside FU fragmentation limitedSize=%d iteration=%d", limitedSize,
- ii);
+ rtph265pay = GST_RTP_H265_PAY (basepayload);
+ mtu = GST_RTP_BASE_PAYLOAD_MTU (rtph265pay);
+ pay_size = 2 + gst_buffer_get_size (paybuf);
+ bundle = rtph265pay->bundle;
+ start_of_au = FALSE;
+
+ if (bundle) {
+ GstBuffer *first = gst_buffer_list_get (bundle, 0);
+
+ if (nal_type == GST_H265_NAL_AUD) {
+ GST_DEBUG_OBJECT (rtph265pay, "found access delimiter");
+ start_of_au = TRUE;
+ } else if (GST_BUFFER_IS_DISCONT (paybuf)) {
+ GST_DEBUG_OBJECT (rtph265pay, "found discont");
+ start_of_au = TRUE;
+ } else if (GST_BUFFER_PTS (first) != pts || GST_BUFFER_DTS (first) != dts) {
+ GST_DEBUG_OBJECT (rtph265pay, "found timestamp mismatch");
+ start_of_au = TRUE;
+ }
+ }
- /* use buffer lists
- * create buffer without payload containing only the RTP header
- * (memory block at index 0), and with space for PayloadHdr and FU header */
- outbuf = gst_rtp_buffer_new_allocate (3, 0, 0);
+ if (start_of_au) {
+ GST_DEBUG_OBJECT (rtph265pay, "sending bundle before start of AU");
- gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
+ ret = gst_rtp_h265_pay_send_bundle (rtph265pay, TRUE);
+ if (ret != GST_FLOW_OK)
+ goto out;
- GST_BUFFER_DTS (outbuf) = dts;
- GST_BUFFER_PTS (outbuf) = pts;
- payload = gst_rtp_buffer_get_payload (&rtp);
+ bundle = NULL;
+ }
- if (limitedSize == size) {
- GST_DEBUG_OBJECT (basepayload, "end size=%d iteration=%d", size, ii);
- end = 1;
- }
+ bundle_size = 2 + pay_size;
- /* PayloadHdr (type = 49) */
- payload[0] = (nalHeader[0] & 0x81) | (49 << 1);
- payload[1] = nalHeader[1];
+ if (gst_rtp_buffer_calc_packet_len (bundle_size, 0, 0) > mtu) {
+ GST_DEBUG_OBJECT (rtph265pay, "NAL Unit cannot fit in a bundle");
- /* FIXME - set RTP marker bit appropriately */
- /* if (IS_ACCESS_UNIT (nalType)) {
- gst_rtp_buffer_set_marker (&rtp, end && end_of_au);
- } */
+ ret = gst_rtp_h265_pay_send_bundle (rtph265pay, FALSE);
+ if (ret != GST_FLOW_OK)
+ goto out;
- /* FU Header */
- payload[2] = (start << 7) | (end << 6) | (nalType & 0x3f);
+ return gst_rtp_h265_pay_payload_nal_fragment (basepayload, paybuf, dts, pts,
+ marker, mtu, nal_type, nal_header, size);
+ }
- gst_rtp_buffer_unmap (&rtp);
+ bundle_size = rtph265pay->bundle_size + pay_size;
- /* insert payload memory block */
- gst_buffer_append (outbuf,
- gst_buffer_copy_region (paybuf, GST_BUFFER_COPY_MEMORY, pos,
- limitedSize));
+ if (gst_rtp_buffer_calc_packet_len (bundle_size, 0, 0) > mtu) {
+ GST_DEBUG_OBJECT (rtph265pay,
+ "bundle overflows, sending: bundlesize=%u datasize=2+%u mtu=%u",
+ rtph265pay->bundle_size, pay_size - 2, mtu);
- /* add the buffer to the buffer list */
- gst_buffer_list_add (list, outbuf);
+ ret = gst_rtp_h265_pay_send_bundle (rtph265pay, FALSE);
+ if (ret != GST_FLOW_OK)
+ goto out;
+ bundle = NULL;
+ }
- size -= limitedSize;
- pos += limitedSize;
- ii++;
- start = 0;
- }
+ if (!bundle) {
+ GST_DEBUG_OBJECT (rtph265pay, "creating new AP aggregate");
+ bundle = rtph265pay->bundle = gst_buffer_list_new ();
+ bundle_size = rtph265pay->bundle_size = 2;
+ rtph265pay->bundle_contains_vcl_or_suffix = FALSE;
+ }
+
+ GST_DEBUG_OBJECT (rtph265pay,
+ "bundling NAL Unit: bundlesize=%u datasize=2+%u mtu=%u",
+ rtph265pay->bundle_size, pay_size - 2, mtu);
+
+ paybuf = gst_buffer_make_writable (paybuf);
+ GST_BUFFER_PTS (paybuf) = pts;
+ GST_BUFFER_DTS (paybuf) = dts;
+
+ gst_buffer_list_add (bundle, gst_buffer_ref (paybuf));
+ rtph265pay->bundle_size += pay_size;
+ ret = GST_FLOW_OK;
- ret = gst_rtp_base_payload_push_list (basepayload, list);
- gst_buffer_unref (paybuf);
+ /* In H.265, all VCL NAL units are < 32 */
+ if (nal_type < 32 || nal_type == GST_H265_NAL_EOS ||
+ nal_type == GST_H265_NAL_EOB || nal_type == GST_H265_NAL_SUFFIX_SEI ||
+ (nal_type >= 45 && nal_type <= 47) || (nal_type >= 56 && nal_type < 63))
+ rtph265pay->bundle_contains_vcl_or_suffix = TRUE;
+
+ if (marker) {
+ GST_DEBUG_OBJECT (rtph265pay, "sending bundle at marker");
+ ret = gst_rtp_h265_pay_send_bundle (rtph265pay, TRUE);
}
+
+out:
+ gst_buffer_unref (paybuf);
return ret;
}
GstFlowReturn ret;
gsize size;
guint nal_len, i;
- GstMapInfo map;
const guint8 *data;
GstClockTime dts, pts;
GArray *nal_queue;
gboolean hevc;
GstBuffer *paybuf = NULL;
gsize skip;
+ gboolean marker = FALSE;
+ gboolean discont = FALSE;
+ gboolean draining = (buffer == NULL);
rtph265pay = GST_RTP_H265_PAY (basepayload);
|| (rtph265pay->stream_format == GST_H265_STREAM_FORMAT_HVC1);
if (hevc) {
- /* In hevc mode, there is no adapter, so nothing to flush */
- if (buffer == NULL)
+ /* In hevc mode, there is no adapter, so nothing to drain */
+ if (draining)
return GST_FLOW_OK;
- gst_buffer_map (buffer, &map, GST_MAP_READ);
- data = map.data;
- size = map.size;
- pts = GST_BUFFER_PTS (buffer);
- dts = GST_BUFFER_DTS (buffer);
- GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size);
} else {
- dts = gst_adapter_prev_dts (rtph265pay->adapter, NULL);
- pts = gst_adapter_prev_pts (rtph265pay->adapter, NULL);
if (buffer) {
- if (!GST_CLOCK_TIME_IS_VALID (dts))
- dts = GST_BUFFER_DTS (buffer);
- if (!GST_CLOCK_TIME_IS_VALID (pts))
- pts = GST_BUFFER_PTS (buffer);
-
+ if (gst_adapter_available (rtph265pay->adapter) == 0)
+ discont = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT);
+ marker = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER);
gst_adapter_push (rtph265pay->adapter, buffer);
+ buffer = NULL;
}
+
+ /* We want to use the first TS used to construct the following NAL */
+ dts = gst_adapter_prev_dts (rtph265pay->adapter, NULL);
+ pts = gst_adapter_prev_pts (rtph265pay->adapter, NULL);
+
size = gst_adapter_available (rtph265pay->adapter);
/* Nothing to do here if the adapter is empty, e.g. on EOS */
if (size == 0)
return GST_FLOW_OK;
data = gst_adapter_map (rtph265pay->adapter, size);
- GST_DEBUG_OBJECT (basepayload,
- "got %" G_GSIZE_FORMAT " bytes (%" G_GSIZE_FORMAT ")", size,
- buffer ? gst_buffer_get_size (buffer) : 0);
+ GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size);
}
ret = GST_FLOW_OK;
- /* now loop over all NAL units and put them in a packet
- * FIXME, we should really try to pack multiple NAL units into one RTP packet
- * if we can, especially for the config packets that wont't cause decoder
- * latency. */
+ /* now loop over all NAL units and put them in a packet */
if (hevc) {
+ GstBufferMemoryMap memory;
+ gsize remaining_buffer_size;
guint nal_length_size;
gsize offset = 0;
+ GPtrArray *paybufs;
+ paybufs = g_ptr_array_new ();
nal_length_size = rtph265pay->nal_length_size;
- while (size > nal_length_size) {
+ gst_buffer_memory_map (buffer, &memory);
+ remaining_buffer_size = gst_buffer_get_size (buffer);
+
+ pts = GST_BUFFER_PTS (buffer);
+ dts = GST_BUFFER_DTS (buffer);
+ marker = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER);
+ GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes",
+ remaining_buffer_size);
+
+ while (remaining_buffer_size > nal_length_size) {
gint i;
- gboolean end_of_au = FALSE;
nal_len = 0;
for (i = 0; i < nal_length_size; i++) {
- nal_len = ((nal_len << 8) + data[i]);
+ nal_len = (nal_len << 8) + *memory.data;
+ if (!gst_buffer_memory_advance_bytes (&memory, 1))
+ break;
}
- /* skip the length bytes, make sure we don't run past the buffer size */
- data += nal_length_size;
offset += nal_length_size;
- size -= nal_length_size;
+ remaining_buffer_size -= nal_length_size;
- if (size >= nal_len) {
+ if (remaining_buffer_size >= nal_len) {
GST_DEBUG_OBJECT (basepayload, "got NAL of size %u", nal_len);
} else {
- nal_len = size;
+ nal_len = remaining_buffer_size;
GST_DEBUG_OBJECT (basepayload, "got incomplete NAL of size %u",
nal_len);
}
+ paybuf = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_ALL, offset,
+ nal_len);
+ g_ptr_array_add (paybufs, paybuf);
+
/* If we're at the end of the buffer, then we're at the end of the
* access unit
*/
- if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU
- && size - nal_len <= nal_length_size) {
- end_of_au = TRUE;
+ GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER);
+ if (remaining_buffer_size - nal_len <= nal_length_size) {
+ if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU || marker)
+ GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER);
}
- paybuf = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_MEMORY, offset,
- nal_len);
+ GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_DISCONT);
+ if (discont) {
+ GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_DISCONT);
+ discont = FALSE;
+ }
- ret =
- gst_rtp_h265_pay_payload_nal (basepayload, paybuf, dts, pts,
- end_of_au);
- if (ret != GST_FLOW_OK)
+ /* Skip current nal. If it is split over multiple GstMemory
+ * advance_bytes () will switch to the correct GstMemory. The payloader
+ * does not access those bytes directly but uses gst_buffer_copy_region ()
+ * to create a sub-buffer referencing the nal instead */
+ if (!gst_buffer_memory_advance_bytes (&memory, nal_len))
break;
-
- data += nal_len;
offset += nal_len;
- size -= nal_len;
+ remaining_buffer_size -= nal_len;
}
+ ret = gst_rtp_h265_pay_payload_nal (basepayload, paybufs, dts, pts);
+
+ gst_buffer_memory_unmap (&memory);
+ gst_buffer_unref (buffer);
} else {
guint next;
gboolean update = FALSE;
+ GPtrArray *paybufs;
/* get offset of first start code */
next = next_start_code (data, size);
GST_DEBUG_OBJECT (basepayload,
"found first start at %u, bytes left %" G_GSIZE_FORMAT, next, size);
- /* first pass to locate NALs and parse SPS/PPS */
+ paybufs = g_ptr_array_new ();
+
+ /* first pass to locate NALs and parse VPS/SPS/PPS */
while (size > 4) {
/* skip start code */
data += 3;
*/
next = next_start_code (data, size);
- if (next == size && buffer != NULL) {
+ /* nal or au aligned input needs no delaying until next time */
+ if (next == size && !draining &&
+ rtph265pay->alignment == GST_H265_ALIGNMENT_UNKNOWN) {
/* Didn't find the start of next NAL and it's not EOS,
* handle it next time */
break;
GST_DEBUG_OBJECT (basepayload, "found next start at %u of size %u", next,
nal_len);
- if (rtph265pay->sprop_parameter_sets != NULL) {
- /* explicitly set profile and sprop, use those */
- if (rtph265pay->update_caps) {
- if (!gst_rtp_base_payload_set_outcaps (basepayload,
- "sprop-parameter-sets", G_TYPE_STRING,
- rtph265pay->sprop_parameter_sets, NULL))
- goto caps_rejected;
-
- /* parse SPS and PPS from provided parameter set (for insertion) */
- gst_rtp_h265_pay_parse_sprop_parameter_sets (rtph265pay);
-
- rtph265pay->update_caps = FALSE;
+ /* We know our stream is a valid H265 NAL packet,
+ * go parse it for VPS/SPS/PPS to enrich the caps */
+ /* order: make sure to check nal */
+ update = gst_rtp_h265_pay_decode_nal (rtph265pay, data, nal_len, dts, pts)
+ || update;
- GST_DEBUG ("outcaps update: sprop-parameter-sets=%s",
- rtph265pay->sprop_parameter_sets);
- }
- } else {
- /* We know our stream is a valid H265 NAL packet,
- * go parse it for SPS/PPS to enrich the caps */
- /* order: make sure to check nal */
- update =
- gst_rtp_h265_pay_decode_nal (rtph265pay, data, nal_len, dts, pts)
- || update;
- }
/* move to next NAL packet */
data += nal_len;
size -= nal_len;
for (i = 0; i < nal_queue->len; i++) {
guint size;
- gboolean end_of_au = FALSE;
nal_len = g_array_index (nal_queue, guint, i);
/* skip start code */
* trailing 0x0 that can be discarded */
size = nal_len;
data = gst_adapter_map (rtph265pay->adapter, size);
- if (i + 1 != nal_queue->len || buffer != NULL)
- for (; size > 1 && data[size - 1] == 0x0; size--)
+ if (i + 1 != nal_queue->len || !draining)
+ for (; size > 2 && data[size - 1] == 0x0; size--)
/* skip */ ;
-
- /* If it's the last nal unit we have in non-bytestream mode, we can
- * assume it's the end of an access-unit
- *
- * FIXME: We need to wait until the next packet or EOS to
- * actually payload the NAL so we can know if the current NAL is
- * the last one of an access unit or not if we are in bytestream mode
- */
- if ((rtph265pay->alignment == GST_H265_ALIGNMENT_AU || buffer == NULL) &&
- i == nal_queue->len - 1)
- end_of_au = TRUE;
paybuf = gst_adapter_take_buffer (rtph265pay->adapter, size);
g_assert (paybuf);
+ g_ptr_array_add (paybufs, paybuf);
- /* put the data in one or more RTP packets */
- ret =
- gst_rtp_h265_pay_payload_nal (basepayload, paybuf, dts, pts,
- end_of_au);
- if (ret != GST_FLOW_OK) {
- break;
+ /* If it's the last nal unit we have in non-bytestream mode, we can
+ * assume it's the end of an access-unit */
+ GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER);
+ if (i == nal_queue->len - 1) {
+ if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU ||
+ marker || draining)
+ GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER);
+ }
+
+ GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_DISCONT);
+ if (discont) {
+ GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_DISCONT);
+ discont = FALSE;
}
/* move to next NAL packet */
/* Skips the trailing zeros */
gst_adapter_flush (rtph265pay->adapter, nal_len - size);
}
+ /* put the data in one or more RTP packets */
+ ret = gst_rtp_h265_pay_payload_nal (basepayload, paybufs, dts, pts);
g_array_set_size (nal_queue, 0);
}
+ if (ret == GST_FLOW_OK && rtph265pay->bundle_size > 0 &&
+ rtph265pay->aggregate_mode == GST_RTP_H265_AGGREGATE_ZERO_LATENCY &&
+ rtph265pay->bundle_contains_vcl_or_suffix) {
+ GST_DEBUG_OBJECT (rtph265pay, "sending bundle at end incoming packet");
+ ret = gst_rtp_h265_pay_send_bundle (rtph265pay, FALSE);
+ }
+
done:
- if (hevc) {
- gst_buffer_unmap (buffer, &map);
- gst_buffer_unref (buffer);
- } else {
+ if (!hevc) {
gst_adapter_unmap (rtph265pay->adapter);
}
gboolean res;
const GstStructure *s;
GstRtpH265Pay *rtph265pay = GST_RTP_H265_PAY (payload);
+ GstFlowReturn ret = GST_FLOW_OK;
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_STOP:
gst_adapter_clear (rtph265pay->adapter);
+ gst_rtp_h265_pay_reset_bundle (rtph265pay);
break;
case GST_EVENT_CUSTOM_DOWNSTREAM:
s = gst_event_get_structure (event);
* in byte-stream mode
*/
gst_rtp_h265_pay_handle_buffer (payload, NULL);
+ ret = gst_rtp_h265_pay_send_bundle (rtph265pay, TRUE);
+
break;
}
case GST_EVENT_STREAM_START:
break;
}
+ if (ret != GST_FLOW_OK)
+ return FALSE;
+
res = GST_RTP_BASE_PAYLOAD_CLASS (parent_class)->sink_event (payload, event);
return res;
case GST_STATE_CHANGE_READY_TO_PAUSED:
rtph265pay->send_vps_sps_pps = FALSE;
gst_adapter_clear (rtph265pay->adapter);
+ gst_rtp_h265_pay_reset_bundle (rtph265pay);
break;
+ default:
+ break;
+ }
+
+ ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+ switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
rtph265pay->last_vps_sps_pps = -1;
gst_rtp_h265_pay_clear_vps_sps_pps (rtph265pay);
break;
}
- ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
return ret;
}
rtph265pay = GST_RTP_H265_PAY (object);
switch (prop_id) {
- case PROP_SPROP_PARAMETER_SETS:
- g_free (rtph265pay->sprop_parameter_sets);
- rtph265pay->sprop_parameter_sets = g_value_dup_string (value);
- rtph265pay->update_caps = TRUE;
- break;
case PROP_CONFIG_INTERVAL:
- rtph265pay->vps_sps_pps_interval = g_value_get_uint (value);
+ rtph265pay->vps_sps_pps_interval = g_value_get_int (value);
+ break;
+ case PROP_AGGREGATE_MODE:
+ rtph265pay->aggregate_mode = g_value_get_enum (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
rtph265pay = GST_RTP_H265_PAY (object);
switch (prop_id) {
- case PROP_SPROP_PARAMETER_SETS:
- g_value_set_string (value, rtph265pay->sprop_parameter_sets);
- break;
case PROP_CONFIG_INTERVAL:
- g_value_set_uint (value, rtph265pay->vps_sps_pps_interval);
+ g_value_set_int (value, rtph265pay->vps_sps_pps_interval);
+ break;
+ case PROP_AGGREGATE_MODE:
+ g_value_set_enum (value, rtph265pay->aggregate_mode);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
projects / platform / upstream / gst-plugins-good.git / blobdiff