mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

port to new video flags

Browse source
This commit is contained in:
Wim Taymans 2011-08-25 16:41:23 +02:00
parent 34ea60526d
commit 18065ac823
4 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/rtp/gstrtpgstdepay.c
View file

@ -200,7 +200,7 @@ gst_rtp_gst_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
* 0 1 2 3 * 0 1 2 3
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |C| CV |D|X|Y|Z| MBZ | * |C| CV |D|0|0|0| MBZ |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Frag_offset | * | Frag_offset |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@ -290,12 +290,6 @@ gst_rtp_gst_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
if (outbuf) { if (outbuf) {
if (payload[0] & 0x8) if (payload[0] & 0x8)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT); GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT);
if (payload[0] & 0x4)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_MEDIA1);
if (payload[0] & 0x2)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_MEDIA2);
if (payload[0] & 0x1)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_MEDIA3);
} }
} }
return outbuf; return outbuf;

11
gst/rtp/gstrtpgstpay.c
View file

@ -31,7 +31,7 @@
* 0 1 2 3 * 0 1 2 3
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |C| CV |D|X|Y|Z| MBZ | * |C| CV |D|0|0|0| MBZ |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Frag_offset | * | Frag_offset |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@ -45,9 +45,6 @@
* *
* CV: caps version, 0 = caps from SDP, 1 - 7 inlined caps * CV: caps version, 0 = caps from SDP, 1 - 7 inlined caps
* D: delta unit buffer * D: delta unit buffer
* X: media 1 flag
* Y: media 2 flag
* Z: media 3 flag
* *
* *
*/ */
@ -147,12 +144,6 @@ gst_rtp_gst_pay_handle_buffer (GstBaseRTPPayload * basepayload,
flags = 0; flags = 0;
if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT)) if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT))
flags |= (1 << 3); flags |= (1 << 3);
if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MEDIA1))
flags |= (1 << 2);
if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MEDIA2))
flags |= (1 << 1);
if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MEDIA3))
flags |= (1 << 0);
/* /*
* 0 1 2 3 * 0 1 2 3

2
gst/y4m/gsty4mencode.c
View file

@ -277,7 +277,7 @@ gst_y4m_encode_chain (GstPad * pad, GstBuffer * buf)
gboolean tff; gboolean tff;
if (filter->info.flags & GST_VIDEO_FLAG_INTERLACED) { if (filter->info.flags & GST_VIDEO_FLAG_INTERLACED) {
tff = GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_TFF); tff = GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_FLAG_TFF);
} }
outbuf = gst_y4m_encode_get_stream_header (filter, tff); outbuf = gst_y4m_encode_get_stream_header (filter, tff);
filter->header = TRUE; filter->header = TRUE;

4
sys/v4l2/gstv4l2bufferpool.c
View file

@ -591,9 +591,9 @@ gst_v4l2_buffer_pool_dqbuf (GstV4l2BufferPool * pool, GstBuffer ** buffer)
/* set top/bottom field first if v4l2_buffer has the information */ /* set top/bottom field first if v4l2_buffer has the information */
if (vbuffer.field == V4L2_FIELD_INTERLACED_TB) if (vbuffer.field == V4L2_FIELD_INTERLACED_TB)
GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_TFF); GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF);
if (vbuffer.field == V4L2_FIELD_INTERLACED_BT) if (vbuffer.field == V4L2_FIELD_INTERLACED_BT)
GST_BUFFER_FLAG_UNSET (outbuf, GST_VIDEO_BUFFER_TFF); GST_BUFFER_FLAG_UNSET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF);
/* this can change at every frame, esp. with jpeg */ /* this can change at every frame, esp. with jpeg */
if (obj->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) if (obj->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)