From patchwork Sat Oct 22 09:03:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmed Ammar X-Patchwork-Id: 1128 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1401118vsd; Sat, 22 Oct 2016 02:03:52 -0700 (PDT) X-Received: by 10.28.72.84 with SMTP id v81mr3674051wma.11.1477127031926; Sat, 22 Oct 2016 02:03:51 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s76si2261964wmb.46.2016.10.22.02.03.50; Sat, 22 Oct 2016 02:03:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@genesi-usa-com.20150623.gappssmtp.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D1D7689C0A; Sat, 22 Oct 2016 12:03:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4BF6689817 for ; Sat, 22 Oct 2016 12:03:38 +0300 (EEST) Received: by mail-wm0-f49.google.com with SMTP id b80so23159968wme.1 for ; Sat, 22 Oct 2016 02:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=genesi-usa-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=9ALN5yaP06yWAp8k2WA32skCGA8BarWtFM1DnzHZlPw=; b=Pa8YdSaULtVF9HTyc+UaGU5yGLYa/IXgqNa25CXNDl+NjcJjM7QrbhvjNWj7oKF/Qt 8fNDdIHjdHS4+z12l9Cjt/h5/1jQS745OQPIiuB9tXGzXk+bnVF/jzvZAq8s2IH7Ysjx vF2HkGav3n4TkftrA9e3qhSw1LzRvxC58NV8QY3UW2CYwXufwnDSOC60i4GWUsdz10u3 CCk0ZYQ8x0WFAG2oKem3pg58PudgMYQI7MzAXm8SNg2vgxyw2cETUjRGjbutei+LFlEl JIrlgua/JgqsYxio1HgFQKNt8cYr5fnk2ayEy6PZpzN/7zZ3kVtAhwFO8PkaQTIqriQC oZnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9ALN5yaP06yWAp8k2WA32skCGA8BarWtFM1DnzHZlPw=; b=cJQ7UCpe/XGpmJdtnx0UeH7gbC8nNDcpwrsya6PNto7XsJS3gd9O45Xx/r6bFPHJSm hjXiDlWeHXDXuIQDCzW9XcYVxgWDne9T/E0dcXpsC7+Uyugqin/xxLX3nE9zPsU9QYk+ 1uwJ4MM7plZWjySOorVsw+t+OYL4zn07molDzND2D4yZ3NJxBukQVa+hCPWMie7OMWpq aPl/kXluwu0DPGiIYDD2xCCCRR97siqhkmKZgvEznmwcxjvpc68Z1Jk3CZi9CiN/FEm3 HI0aACiEbfsbesItp84oboPQFMkAbsL/if4ywnPR5nkGgWdjCHHLG8C71MS14Xw5foGu BNVg== X-Gm-Message-State: ABUngveMASqXRE7Ug9HUhxwCD9xOY0up1OOYdYghSz9Ntwuu2liwJ/G6ZXM+9MougG1ukQ== X-Received: by 10.194.75.37 with SMTP id z5mr4485196wjv.78.1477127021524; Sat, 22 Oct 2016 02:03:41 -0700 (PDT) Received: from localhost.localdomain ([196.128.35.88]) by smtp.gmail.com with ESMTPSA id 194sm2672679wmj.20.2016.10.22.02.03.40 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 22 Oct 2016 02:03:41 -0700 (PDT) From: Ahmed Ammar To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Oct 2016 11:03:36 +0200 Message-Id: <20161022090336.24980-1-aammar@genesi-usa.com> X-Mailer: git-send-email 2.8.4 (Apple Git-73) Subject: [FFmpeg-devel] [PATCH] avformat/rtmpproto: Handle NetStream.Play.PublishNotify by re-creating stream. 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: Ahmed Ammar MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/rtmpproto.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 95d1c1d..8a32222 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -227,6 +227,11 @@ static int rtmp_send_packet(RTMPContext *rt, RTMPPacket *pkt, int track) { int ret; +#ifdef DEBUG + av_log(rt, AV_LOG_DEBUG, "Sending packet:\n"); + ff_rtmp_packet_dump(rt, pkt); +#endif + if (pkt->type == RTMP_PT_INVOKE && track) { GetByteContext gbc; char name[128]; @@ -2032,6 +2037,29 @@ static int read_number_result(RTMPPacket *pkt, double *number) return 0; } +static int subscribe_stream(URLContext *s, RTMPContext *rt) +{ + int ret = 0; + + if ((ret = gen_create_stream(s, rt)) < 0) + goto fail; + + if (rt->is_input) { + /* Send the FCSubscribe command when the name of live + * stream is defined by the user or if it's a live stream. */ + if (rt->subscribe) { + if ((ret = gen_fcsubscribe_stream(s, rt, rt->subscribe)) < 0) + goto fail; + } else if (rt->live == -1) { + if ((ret = gen_fcsubscribe_stream(s, rt, rt->playpath)) < 0) + goto fail; + } + } + +fail: + return ret; +} + static int handle_invoke_result(URLContext *s, RTMPPacket *pkt) { RTMPContext *rt = s->priv_data; @@ -2058,20 +2086,9 @@ static int handle_invoke_result(URLContext *s, RTMPPacket *pkt) goto fail; } - if ((ret = gen_create_stream(s, rt)) < 0) + if ((ret = subscribe_stream(s, rt)) < 0) goto fail; - if (rt->is_input) { - /* Send the FCSubscribe command when the name of live - * stream is defined by the user or if it's a live stream. */ - if (rt->subscribe) { - if ((ret = gen_fcsubscribe_stream(s, rt, rt->subscribe)) < 0) - goto fail; - } else if (rt->live == -1) { - if ((ret = gen_fcsubscribe_stream(s, rt, rt->playpath)) < 0) - goto fail; - } - } } else if (!strcmp(tracked_method, "createStream")) { double stream_id; if (read_number_result(pkt, &stream_id)) { @@ -2137,6 +2154,13 @@ static int handle_invoke_status(URLContext *s, RTMPPacket *pkt) if (!t && !strcmp(tmpstr, "NetStream.Play.UnpublishNotify")) rt->state = STATE_STOPPED; if (!t && !strcmp(tmpstr, "NetStream.Publish.Start")) rt->state = STATE_PUBLISHING; if (!t && !strcmp(tmpstr, "NetStream.Seek.Notify")) rt->state = STATE_PLAYING; + if (!t && !strcmp(tmpstr, "NetStream.Play.PublishNotify")) { + if (gen_delete_stream(s, rt) < 0) + return -1; + + if (subscribe_stream(s, rt) < 0) + return -1; + } return 0; } @@ -2292,6 +2316,7 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt) int ret; #ifdef DEBUG + av_log(rt, AV_LOG_DEBUG, "Received packet:\n"); ff_rtmp_packet_dump(s, pkt); #endif