diff mbox series

[FFmpeg-devel] avformat: AMQP: add option delivery_mode

Message ID 20200614165606.36659-1-levis.florian@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel] avformat: AMQP: add option delivery_mode | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Florian Levis June 14, 2020, 4:56 p.m. UTC 
Hi,

I hope this reply will go to the correct thread.
I reworked my patch after Marton Balint review.

* fix: missing documentation
* fix: use AV_OPT_TYPE_CONST

Signed-off-by: Levis Florian <levis.florian@gmail.com>
---
 doc/protocols.texi    | 13 +++++++++++++
 libavformat/libamqp.c |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

Comments

Moritz Barsnick June 14, 2020, 10:08 p.m. UTC | #1 
On Sun, Jun 14, 2020 at 18:56:06 +0200, Levis Florian wrote:

Small nit:
> +    { "delivery_mode",  "Delivery more (non-persistent: 1/persistent: 2)", OFFSET(delivery_mode), AV_OPT_TYPE_INT, { .i64 = AMQP_DELIVERY_PERSISTENT }, 1, 2, .flags = E, "delivery_mode"},
                                     ^ typo

And now that you have named options, you don't need to describe them
anymore, so "Delivery mode" should suffice.

Moritz.
diff mbox series

Patch

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 7aa758541c..336246e67a 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -109,6 +109,19 @@  the received message may be truncated causing decoding errors.
 The timeout in seconds during the initial connection to the broker. The
 default value is rw_timeout, or 5 seconds if rw_timeout is not set.
 
+@item delivery_mode @var{mode}
+Sets the delivery mode.
+
+The following values are recognized:
+@table @samp
+@item persistent
+Delivery mode set to "persistent" (2). This is the default value.
+
+@item non-persistent
+Delivery mode set to "non-persistent" (1)
+
+@end table
+
 @end table
 
 @section async
diff --git a/libavformat/libamqp.c b/libavformat/libamqp.c
index aaf0e51152..f966edbed1 100644
--- a/libavformat/libamqp.c
+++ b/libavformat/libamqp.c
@@ -39,6 +39,7 @@  typedef struct AMQPContext {
     int pkt_size;
     int64_t connection_timeout;
     int pkt_size_overflow;
+    int delivery_mode;
 } AMQPContext;
 
 #define STR_LEN           1024
@@ -52,6 +53,9 @@  static const AVOption options[] = {
     { "exchange", "Exchange to send/read packets", OFFSET(exchange), AV_OPT_TYPE_STRING, { .str = "amq.direct" }, 0, 0, .flags = D | E },
     { "routing_key", "Key to filter streams", OFFSET(routing_key), AV_OPT_TYPE_STRING, { .str = "amqp" }, 0, 0, .flags = D | E },
     { "connection_timeout", "Initial connection timeout", OFFSET(connection_timeout), AV_OPT_TYPE_DURATION, { .i64 = -1 }, -1, INT64_MAX, .flags = D | E},
+    { "delivery_mode",  "Delivery more (non-persistent: 1/persistent: 2)", OFFSET(delivery_mode), AV_OPT_TYPE_INT, { .i64 = AMQP_DELIVERY_PERSISTENT }, 1, 2, .flags = E, "delivery_mode"},
+    { "persistent",     "persistent delivery mode",     0, AV_OPT_TYPE_CONST, {.i64=AMQP_DELIVERY_PERSISTENT }, 0, 0, E, "delivery_mode" },
+    { "non-persistent", "non-persistent delivery mode", 0, AV_OPT_TYPE_CONST, {.i64=AMQP_DELIVERY_NONPERSISTENT }, 0, 0, E, "delivery_mode" },
     { NULL }
 };
 
@@ -222,7 +226,7 @@  static int amqp_proto_write(URLContext *h, const unsigned char *buf, int size)
 
     props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG;
     props.content_type = amqp_cstring_bytes("octet/stream");
-    props.delivery_mode = 2; /* persistent delivery mode */
+    props.delivery_mode = s->delivery_mode;
 
     ret = amqp_basic_publish(s->conn, DEFAULT_CHANNEL, amqp_cstring_bytes(s->exchange),
                              amqp_cstring_bytes(s->routing_key), 0, 0,