diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2012-08-07 22:02:27 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-08-07 23:35:39 +0300 |
| commit | 00cb52c65cb2913f20dd3d0e6601d1b0db0b657b (patch) | |
| tree | d3f2f41d3bb2cfb99cdb33fbaec568e824c26269 | |
| parent | f9e77c1762c6904828550326dbbb2b36905eca1a (diff) | |
| download | ffmpeg-00cb52c65cb2913f20dd3d0e6601d1b0db0b657b.tar.gz | |
rtmp: Add a new option 'rtmp_subscribe'
This option specifies the name of live stream to subscribe.
Defaults to rtmp_playpath.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | doc/protocols.texi | 5 | ||||
| -rw-r--r-- | libavformat/rtmpproto.c | 21 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 21 insertions, 7 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index ff872fcdca..bf67d89ad3 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -237,6 +237,11 @@ value will be sent. Stream identifier to play or to publish. This option overrides the parameter specified in the URI. +@item rtmp_subscribe +Name of live stream to subscribe to. By default no value will be sent. +It is only sent if the option is specified or if rtmp_live +is set to live. + @item rtmp_swfurl URL of the SWF player for the media. By default no value will be sent. diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index d21ffead7f..19b6874791 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -91,6 +91,7 @@ typedef struct RTMPContext { char* flashver; ///< version of the flash plugin char* swfurl; ///< url of the swf player char* pageurl; ///< url of the web page + char* subscribe; ///< name of live stream to subscribe int server_bw; ///< server bandwidth int client_buffer_time; ///< client buffer time in ms int flush_interval; ///< number of packets flushed in the same request (RTMPT only) @@ -604,21 +605,22 @@ static int gen_bytes_read(URLContext *s, RTMPContext *rt, uint32_t ts) return ret; } -static int gen_fcsubscribe_stream(URLContext *s, RTMPContext *rt) +static int gen_fcsubscribe_stream(URLContext *s, RTMPContext *rt, + const char *subscribe) { RTMPPacket pkt; uint8_t *p; int ret; if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, - 0, 27 + strlen(rt->playpath))) < 0) + 0, 27 + strlen(subscribe))) < 0) return ret; p = pkt.data; ff_amf_write_string(&p, "FCSubscribe"); ff_amf_write_number(&p, ++rt->nb_invokes); ff_amf_write_null(&p); - ff_amf_write_string(&p, rt->playpath); + ff_amf_write_string(&p, subscribe); ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); @@ -1036,9 +1038,15 @@ static int handle_invoke(URLContext *s, RTMPPacket *pkt) return ret; if (rt->is_input) { - /* Send the FCSubscribe command if live stream. */ - if (rt->live == -1) { - if ((ret = gen_fcsubscribe_stream(s, rt)) < 0) + /* 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) + return ret; + } else if (rt->live == -1) { + if ((ret = gen_fcsubscribe_stream(s, rt, + rt->playpath)) < 0) return ret; } } @@ -1624,6 +1632,7 @@ static const AVOption rtmp_options[] = { {"recorded", "recorded stream", 0, AV_OPT_TYPE_CONST, {0}, 0, 0, DEC, "rtmp_live"}, {"rtmp_pageurl", "URL of the web page in which the media was embedded. By default no value will be sent.", OFFSET(pageurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, {"rtmp_playpath", "Stream identifier to play or to publish", OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_subscribe", "Name of live stream to subscribe to. Defaults to rtmp_playpath.", OFFSET(subscribe), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, {"rtmp_swfurl", "URL of the SWF player. By default no value will be sent", OFFSET(swfurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, {"rtmp_tcurl", "URL of the target stream. Defaults to proto://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, { NULL }, diff --git a/libavformat/version.h b/libavformat/version.h index 6a11bf9df7..55026e809c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 13 -#define LIBAVFORMAT_VERSION_MICRO 0 +#define LIBAVFORMAT_VERSION_MICRO 1 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |