libavformat.hg: rtmpproto.c comparison

comparison rtmpproto.c @ 5417:9d7de5529047 libavformat

cosmetics: reindent after last commit

author	kostya
date	Fri, 04 Dec 2009 16:52:42 +0000
parents	e01b6917b3cf
children	006c95a7a3d2

comparison

equal deleted inserted replaced

-:e01b6917b3cf
+:9d7de5529047
 ff_amf_write_object_start(&p);
 ff_amf_write_field_name(&p, "app");
 ff_amf_write_string(&p, rt->app);
 if (rt->is_input) {
 snprintf(ver, sizeof(ver), "%s %d,%d,%d,%d", RTMP_CLIENT_PLATFORM, RTMP_CLIENT_VER1,
 RTMP_CLIENT_VER2, RTMP_CLIENT_VER3, RTMP_CLIENT_VER4);
 } else {
 snprintf(ver, sizeof(ver), "FMLE/3.0 (compatible; %s)", LIBAVFORMAT_IDENT);
 ff_amf_write_field_name(&p, "type");
 ff_amf_write_string(&p, "nonprivate");
 }
 ff_amf_write_field_name(&p, "flashVer");
 ff_amf_write_string(&p, ver);
 ff_amf_write_field_name(&p, "tcUrl");
 ff_amf_write_string(&p, tcurl);
 if (rt->is_input) {
 ff_amf_write_field_name(&p, "fpad");
 ff_amf_write_bool(&p, 0);
 ff_amf_write_field_name(&p, "capabilities");
 ff_amf_write_number(&p, 15.0);
 ff_amf_write_field_name(&p, "audioCodecs");
 ff_amf_write_number(&p, 1639.0);
 ff_amf_write_field_name(&p, "videoCodecs");
 ff_amf_write_number(&p, 252.0);
 ff_amf_write_field_name(&p, "videoFunction");
 ff_amf_write_number(&p, 1.0);
 }
 ff_amf_write_object_end(&p);
 pkt.data_size = p - pkt.data;
 av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Server version %d.%d.%d.%d\n",
 serverdata[5], serverdata[6], serverdata[7], serverdata[8]);
 if (rt->is_input) {
 server_pos = rtmp_validate_digest(serverdata + 1, 772);
-if (!server_pos) {
-server_pos = rtmp_validate_digest(serverdata + 1, 8);
 if (!server_pos) {
-av_log(LOG_CONTEXT, AV_LOG_ERROR, "Server response validating failed\n");
+server_pos = rtmp_validate_digest(serverdata + 1, 8);
+if (!server_pos) {
+av_log(LOG_CONTEXT, AV_LOG_ERROR, "Server response validating failed\n");
+return -1;
+}
+}
+rtmp_calc_digest(tosend + 1 + client_pos, 32, 0,
+rtmp_server_key, sizeof(rtmp_server_key),
+digest);
+rtmp_calc_digest(clientdata, RTMP_HANDSHAKE_PACKET_SIZE-32, 0,
+digest, 32,
+digest);
+if (memcmp(digest, clientdata + RTMP_HANDSHAKE_PACKET_SIZE - 32, 32)) {
+av_log(LOG_CONTEXT, AV_LOG_ERROR, "Signature mismatch\n");
 return -1;
 }
-}
+for (i = 0; i < RTMP_HANDSHAKE_PACKET_SIZE; i++)
-rtmp_calc_digest(tosend + 1 + client_pos, 32, 0,
+tosend[i] = av_lfg_get(&rnd) >> 24;
-rtmp_server_key, sizeof(rtmp_server_key),
+rtmp_calc_digest(serverdata + 1 + server_pos, 32, 0,
-digest);
+rtmp_player_key, sizeof(rtmp_player_key),
-rtmp_calc_digest(clientdata, RTMP_HANDSHAKE_PACKET_SIZE-32, 0,
+digest);
-digest, 32,
+rtmp_calc_digest(tosend,  RTMP_HANDSHAKE_PACKET_SIZE - 32, 0,
-digest);
+digest, 32,
-if (memcmp(digest, clientdata + RTMP_HANDSHAKE_PACKET_SIZE - 32, 32)) {
+tosend + RTMP_HANDSHAKE_PACKET_SIZE - 32);
-av_log(LOG_CONTEXT, AV_LOG_ERROR, "Signature mismatch\n");
-return -1;
+// write reply back to the server
-}
+url_write(rt->stream, tosend, RTMP_HANDSHAKE_PACKET_SIZE);
-for (i = 0; i < RTMP_HANDSHAKE_PACKET_SIZE; i++)
-tosend[i] = av_lfg_get(&rnd) >> 24;
-rtmp_calc_digest(serverdata + 1 + server_pos, 32, 0,
-rtmp_player_key, sizeof(rtmp_player_key),
-digest);
-rtmp_calc_digest(tosend,  RTMP_HANDSHAKE_PACKET_SIZE - 32, 0,
-digest, 32,
-tosend + RTMP_HANDSHAKE_PACKET_SIZE - 32);
-// write reply back to the server
-url_write(rt->stream, tosend, RTMP_HANDSHAKE_PACKET_SIZE);
 } else {
 url_write(rt->stream, serverdata+1, RTMP_HANDSHAKE_PACKET_SIZE);
 }
 return 0;
 av_log(LOG_CONTEXT, AV_LOG_WARNING, "Unexpected reply on connect()\n");
 } else {
 rt->main_channel_id = (int) av_int2dbl(AV_RB64(pkt->data + 21));
 }
 if (rt->is_input) {
 gen_play(s, rt);
 } else {
 gen_publish(s, rt);
 }
 rt->state = STATE_READY;
 break;
 if (url_open(&rt->stream, buf, URL_RDWR) < 0) {
 av_log(LOG_CONTEXT, AV_LOG_ERROR, "Cannot open connection %s\n", buf);
 goto fail;
 }
 rt->state = STATE_START;
 if (rtmp_handshake(s, rt))
 return -1;
 rt->chunk_size = 128;
 rt->state = STATE_HANDSHAKED;
 //extract "app" part from path
 if (!strncmp(path, "/ondemand/", 10)) {
 fname = path + 10;
 memcpy(rt->app, "ondemand", 9);
+} else {
+char *p = strchr(path + 1, '/');
+if (!p) {
+fname = path + 1;
+rt->app[0] = '\0';
 } else {
-char *p = strchr(path + 1, '/');
+char *c = strchr(p + 1, ':');
-if (!p) {
+fname = strchr(p + 1, '/');
-fname = path + 1;
+if (!fname || c < fname) {
-rt->app[0] = '\0';
+fname = p + 1;
+av_strlcpy(rt->app, path + 1, p - path);
 } else {
-char *c = strchr(p + 1, ':');
+fname++;
-fname = strchr(p + 1, '/');
+av_strlcpy(rt->app, path + 1, fname - path - 1);
-if (!fname || c < fname) {
-fname = p + 1;
-av_strlcpy(rt->app, path + 1, p - path);
-} else {
-fname++;
-av_strlcpy(rt->app, path + 1, fname - path - 1);
-}
 }
 }
-if (!strchr(fname, ':') &&
+}
-(!strcmp(fname + strlen(fname) - 4, ".f4v") ||
+if (!strchr(fname, ':') &&
-!strcmp(fname + strlen(fname) - 4, ".mp4"))) {
+(!strcmp(fname + strlen(fname) - 4, ".f4v") ||
-memcpy(rt->playpath, "mp4:", 5);
+!strcmp(fname + strlen(fname) - 4, ".mp4"))) {
-} else {
+memcpy(rt->playpath, "mp4:", 5);
-rt->playpath[0] = 0;
+} else {
-}
+rt->playpath[0] = 0;
-strncat(rt->playpath, fname, sizeof(rt->playpath) - 5);
+}
+strncat(rt->playpath, fname, sizeof(rt->playpath) - 5);
-av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Proto = %s, path = %s, app = %s, fname = %s\n",
-proto, path, rt->app, rt->playpath);
+av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Proto = %s, path = %s, app = %s, fname = %s\n",
-gen_connect(s, rt, proto, hostname, port);
+proto, path, rt->app, rt->playpath);
+gen_connect(s, rt, proto, hostname, port);
-do {
-ret = get_packet(s, 1);
+do {
-} while (ret == EAGAIN);
+ret = get_packet(s, 1);
-if (ret < 0)
+} while (ret == EAGAIN);
-goto fail;
+if (ret < 0)
+goto fail;
 if (rt->is_input) {
 // generate FLV header for demuxer
 rt->flv_size = 13;
 rt->flv_data = av_realloc(rt->flv_data, rt->flv_size);

Mercurial > libavformat.hg

comparison rtmpproto.c @ 5417:9d7de5529047 libavformat