From patchwork Sun Jun 14 13:12:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Levis X-Patchwork-Id: 20346 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1E64C44AC2F for ; Sun, 14 Jun 2020 16:45:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F383B68B6D9; Sun, 14 Jun 2020 16:45:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DA6668B644 for ; Sun, 14 Jun 2020 16:45:51 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id g1so9591377edv.6 for ; Sun, 14 Jun 2020 06:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AJqWv0Rv0jWhbOMQ4Y/RTJO5J4CJ89dm1kLSHVmx6KU=; b=CJz0PIRY4/C1s0iQ/GdT/a6TPn4IC7FIEkjy85JPF8OaLAxp4b3rq4zflhefElPqdR xoIvfcQdgD6vEBolLVjPJ39XkRkzFJwMbySQRTaygjR6Iahc7pm3KcuCY1LqF2xWTXKh UAto0Nvft46i9wlk3cqtMwq1hnhHuqIYPwhfpuow7d0gD6+cVYOrKphN1jVcEWLiv2ib DSrMYPbj1fyNfSh63j3NLM48ZrjMxgF2VOLG8OGIfXMfObqs/EOSRnS3brPnDjSUl2xC Lzr77j01i6mAxv0k9KUi91Cc2TO0HmhFFzxLev3y7uya3+dFL3iPje2tOAzbnB5jWzyK +77g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AJqWv0Rv0jWhbOMQ4Y/RTJO5J4CJ89dm1kLSHVmx6KU=; b=OzIMN+lCuwt8Nt5UwgLnxwo0Q0C/X70DxPO5+FAI7wNYa89MJ4P4fcWRt/V9YFpr6m 31MdvJv4SnOHeS0u4RYC7Ux5uP6yXKsD/T17nrdZwLCbBJJ9GosgNkNflcv1Wv6rND52 kEWwpbqurs3N7U2QIRbvL9eRTaREoKumI6UJdJhFb833Coa3LGU7iQZeMgDSMGHQp+vO mBFUn9yjR3xVSaRNDW5SNt3/HiEr9qFDEHqihw6eMitBGk0wn9xpS90LX+RgzttBHbAy QXgs3FKeKhQpXkSjFjNSflhU7SR1tnil8mpvlxVIR2zOWDaPKc5wSnKwMUZblZ2Rc9+C d7YA== X-Gm-Message-State: AOAM5338j99ePL5GC2QIE7kIKeExPVD5f1LWbsCBFv2y/N4Bu6L+1iI8 nlRHCKr2S0BXvomxiPx8fpmfLu5a8Ek= X-Google-Smtp-Source: ABdhPJyiMXha6Nt5qEL3ZmwRoSg4CkOVlthEE8rFCasfy+CMwGBy0a3C/h0j58lqAP3eeqjb91/mqA== X-Received: by 2002:a5d:5092:: with SMTP id a18mr24004111wrt.42.1592140447861; Sun, 14 Jun 2020 06:14:07 -0700 (PDT) Received: from localhost.localdomain (82-64-71-170.subs.proxad.net. [82.64.71.170]) by smtp.gmail.com with ESMTPSA id c70sm17423453wme.32.2020.06.14.06.14.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jun 2020 06:14:07 -0700 (PDT) From: Levis Florian To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Jun 2020 15:12:38 +0200 Message-Id: <20200614131237.21188-1-levis.florian@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat: AMQP: add option delivery_mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Levis Florian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Levis Florian --- libavformat/libamqp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/libamqp.c b/libavformat/libamqp.c index aaf0e51152..485c0ccc49 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,7 @@ 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 = 2 }, 1, 2, .flags = D | E}, { NULL } }; @@ -222,7 +224,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,