mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtph265depay: store negotiated output format as enum

Browse source 
We keep the boolean byte_stream around since it's nicer for
readability and most of the code just cares about byte_stream
or not. This is useful for future-proofing the code for when
we add support for hev1 output as well.
This commit is contained in:
Tim-Philipp Müller 2017-09-05 15:47:42 +01:00
parent 46861027b9
commit 8da79ca824
2 changed files with 39 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
gst/rtp/gstrtph265depay.c
View file

@ -36,7 +36,7 @@ GST_DEBUG_CATEGORY_STATIC (rtph265depay_debug);
/* This is what we'll default to when downstream hasn't /* This is what we'll default to when downstream hasn't
* expressed a restriction or preference via caps */ * expressed a restriction or preference via caps */
#define DEFAULT_BYTE_STREAM TRUE #define DEFAULT_STREAM_FORMAT GST_H265_STREAM_FORMAT_BYTESTREAM
#define DEFAULT_ACCESS_UNIT FALSE #define DEFAULT_ACCESS_UNIT FALSE
/* 3 zero bytes syncword */ /* 3 zero bytes syncword */
@ -144,7 +144,9 @@ gst_rtp_h265_depay_init (GstRtpH265Depay * rtph265depay)
{ {
rtph265depay->adapter = gst_adapter_new (); rtph265depay->adapter = gst_adapter_new ();
rtph265depay->picture_adapter = gst_adapter_new (); rtph265depay->picture_adapter = gst_adapter_new ();
rtph265depay->byte_stream = DEFAULT_BYTE_STREAM; rtph265depay->output_format = DEFAULT_STREAM_FORMAT;
rtph265depay->byte_stream =
(DEFAULT_STREAM_FORMAT == GST_H265_STREAM_FORMAT_BYTESTREAM);
rtph265depay->stream_format = NULL; rtph265depay->stream_format = NULL;
rtph265depay->merge = DEFAULT_ACCESS_UNIT; rtph265depay->merge = DEFAULT_ACCESS_UNIT;
rtph265depay->vps = g_ptr_array_new_with_free_func ( rtph265depay->vps = g_ptr_array_new_with_free_func (
@ -189,8 +191,6 @@ gst_rtp_h265_depay_finalize (GObject * object)
if (rtph265depay->codec_data) if (rtph265depay->codec_data)
gst_buffer_unref (rtph265depay->codec_data); gst_buffer_unref (rtph265depay->codec_data);
g_free (rtph265depay->stream_format);
g_object_unref (rtph265depay->adapter); g_object_unref (rtph265depay->adapter);
g_object_unref (rtph265depay->picture_adapter); g_object_unref (rtph265depay->picture_adapter);
@ -201,11 +201,27 @@ gst_rtp_h265_depay_finalize (GObject * object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static inline const gchar *
stream_format_get_nick (GstH265StreamFormat fmt)
{
switch (fmt) {
case GST_H265_STREAM_FORMAT_BYTESTREAM:
return "byte-stream";
case GST_H265_STREAM_FORMAT_HVC1:
return "hvc1";
case GST_H265_STREAM_FORMAT_HEV1:
return "hev1";
default:
break;
}
return "unknown";
}
static void static void
gst_rtp_h265_depay_negotiate (GstRtpH265Depay * rtph265depay) gst_rtp_h265_depay_negotiate (GstRtpH265Depay * rtph265depay)
{ {
GstH265StreamFormat stream_format = GST_H265_STREAM_FORMAT_UNKNOWN;
GstCaps *caps; GstCaps *caps;
gint byte_stream = -1;
gint merge = -1; gint merge = -1;
caps = caps =
@ -219,15 +235,14 @@ gst_rtp_h265_depay_negotiate (GstRtpH265Depay * rtph265depay)
const gchar *str = NULL; const gchar *str = NULL;
if ((str = gst_structure_get_string (s, "stream-format"))) { if ((str = gst_structure_get_string (s, "stream-format"))) {
g_free (rtph265depay->stream_format); rtph265depay->stream_format = g_intern_string (str);
rtph265depay->stream_format = g_strdup (str);
if (strcmp (str, "hev1") == 0) { if (strcmp (str, "hev1") == 0) {
byte_stream = FALSE; stream_format = GST_H265_STREAM_FORMAT_HEV1;
} else if (strcmp (str, "hvc1") == 0) { } else if (strcmp (str, "hvc1") == 0) {
byte_stream = FALSE; stream_format = GST_H265_STREAM_FORMAT_HVC1;
} else if (strcmp (str, "byte-stream") == 0) { } else if (strcmp (str, "byte-stream") == 0) {
byte_stream = TRUE; stream_format = GST_H265_STREAM_FORMAT_BYTESTREAM;
} else { } else {
GST_DEBUG_OBJECT (rtph265depay, "unknown stream-format: %s", str); GST_DEBUG_OBJECT (rtph265depay, "unknown stream-format: %s", str);
} }
@ -246,17 +261,20 @@ gst_rtp_h265_depay_negotiate (GstRtpH265Depay * rtph265depay)
gst_caps_unref (caps); gst_caps_unref (caps);
} }
if (byte_stream != -1) { if (stream_format != GST_H265_STREAM_FORMAT_UNKNOWN) {
GST_DEBUG_OBJECT (rtph265depay, "downstream requires byte-stream %d", GST_DEBUG_OBJECT (rtph265depay, "downstream wants stream-format %s",
byte_stream); stream_format_get_nick (stream_format));
rtph265depay->byte_stream = byte_stream; rtph265depay->output_format = stream_format;
} else { } else {
GST_DEBUG_OBJECT (rtph265depay, "defaulting to byte-stream %d", GST_DEBUG_OBJECT (rtph265depay, "defaulting to output stream-format %s",
DEFAULT_BYTE_STREAM); stream_format_get_nick (DEFAULT_STREAM_FORMAT));
g_free (rtph265depay->stream_format); rtph265depay->stream_format =
rtph265depay->stream_format = g_strdup ("byte-stream"); stream_format_get_nick (DEFAULT_STREAM_FORMAT);
rtph265depay->byte_stream = DEFAULT_BYTE_STREAM; rtph265depay->output_format = DEFAULT_STREAM_FORMAT;
} }
rtph265depay->byte_stream =
(rtph265depay->output_format == GST_H265_STREAM_FORMAT_BYTESTREAM);
if (merge != -1) { if (merge != -1) {
GST_DEBUG_OBJECT (rtph265depay, "downstream requires merge %d", merge); GST_DEBUG_OBJECT (rtph265depay, "downstream requires merge %d", merge);
rtph265depay->merge = merge; rtph265depay->merge = merge;

3
gst/rtp/gstrtph265depay.h
View file

@ -56,7 +56,8 @@ struct _GstRtpH265Depay
{ {
GstRTPBaseDepayload depayload; GstRTPBaseDepayload depayload;
gchar *stream_format; const gchar *stream_format;
GstH265StreamFormat output_format; /* bytestream, hvc1 or hev1 */
gboolean byte_stream; gboolean byte_stream;
GstBuffer *codec_data; GstBuffer *codec_data;