mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-03 13:16:04 +00:00
Revert "rtp: add h265 RTP payloader + depayloader"
This reverts commit d06ba9051f
.
This breaks the build, as it depends on parser API in -bad.
This commit is contained in:
parent
d06ba9051f
commit
f3fec86bc9
|
@ -44,8 +44,6 @@ libgstrtp_la_SOURCES = \
|
||||||
gstrtph263pay.c \
|
gstrtph263pay.c \
|
||||||
gstrtph264depay.c \
|
gstrtph264depay.c \
|
||||||
gstrtph264pay.c \
|
gstrtph264pay.c \
|
||||||
gstrtph265depay.c \
|
|
||||||
gstrtph265pay.c \
|
|
||||||
gstrtpj2kdepay.c \
|
gstrtpj2kdepay.c \
|
||||||
gstrtpj2kpay.c \
|
gstrtpj2kpay.c \
|
||||||
gstrtpjpegdepay.c \
|
gstrtpjpegdepay.c \
|
||||||
|
@ -147,8 +145,6 @@ noinst_HEADERS = \
|
||||||
gstrtph263pay.h \
|
gstrtph263pay.h \
|
||||||
gstrtph264depay.h \
|
gstrtph264depay.h \
|
||||||
gstrtph264pay.h \
|
gstrtph264pay.h \
|
||||||
gstrtph265depay.h \
|
|
||||||
gstrtph265pay.h \
|
|
||||||
gstrtpj2kdepay.h \
|
gstrtpj2kdepay.h \
|
||||||
gstrtpj2kpay.h \
|
gstrtpj2kpay.h \
|
||||||
gstrtpjpegdepay.h \
|
gstrtpjpegdepay.h \
|
||||||
|
|
|
@ -62,8 +62,6 @@
|
||||||
#include "gstrtph263pay.h"
|
#include "gstrtph263pay.h"
|
||||||
#include "gstrtph264depay.h"
|
#include "gstrtph264depay.h"
|
||||||
#include "gstrtph264pay.h"
|
#include "gstrtph264pay.h"
|
||||||
#include "gstrtph265depay.h"
|
|
||||||
#include "gstrtph265pay.h"
|
|
||||||
#include "gstrtpj2kdepay.h"
|
#include "gstrtpj2kdepay.h"
|
||||||
#include "gstrtpj2kpay.h"
|
#include "gstrtpj2kpay.h"
|
||||||
#include "gstrtpjpegdepay.h"
|
#include "gstrtpjpegdepay.h"
|
||||||
|
@ -224,12 +222,6 @@ plugin_init (GstPlugin * plugin)
|
||||||
if (!gst_rtp_h264_pay_plugin_init (plugin))
|
if (!gst_rtp_h264_pay_plugin_init (plugin))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (!gst_rtp_h265_depay_plugin_init (plugin))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
if (!gst_rtp_h265_pay_plugin_init (plugin))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
if (!gst_rtp_j2k_depay_plugin_init (plugin))
|
if (!gst_rtp_j2k_depay_plugin_init (plugin))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,98 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) <2006> Wim Taymans <wim.taymans@gmail.com>
|
|
||||||
* Copyright (C) <2014> Jurgen Slowack <jurgenslowack@gmail.com>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Library General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Library General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
* Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __GST_RTP_H265_DEPAY_H__
|
|
||||||
#define __GST_RTP_H265_DEPAY_H__
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include <gst/base/gstadapter.h>
|
|
||||||
#include <gst/rtp/gstrtpbasedepayload.h>
|
|
||||||
#include <gst/codecparsers/gsth265parser.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
#define GST_TYPE_RTP_H265_DEPAY \
|
|
||||||
(gst_rtp_h265_depay_get_type())
|
|
||||||
#define GST_RTP_H265_DEPAY(obj) \
|
|
||||||
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_H265_DEPAY,GstRtpH265Depay))
|
|
||||||
#define GST_RTP_H265_DEPAY_CLASS(klass) \
|
|
||||||
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_H265_DEPAY,GstRtpH265DepayClass))
|
|
||||||
#define GST_IS_RTP_H265_DEPAY(obj) \
|
|
||||||
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_H265_DEPAY))
|
|
||||||
#define GST_IS_RTP_H265_DEPAY_CLASS(klass) \
|
|
||||||
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_H265_DEPAY))
|
|
||||||
typedef struct _GstRtpH265Depay GstRtpH265Depay;
|
|
||||||
typedef struct _GstRtpH265DepayClass GstRtpH265DepayClass;
|
|
||||||
|
|
||||||
#define GST_H265_VPS_NUT 32
|
|
||||||
#define GST_H265_SPS_NUT 33
|
|
||||||
#define GST_H265_PPS_NUT 34
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
GST_H265_STREAM_FORMAT_UNKNOWN,
|
|
||||||
GST_H265_STREAM_FORMAT_BYTESTREAM,
|
|
||||||
GST_H265_STREAM_FORMAT_HVC1,
|
|
||||||
GST_H265_STREAM_FORMAT_HEV1
|
|
||||||
} GstH265StreamFormat;
|
|
||||||
|
|
||||||
struct _GstRtpH265Depay
|
|
||||||
{
|
|
||||||
GstRTPBaseDepayload depayload;
|
|
||||||
|
|
||||||
gchar *stream_format;
|
|
||||||
gboolean byte_stream;
|
|
||||||
|
|
||||||
GstBuffer *codec_data;
|
|
||||||
GstAdapter *adapter;
|
|
||||||
gboolean wait_start;
|
|
||||||
|
|
||||||
/* nal merging */
|
|
||||||
gboolean merge;
|
|
||||||
GstAdapter *picture_adapter;
|
|
||||||
gboolean picture_start;
|
|
||||||
GstClockTime last_ts;
|
|
||||||
gboolean last_keyframe;
|
|
||||||
|
|
||||||
/* Work around broken payloaders wrt. Fragmentation Units */
|
|
||||||
guint8 current_fu_type;
|
|
||||||
GstClockTime fu_timestamp;
|
|
||||||
gboolean fu_marker;
|
|
||||||
|
|
||||||
/* misc */
|
|
||||||
GPtrArray *vps;
|
|
||||||
GPtrArray *sps;
|
|
||||||
GPtrArray *pps;
|
|
||||||
gboolean new_codec_data;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _GstRtpH265DepayClass
|
|
||||||
{
|
|
||||||
GstRTPBaseDepayloadClass parent_class;
|
|
||||||
};
|
|
||||||
|
|
||||||
GType gst_rtp_h265_depay_get_type (void);
|
|
||||||
|
|
||||||
gboolean gst_rtp_h265_depay_plugin_init (GstPlugin * plugin);
|
|
||||||
|
|
||||||
gboolean gst_rtp_h265_add_vps_sps_pps (GstElement * rtph265, GPtrArray * vps,
|
|
||||||
GPtrArray * sps, GPtrArray * pps, GstBuffer * nal);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
#endif /* __GST_RTP_H265_DEPAY_H__ */
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,82 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) <2006> Wim Taymans <wim.taymans@gmail.com>
|
|
||||||
* Copyright (C) <2014> Jurgen Slowack <jurgenslowack@gmail.com>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Library General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Library General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
* Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __GST_RTP_H265_PAY_H__
|
|
||||||
#define __GST_RTP_H265_PAY_H__
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include <gst/base/gstadapter.h>
|
|
||||||
#include <gst/rtp/gstrtpbasepayload.h>
|
|
||||||
#include <gst/codecparsers/gsth265parser.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
#define GST_TYPE_RTP_H265_PAY \
|
|
||||||
(gst_rtp_h265_pay_get_type())
|
|
||||||
#define GST_RTP_H265_PAY(obj) \
|
|
||||||
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_H265_PAY,GstRtpH265Pay))
|
|
||||||
#define GST_RTP_H265_PAY_CLASS(klass) \
|
|
||||||
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_H265_PAY,GstRtpH265PayClass))
|
|
||||||
#define GST_IS_RTP_H265_PAY(obj) \
|
|
||||||
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_H265_PAY))
|
|
||||||
#define GST_IS_RTP_H265_PAY_CLASS(klass) \
|
|
||||||
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_H265_PAY))
|
|
||||||
typedef struct _GstRtpH265Pay GstRtpH265Pay;
|
|
||||||
typedef struct _GstRtpH265PayClass GstRtpH265PayClass;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
GST_H265_ALIGNMENT_UNKNOWN,
|
|
||||||
GST_H265_ALIGNMENT_NAL,
|
|
||||||
GST_H265_ALIGNMENT_AU
|
|
||||||
} GstH265Alignment;
|
|
||||||
|
|
||||||
struct _GstRtpH265Pay
|
|
||||||
{
|
|
||||||
GstRTPBasePayload payload;
|
|
||||||
|
|
||||||
guint profile;
|
|
||||||
GPtrArray *sps, *pps, *vps;
|
|
||||||
|
|
||||||
GstH265StreamFormat stream_format;
|
|
||||||
GstH265Alignment alignment;
|
|
||||||
guint nal_length_size;
|
|
||||||
GArray *queue;
|
|
||||||
|
|
||||||
gchar *sprop_parameter_sets;
|
|
||||||
gboolean update_caps;
|
|
||||||
|
|
||||||
GstAdapter *adapter;
|
|
||||||
|
|
||||||
guint vps_sps_pps_interval;
|
|
||||||
gboolean send_vps_sps_pps;
|
|
||||||
GstClockTime last_vps_sps_pps;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _GstRtpH265PayClass
|
|
||||||
{
|
|
||||||
GstRTPBasePayloadClass parent_class;
|
|
||||||
};
|
|
||||||
|
|
||||||
GType gst_rtp_h265_pay_get_type (void);
|
|
||||||
|
|
||||||
gboolean gst_rtp_h265_pay_plugin_init (GstPlugin * plugin);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
#endif /* __GST_RTP_H265_PAY_H__ */
|
|
Loading…
Reference in a new issue