[aravis] gst-plugins: only set packet-resend on GvStream
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [aravis] gst-plugins: only set packet-resend on GvStream
- Date: Tue, 22 Apr 2014 20:36:53 +0000 (UTC)
commit bf9a8fabd93fc00133515dedd87d5f9cb744e89d
Author: Emmanuel Pacaud <emmanuel gnome org>
Date: Tue Apr 22 22:35:43 2014 +0200
gst-plugins: only set packet-resend on GvStream
The device may not be a GigE Vision one.
gst-0.10/gstaravis.c | 2 +-
gst/gstaravis.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gst-0.10/gstaravis.c b/gst-0.10/gstaravis.c
index 4461020..5a73119 100644
--- a/gst-0.10/gstaravis.c
+++ b/gst-0.10/gstaravis.c
@@ -255,7 +255,7 @@ gst_aravis_set_caps (GstBaseSrc *src, GstCaps *caps)
gst_aravis->payload = arv_camera_get_payload (gst_aravis->camera);
gst_aravis->stream = arv_camera_create_stream (gst_aravis->camera, NULL, NULL);
- if (gst_aravis->packet_resend)
+ if (ARV_IS_GV_STREAM (gst_aravis->stream) && gst_aravis->packet_resend)
g_object_set (gst_aravis->stream, "packet-resend", ARV_GV_STREAM_PACKET_RESEND_ALWAYS, NULL);
else
g_object_set (gst_aravis->stream, "packet-resend", ARV_GV_STREAM_PACKET_RESEND_NEVER, NULL);
diff --git a/gst/gstaravis.c b/gst/gstaravis.c
index abc1e81..7a33b0e 100644
--- a/gst/gstaravis.c
+++ b/gst/gstaravis.c
@@ -242,11 +242,11 @@ gst_aravis_set_caps (GstBaseSrc *src, GstCaps *caps)
gst_aravis->payload = arv_camera_get_payload (gst_aravis->camera);
gst_aravis->stream = arv_camera_create_stream (gst_aravis->camera, NULL, NULL);
- if (gst_aravis->packet_resend) {
+
+ if (ARV_IS_GV_STREAM (gst_aravis->stream) && gst_aravis->packet_resend)
g_object_set (gst_aravis->stream, "packet-resend", ARV_GV_STREAM_PACKET_RESEND_ALWAYS, NULL);
- } else {
+ else
g_object_set (gst_aravis->stream, "packet-resend", ARV_GV_STREAM_PACKET_RESEND_NEVER, NULL);
- }
for (i = 0; i < GST_ARAVIS_N_BUFFERS; i++)
arv_stream_push_buffer (gst_aravis->stream,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]