mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 03:35:21 +00:00
gst/rtp/: It's codec_data, not codec_info.
Original commit message from CVS: * gst/rtp/gstrtpmp4gpay.c: (gst_rtp_mp4g_pay_setcaps): * gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_setcaps): It's codec_data, not codec_info.
This commit is contained in:
parent
a0b8e8176a
commit
3763c60ad8
3 changed files with 20 additions and 14 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2006-04-25 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
|
* gst/rtp/gstrtpmp4gpay.c: (gst_rtp_mp4g_pay_setcaps):
|
||||||
|
* gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_setcaps):
|
||||||
|
It's codec_data, not codec_info.
|
||||||
|
|
||||||
2006-04-25 Tim-Philipp Müller <tim at centricular dot net>
|
2006-04-25 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
|
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
|
||||||
|
|
|
@ -357,22 +357,22 @@ gst_rtp_mp4g_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
|
||||||
{
|
{
|
||||||
GstRtpMP4GPay *rtpmp4gpay;
|
GstRtpMP4GPay *rtpmp4gpay;
|
||||||
GstStructure *structure;
|
GstStructure *structure;
|
||||||
const GValue *codec_info;
|
const GValue *codec_data;
|
||||||
gboolean res = TRUE;
|
gboolean res = TRUE;
|
||||||
|
|
||||||
rtpmp4gpay = GST_RTP_MP4G_PAY (payload);
|
rtpmp4gpay = GST_RTP_MP4G_PAY (payload);
|
||||||
|
|
||||||
structure = gst_caps_get_structure (caps, 0);
|
structure = gst_caps_get_structure (caps, 0);
|
||||||
|
|
||||||
codec_info = gst_structure_get_value (structure, "codec_info");
|
codec_data = gst_structure_get_value (structure, "codec_data");
|
||||||
if (codec_info) {
|
if (codec_data) {
|
||||||
GST_LOG_OBJECT (rtpmp4gpay, "got codec_info");
|
GST_LOG_OBJECT (rtpmp4gpay, "got codec_data");
|
||||||
if (G_VALUE_TYPE (codec_info) == GST_TYPE_BUFFER) {
|
if (G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) {
|
||||||
GstBuffer *buffer;
|
GstBuffer *buffer;
|
||||||
const gchar *name;
|
const gchar *name;
|
||||||
|
|
||||||
buffer = gst_value_get_buffer (codec_info);
|
buffer = gst_value_get_buffer (codec_data);
|
||||||
GST_LOG_OBJECT (rtpmp4gpay, "configuring codec_info");
|
GST_LOG_OBJECT (rtpmp4gpay, "configuring codec_data");
|
||||||
|
|
||||||
name = gst_structure_get_name (structure);
|
name = gst_structure_get_name (structure);
|
||||||
|
|
||||||
|
|
|
@ -199,7 +199,7 @@ gst_rtp_mp4v_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
|
||||||
{
|
{
|
||||||
GstRtpMP4VPay *rtpmp4vpay;
|
GstRtpMP4VPay *rtpmp4vpay;
|
||||||
GstStructure *structure;
|
GstStructure *structure;
|
||||||
const GValue *codec_info;
|
const GValue *codec_data;
|
||||||
|
|
||||||
rtpmp4vpay = GST_RTP_MP4V_PAY (payload);
|
rtpmp4vpay = GST_RTP_MP4V_PAY (payload);
|
||||||
|
|
||||||
|
@ -207,15 +207,15 @@ gst_rtp_mp4v_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
|
||||||
rtpmp4vpay->rate);
|
rtpmp4vpay->rate);
|
||||||
|
|
||||||
structure = gst_caps_get_structure (caps, 0);
|
structure = gst_caps_get_structure (caps, 0);
|
||||||
codec_info = gst_structure_get_value (structure, "codec_info");
|
codec_data = gst_structure_get_value (structure, "codec_data");
|
||||||
if (codec_info) {
|
if (codec_data) {
|
||||||
GST_LOG_OBJECT (rtpmp4vpay, "got codec_info");
|
GST_LOG_OBJECT (rtpmp4vpay, "got codec_data");
|
||||||
if (G_VALUE_TYPE (codec_info) == GST_TYPE_BUFFER) {
|
if (G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) {
|
||||||
GstBuffer *buffer;
|
GstBuffer *buffer;
|
||||||
guint8 *data;
|
guint8 *data;
|
||||||
guint size;
|
guint size;
|
||||||
|
|
||||||
buffer = gst_value_get_buffer (codec_info);
|
buffer = gst_value_get_buffer (codec_data);
|
||||||
|
|
||||||
data = GST_BUFFER_DATA (buffer);
|
data = GST_BUFFER_DATA (buffer);
|
||||||
size = GST_BUFFER_SIZE (buffer);
|
size = GST_BUFFER_SIZE (buffer);
|
||||||
|
@ -224,7 +224,7 @@ gst_rtp_mp4v_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
rtpmp4vpay->profile = data[4];
|
rtpmp4vpay->profile = data[4];
|
||||||
GST_LOG_OBJECT (rtpmp4vpay, "configuring codec_info, profile %d",
|
GST_LOG_OBJECT (rtpmp4vpay, "configuring codec_data, profile %d",
|
||||||
data[4]);
|
data[4]);
|
||||||
|
|
||||||
if (rtpmp4vpay->config)
|
if (rtpmp4vpay->config)
|
||||||
|
|
Loading…
Reference in a new issue