diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-11 23:55:27 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-11 23:55:32 +0400 |
commit | 94d5650266f3bd5a43088f4419a1d60f89d6249c (patch) | |
tree | 5c37c2ef86355dbb423fb7c3ba80bc13a5fe9064 /libavformat | |
parent | 65efc66d8ea9aee562d26e2522ad94229649897a (diff) | |
parent | f862537de8ba7920e0f25318c03f8982a3c6294c (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Do not send extension for flv files
rtmp: support connection parameters
doc: Add documentation for the newly added rtmp_* options
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/rtmpproto.c | 85 |
1 files changed, 83 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index a9e39a50bb..9469ed3c8e 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -70,6 +70,7 @@ typedef struct RTMPContext { char *playpath; ///< stream identifier to play (with possible "mp4:" prefix) int live; ///< 0: recorded, -1: live, -2: both char *app; ///< name of application + char *conn; ///< append arbitrary AMF data to the Connect message ClientState state; ///< current state int main_channel_id; ///< an additional channel ID which is used for some invocations uint8_t* flv_data; ///< buffer with data for demuxer @@ -112,6 +113,65 @@ static const uint8_t rtmp_server_key[] = { 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE }; +static int rtmp_write_amf_data(URLContext *s, char *param, uint8_t **p) +{ + char *field, *value, *saveptr; + char type; + + /* The type must be B for Boolean, N for number, S for string, O for + * object, or Z for null. For Booleans the data must be either 0 or 1 for + * FALSE or TRUE, respectively. Likewise for Objects the data must be + * 0 or 1 to end or begin an object, respectively. Data items in subobjects + * may be named, by prefixing the type with 'N' and specifying the name + * before the value (ie. NB:myFlag:1). This option may be used multiple times + * to construct arbitrary AMF sequences. */ + if (param[0] && param[1] == ':') { + type = param[0]; + value = param + 2; + } else if (param[0] == 'N' && param[1] && param[2] == ':') { + type = param[1]; + field = strtok_r(param + 3, ":", &saveptr); + value = strtok_r(NULL, ":", &saveptr); + + if (!field || !value) + goto fail; + + ff_amf_write_field_name(p, field); + } else { + goto fail; + } + + switch (type) { + case 'B': + ff_amf_write_bool(p, value[0] != '0'); + break; + case 'S': + ff_amf_write_string(p, value); + break; + case 'N': + ff_amf_write_number(p, strtod(value, NULL)); + break; + case 'Z': + ff_amf_write_null(p); + break; + case 'O': + if (value[0] != '0') + ff_amf_write_object_start(p); + else + ff_amf_write_object_end(p); + break; + default: + goto fail; + break; + } + + return 0; + +fail: + av_log(s, AV_LOG_ERROR, "Invalid AMF parameter: %s\n", param); + return AVERROR(EINVAL); +} + /** * Generate 'connect' call and send it to the server. */ @@ -165,6 +225,22 @@ static int gen_connect(URLContext *s, RTMPContext *rt) } ff_amf_write_object_end(&p); + if (rt->conn) { + char *param, *saveptr; + + // Write arbitrary AMF data to the Connect message. + param = strtok_r(rt->conn, " ", &saveptr); + while (param != NULL) { + if ((ret = rtmp_write_amf_data(s, param, &p)) < 0) { + // Invalid AMF parameter. + ff_rtmp_packet_destroy(&pkt); + return ret; + } + + param = strtok_r(NULL, " ", &saveptr); + } + } + pkt.data_size = p - pkt.data; ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, @@ -1057,6 +1133,8 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } if (!rt->playpath) { + int len = strlen(fname); + rt->playpath = av_malloc(PLAYPATH_MAX_LENGTH); if (!rt->playpath) { ret = AVERROR(ENOMEM); @@ -1064,9 +1142,11 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } if (!strchr(fname, ':') && - (!strcmp(fname + strlen(fname) - 4, ".f4v") || - !strcmp(fname + strlen(fname) - 4, ".mp4"))) { + (!strcmp(fname + len - 4, ".f4v") || + !strcmp(fname + len - 4, ".mp4"))) { memcpy(rt->playpath, "mp4:", 5); + } else if (!strcmp(fname + len - 4, ".flv")) { + fname[len - 4] = '\0'; } else { rt->playpath[0] = 0; } @@ -1248,6 +1328,7 @@ 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_conn", "Append arbitrary AMF data to the Connect message", OFFSET(conn), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, {"rtmp_flashver", "Version of the Flash plugin used to run the SWF player.", OFFSET(flashver), 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"}, |