Module: libav Branch: master Commit: b2e495afa8e23b46536e25e892157104437f4020
Author: Samuel Pitoiset <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Sat May 5 19:33:26 2012 +0200 rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream. Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/rtmpproto.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 9cdb639..9c82b46 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -66,6 +66,7 @@ typedef struct RTMPContext { int chunk_size; ///< size of the chunks RTMP packets are divided into int is_input; ///< input/output flag char *playpath; ///< stream identifier to play (with possible "mp4:" prefix) + int live; ///< 0: recorded, -1: live, -2: both char *app; ///< name of application ClientState state; ///< current state int main_channel_id; ///< an additional channel ID which is used for some invocations @@ -287,7 +288,7 @@ static void gen_play(URLContext *s, RTMPContext *rt) av_log(s, AV_LOG_DEBUG, "Sending play command for '%s'\n", rt->playpath); ff_rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0, - 20 + strlen(rt->playpath)); + 29 + strlen(rt->playpath)); pkt.extra = rt->main_channel_id; p = pkt.data; @@ -295,6 +296,7 @@ static void gen_play(URLContext *s, RTMPContext *rt) ff_amf_write_number(&p, ++rt->nb_invokes); ff_amf_write_null(&p); ff_amf_write_string(&p, rt->playpath); + ff_amf_write_number(&p, rt->live); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_destroy(&pkt); @@ -1050,6 +1052,10 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size) static const AVOption rtmp_options[] = { {"rtmp_app", "Name of application to connect to on the RTMP server", OFFSET(app), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_live", "Specify that the media is a live stream.", OFFSET(live), AV_OPT_TYPE_INT, {-2}, INT_MIN, INT_MAX, DEC, "rtmp_live"}, + {"any", "both", 0, AV_OPT_TYPE_CONST, {-2}, 0, 0, DEC, "rtmp_live"}, + {"live", "live stream", 0, AV_OPT_TYPE_CONST, {-1}, 0, 0, DEC, "rtmp_live"}, + {"recorded", "recorded stream", 0, AV_OPT_TYPE_CONST, {0}, 0, 0, DEC, "rtmp_live"}, {"rtmp_playpath", "Stream identifier to play or to publish", OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, { NULL }, }; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
