parent
4687199348
commit
74b3439374
@ -127,6 +127,7 @@ gst_rtp_h263_depay_init (GstRtpH263Depay * rtph263depay,
|
|||||||
|
|
||||||
rtph263depay->offset = 0;
|
rtph263depay->offset = 0;
|
||||||
rtph263depay->leftover = 0;
|
rtph263depay->leftover = 0;
|
||||||
|
rtph263depay->start = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -182,6 +183,7 @@ gst_rtp_h263_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
|
|||||||
gst_adapter_clear (rtph263depay->adapter);
|
gst_adapter_clear (rtph263depay->adapter);
|
||||||
rtph263depay->offset = 0;
|
rtph263depay->offset = 0;
|
||||||
rtph263depay->leftover = 0;
|
rtph263depay->leftover = 0;
|
||||||
|
rtph263depay->start = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
payload_len = gst_rtp_buffer_get_payload_len (buf);
|
payload_len = gst_rtp_buffer_get_payload_len (buf);
|
||||||
@ -272,53 +274,60 @@ gst_rtp_h263_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!EBIT) {
|
if (!EBIT) {
|
||||||
GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len);
|
if(rtph263depay->start){
|
||||||
|
GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len);
|
||||||
|
|
||||||
/* Copy the entire buffer */
|
/* Copy the entire buffer */
|
||||||
memcpy (GST_BUFFER_DATA (tmp), payload, payload_len);
|
memcpy (GST_BUFFER_DATA (tmp), payload, payload_len);
|
||||||
gst_adapter_push (rtph263depay->adapter, tmp);
|
gst_adapter_push (rtph263depay->adapter, tmp);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len - 1);
|
if(rtph263depay->start){
|
||||||
|
GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len - 1);
|
||||||
|
|
||||||
/* Copy the entire buffer except for the last byte */
|
/* Copy the entire buffer except for the last byte */
|
||||||
memcpy (GST_BUFFER_DATA (tmp), payload, payload_len - 1);
|
memcpy (GST_BUFFER_DATA (tmp), payload, payload_len - 1);
|
||||||
gst_adapter_push (rtph263depay->adapter, tmp);
|
gst_adapter_push (rtph263depay->adapter, tmp);
|
||||||
|
|
||||||
/* Put the last byte into the leftover */
|
/* Put the last byte into the leftover */
|
||||||
GST_DEBUG ("payload[payload_len - 1] : 0x%x", payload[payload_len - 1]);
|
GST_DEBUG ("payload[payload_len - 1] : 0x%x", payload[payload_len - 1]);
|
||||||
GST_DEBUG ("mask : 0x%x", 0xFF << EBIT);
|
GST_DEBUG ("mask : 0x%x", 0xFF << EBIT);
|
||||||
rtph263depay->leftover = (payload[payload_len - 1] >> EBIT) << EBIT;
|
rtph263depay->leftover = (payload[payload_len - 1] >> EBIT) << EBIT;
|
||||||
rtph263depay->offset = 1;
|
rtph263depay->offset = 1;
|
||||||
GST_DEBUG ("leftover : 0x%x", rtph263depay->leftover);
|
GST_DEBUG ("leftover : 0x%x", rtph263depay->leftover);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (M) {
|
if (M) {
|
||||||
/* frame is completed */
|
if(rtph263depay->start){
|
||||||
guint avail;
|
/* frame is completed */
|
||||||
guint32 timestamp;
|
guint avail;
|
||||||
|
guint32 timestamp;
|
||||||
|
|
||||||
if (rtph263depay->offset) {
|
if (rtph263depay->offset) {
|
||||||
/* push in the leftover */
|
/* push in the leftover */
|
||||||
GstBuffer *buf = gst_buffer_new_and_alloc (1);
|
GstBuffer *buf = gst_buffer_new_and_alloc (1);
|
||||||
|
|
||||||
GST_DEBUG ("Pushing leftover in adapter");
|
GST_DEBUG ("Pushing leftover in adapter");
|
||||||
GST_BUFFER_DATA (buf)[0] = rtph263depay->leftover;
|
GST_BUFFER_DATA (buf)[0] = rtph263depay->leftover;
|
||||||
gst_adapter_push (rtph263depay->adapter, buf);
|
gst_adapter_push (rtph263depay->adapter, buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
avail = gst_adapter_available (rtph263depay->adapter);
|
||||||
|
outbuf = gst_adapter_take_buffer (rtph263depay->adapter, avail);
|
||||||
|
|
||||||
|
if (I)
|
||||||
|
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT);
|
||||||
|
|
||||||
|
GST_DEBUG ("Pushing out a buffer of %d bytes", avail);
|
||||||
|
|
||||||
|
timestamp = gst_rtp_buffer_get_timestamp (buf);
|
||||||
|
gst_base_rtp_depayload_push_ts (depayload, timestamp, outbuf);
|
||||||
|
rtph263depay->offset = 0;
|
||||||
|
rtph263depay->leftover = 0;
|
||||||
|
}else{
|
||||||
|
rtph263depay->start = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
avail = gst_adapter_available (rtph263depay->adapter);
|
|
||||||
outbuf = gst_adapter_take_buffer (rtph263depay->adapter, avail);
|
|
||||||
|
|
||||||
if (I)
|
|
||||||
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT);
|
|
||||||
|
|
||||||
GST_DEBUG ("Pushing out a buffer of %d bytes", avail);
|
|
||||||
|
|
||||||
timestamp = gst_rtp_buffer_get_timestamp (buf);
|
|
||||||
gst_base_rtp_depayload_push_ts (depayload, timestamp, outbuf);
|
|
||||||
rtph263depay->offset = 0;
|
|
||||||
rtph263depay->leftover = 0;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -47,6 +47,7 @@ struct _GstRtpH263Depay
|
|||||||
guint8 offset; /* offset to apply to next payload */
|
guint8 offset; /* offset to apply to next payload */
|
||||||
guint8 leftover; /* leftover from previous payload (if offset != 0) */
|
guint8 leftover; /* leftover from previous payload (if offset != 0) */
|
||||||
GstAdapter *adapter;
|
GstAdapter *adapter;
|
||||||
|
gboolean start;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GstRtpH263DepayClass
|
struct _GstRtpH263DepayClass
|
||||||
|
Loading…
x
Reference in New Issue
Block a user