Changeset 29884 for lang/c/librtmp

Timestamp:

02/11/09 02:19:25 (4 years ago)

Author:

itkz

Message:

implement some RTMP packets for connect

Location:

lang/c/librtmp

Files:

• amf_packet.c (modified) (7 diffs)
• amf_packet.h (modified) (1 diff)
• main.c (modified) (7 diffs)
• rtmp.c (modified) (7 diffs)
• rtmp.h (modified) (1 diff)
• rtmp_packet.c (modified) (9 diffs)
• rtmp_packet.h (modified) (1 diff)

lang/c/librtmp/amf_packet.c

@@ -566 +566 @@
     output_buffer[0] = AMF_DATATYPE_NUMBER;
     write_be64double(output_buffer + 1, amf->number.value);
+#ifdef DEBUG
+    printf("AMF serialize number: %f: ", amf->number.value);
+    {
+        int i;
+        for (i = 0; i < 9; ++i) {
+            printf("%02x, ", output_buffer[i]);
+        }
+    }
+    printf("\n");
+#endif
 
     return 9;
@@ -580 +590 @@
     output_buffer[0] = AMF_DATATYPE_BOOLEAN;
     memmove(output_buffer + 1, &amf->boolean.value, 1);
+#ifdef DEBUG
+    printf("AMF serialize boolean: %d\n", amf->boolean.value);
+#endif
 
     return 2;
@@ -598 +611 @@
     write_be16int(output_buffer + 1, length);
     memmove(output_buffer + 3 , amf->string.value, length);
+#ifdef DEBUG
+    printf("AMF serialize string: %d: '%s': ", length, amf->string.value);
+    {
+        int i;
+        for (i = 0; i < 3 + length; ++i) {
+            printf("%02x, ", output_buffer[i]);
+        }
+    }
+    printf("\n");
+#endif
 
     return 3 + length;
@@ -615 +638 @@
     }
 
+#ifdef DEBUG
+    printf("AMF serialize object start\n");
+#endif
     output_buffer[0] = AMF_DATATYPE_OBJECT;
     outputed_size = 1;
@@ -627 +653 @@
             output_buffer + outputed_size + 2,
             property->key, key_length);
+#ifdef DEBUG
+    printf("key serialize: %d: '%s': ", key_length, property->key);
+    {
+        int i;
+        for (i = 0; i < 2 + key_length; ++i) {
+            printf("%02x, ", output_buffer[outputed_size + i]);
+        }
+    }
+    printf("\n");
+#endif
         outputed_size += 2 + key_length;
         serialized_value_size = amf_packet_serialize(
@@ -645 +681 @@
     output_buffer[outputed_size] = 0x09;
     outputed_size += 1;
+#ifdef DEBUG
+    printf("AMF serialize object end\n");
+#endif
 
     return outputed_size;
@@ -671 +710 @@
 
     output_buffer[0] = AMF_DATATYPE_UNDEFINED;
+#ifdef DEBUG
+    printf("AMF serialize undefined\n");
+#endif
 
     return 1;

lang/c/librtmp/amf_packet.h

@@ -127 +127 @@
 extern amf_packet_t *amf_packet_create_boolean(int boolean);
 extern amf_packet_t *amf_packet_create_string(char *string);
+extern amf_packet_t *amf_packet_create_undefined(void);
 extern amf_packet_t *amf_packet_create_object(void);
 extern rtmp_result_t amf_packet_add_property_to_object(

lang/c/librtmp/main.c

@@ -19 +19 @@
 
 {
+/*
     rtmp_packet_t *rtmp_packet;
     amf_packet_t *amf;
@@ -62 +63 @@
         0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x09};
+*/
 /*
         0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x14,
@@ -92 +94 @@
         0x00, 0x00, 0x00, 0x00, 0x09};
 */
+/*
     printf("sample RTMP data size: %d\n", sizeof(rtmp_packet_temp));
     for (i = 0; i < sizeof(rtmp_packet_temp); ++i) {
@@ -106 +109 @@
     printf("analyzed size: %d\n", outputed_size);
     rtmp_packet_serialize(
-        rtmp_packet, output_buffer, 1024, 4096, &outputed_size);
+        rtmp_packet, output_buffer, 1024, AMF_CHANK_SIZE, &outputed_size);
     printf("serialized size: %d\n", outputed_size);
     for (i = 0; i < outputed_size; ++i) {
@@ -116 +119 @@
         rtmp_packet,
         output_buffer, outputed_size,
-        4096,
+        AMF_CHANK_SIZE,
         &outputed_size);
     printf("analyzed size: %d\n", outputed_size);
     rtmp_packet_serialize(
-        rtmp_packet, output_buffer, 1024, 4096, &outputed_size);
+        rtmp_packet, output_buffer, 1024, AMF_CHANK_SIZE, &outputed_size);
     printf("serialized size: %d\n", outputed_size);
     for (i = 0; i < outputed_size; ++i) {
@@ -214 +217 @@
     printf("\n%d\n", outputed_size);
     amf_packet_free(amf);
+*/
 }
-    return 0;
+//    return 0;
 
     rc = rtmp_client_create("192.168.157.128", 1935);
@@ -225 +229 @@
     printf("created.\n");
 
-    count = 20000;
+    count = 200000;
     while (count--) {
         rtmp_client_process_message(rc);

lang/c/librtmp/rtmp.c

@@ -57 +57 @@
 #include "rtmp.h"
 #include "rtmp_packet.h"
+#include "amf_packet.h"
 #include "handshake.h"
 
@@ -196 +197 @@
 static void rtmp_client_handshake_first(rtmp_client_t *client);
 static void rtmp_client_handshake_second(rtmp_client_t *client);
-static void rtmp_client_get_server_bandwidth(rtmp_client_t *client);
-static void rtmp_client_get_client_bandwidth(rtmp_client_t *client);
-static void rtmp_client_test(rtmp_client_t *client);
+static void rtmp_client_get_packet(rtmp_client_t *client);
+static void rtmp_client_proces_packet(
+    rtmp_client_t *client, rtmp_packet_t *packet);
 
 static int rtmp_client_set_will_send_buffer(
@@ -204 +205 @@
 static void rtmp_client_delete_received_buffer(
     rtmp_client_t *client, int size);
+static rtmp_result_t rtmp_client_send_packet(
+    rtmp_client_t *client, rtmp_packet_t *packet);
 
 
@@ -292 +295 @@
             (void*)(client->received_buffer + client->received_size),
             RTMP_BUFFER_SIZE - client->received_size, 0);
+#ifdef DEBUG
 if (received_size > 0) {
-    printf("::%d:%x\n", received_size, client->received_buffer[client->received_size + 1]);
-}
+    printf("received: %d\n", received_size);
+}
+#endif
         client->received_size += received_size;
     }
@@ -311 +316 @@
                 (const void*)client->will_send_buffer,
                 client->will_send_size, 0);
+#ifdef DEBUG
+if (sent_size > 0) {
+    printf("sent: %d\n", sent_size);
+}
+#endif
             if (client->will_send_size - sent_size > 0) {
                 memmove(
@@ -372 +382 @@
             client, 1 + sizeof(HandshakePacket) * 2);
 printf("handshake 2\n");
-        client->process_message = rtmp_client_get_server_bandwidth;
         client->data = rtmp_packet_create();
-    }
-}
-
-static void rtmp_client_get_server_bandwidth(rtmp_client_t *client)
+        client->process_message = rtmp_client_get_packet;
+        rtmp_client_connect(client);
+    }
+}
+
+static void rtmp_client_get_packet(rtmp_client_t *client)
 {
     rtmp_result_t ret;
@@ -391 +402 @@
     if (ret != RTMP_ERROR_UNKNOWN) printf("aofieoiea: %d\n", ret);
     if (ret == RTMP_SUCCESS) {
+    printf("kuso\n");
         rtmp_client_delete_received_buffer(client, packet_size);
-        client->process_message = rtmp_client_get_client_bandwidth;
-    }
-}
-
-static void rtmp_client_get_client_bandwidth(rtmp_client_t *client)
-{
-    rtmp_result_t ret;
+        rtmp_client_proces_packet(client, packet);
+    }
+}
+
+
+void rtmp_client_proces_packet(
+    rtmp_client_t *client, rtmp_packet_t *packet)
+{
+    switch (packet->data_type) {
+    case RTMP_DATATYPE_CHUNK_SIZE:
+        break;
+    case RTMP_DATATYPE_BYTES_READ:
+        break;
+    case RTMP_DATATYPE_PING:
+        break;
+    case RTMP_DATATYPE_SERVER_BW:
+        break;
+    case RTMP_DATATYPE_CLIENT_BW:
+        break;
+    case RTMP_DATATYPE_AUDIO_DATA:
+        break;
+    case RTMP_DATATYPE_VIDEO_DATA:
+        break;
+    case RTMP_DATATYPE_MESSAGE:
+        break;
+    case RTMP_DATATYPE_NOTIFY:
+        break;
+    case RTMP_DATATYPE_SHARED_OBJECT:
+        break;
+    case RTMP_DATATYPE_INVOKE:
+        break;
+    default:
+        break;
+    }
+}
+
+
+rtmp_result_t rtmp_client_send_packet(
+    rtmp_client_t *client, rtmp_packet_t *packet)
+{
+    rtmp_result_t result;
     size_t packet_size;
-    rtmp_packet_t *packet;
-
-    packet = (rtmp_packet_t*)client->data;
-    ret = rtmp_packet_analyze_data(
+
+    result = rtmp_packet_serialize(
         packet,
-        client->received_buffer, client->received_size,
+        client->will_send_buffer + client->will_send_size,
+        RTMP_BUFFER_SIZE - client->will_send_size,
         client->amf_chunk_size,
         &packet_size);
-    if (ret == RTMP_SUCCESS) {
-        rtmp_client_delete_received_buffer(client, packet_size);
-        client->process_message = rtmp_client_test;
-    }
-}
-
-static void rtmp_client_test(rtmp_client_t *client)
-{
-    rtmp_result_t ret;
-    size_t packet_size;
-    rtmp_packet_t *packet;
-
-    packet = (rtmp_packet_t*)client->data;
-    ret = rtmp_packet_analyze_data(
-        packet,
-        client->received_buffer, client->received_size,
-        client->amf_chunk_size,
-        &packet_size);
-    if (ret == RTMP_SUCCESS) {
-        rtmp_client_delete_received_buffer(client, packet_size);
-    }
-}
-
+    if (result != RTMP_SUCCESS) {
+        return result;
+    }
+    client->will_send_size += packet_size;
+
+    return RTMP_SUCCESS;
+}
+
+
+void rtmp_client_connect(
+    rtmp_client_t *client
+    /* FIXME: take URL */)
+{
+    rtmp_packet_t *rtmp_packet;
+    amf_packet_t *amf_object;
+
+    rtmp_packet = (rtmp_packet_t*)client->data;
+    rtmp_packet_cleanup(rtmp_packet);
+    rtmp_packet->object_id = 3;
+
+    rtmp_packet_add_amf(
+        rtmp_packet,
+        amf_packet_create_string("connect"));
+    rtmp_packet_add_amf(
+        rtmp_packet,
+        amf_packet_create_number(1.0));
+
+    amf_object = amf_packet_create_object();
+    amf_packet_add_property_to_object(
+        amf_object, "app", amf_packet_create_string("fastpaly/"));
+    amf_packet_add_property_to_object(
+        amf_object, "flashVer", amf_packet_create_string("WIN 10,0,12,36"));
+    amf_packet_add_property_to_object(
+        amf_object, "swfUrl", amf_packet_create_undefined());
+    amf_packet_add_property_to_object(
+        amf_object, "tcUrl",
+        amf_packet_create_string("rtmp://192.168.157.128:1935/fastplay/"));
+    amf_packet_add_property_to_object(
+        amf_object, "fpad", amf_packet_create_boolean(0));
+    amf_packet_add_property_to_object(
+        amf_object, "capabilities", amf_packet_create_number(15.0));
+    amf_packet_add_property_to_object(
+        amf_object, "audioCodecs", amf_packet_create_number(3191.0));
+    amf_packet_add_property_to_object(
+        amf_object, "videoCodecs", amf_packet_create_number(252.0));
+    amf_packet_add_property_to_object(
+        amf_object, "videoFunction", amf_packet_create_number(1.0));
+    amf_packet_add_property_to_object(
+        amf_object, "pageUrl", amf_packet_create_undefined());
+    amf_packet_add_property_to_object(
+        amf_object, "objectEncoding", amf_packet_create_number(0.0));
+    rtmp_packet_add_amf(rtmp_packet, amf_object);
+
+    rtmp_client_send_packet(client, rtmp_packet);
+}
+

lang/c/librtmp/rtmp.h

@@ -123 +123 @@
 };
 
+
 extern rtmp_client_t *rtmp_client_create();
 extern void rtmp_client_free(rtmp_client_t *client);
+extern void rtmp_client_connect(
+    rtmp_client_t *client
+    /* FIXME: take URL */);
 
 extern void rtmp_client_process_message(rtmp_client_t *client);

lang/c/librtmp/rtmp_packet.c

@@ -31 +31 @@
 
 
-static void rtmp_packet_cleanup(rtmp_packet_t *packet);
 void rtmp_packet_retrieve_body(
     unsigned char *body_output_buffer,
@@ -39 +38 @@
     rtmp_packet_t *packet,
     unsigned char *amf_buffer,
-    size_t amf_with_chunk_header_size,
+    size_t amf_size,
     size_t amf_chunk_size,
     unsigned char *output_buffer);
@@ -330 +329 @@
     header_size = 12;
 
+#ifdef DEBUG
+    printf("RTMP packet serialize start\n");
+#endif
     if (header_size > output_buffer_size) {
         *packet_size = 0;
@@ -359 +361 @@
     amf_buffer = (unsigned char*)malloc(amf_size);
 
+#ifdef DEBUG
+    printf("AMF serialize start\n");
+#endif
     total_serialized_amf_size = 0;
     inner_amf = packet->inner_amf_packets;
@@ -368 +373 @@
         if (serialized_amf_size == 0) {
 #ifdef DEBUG
-            printf("AMF serialized error!\n");
+            printf("AMF serialize error!\n");
 #endif
         }
@@ -374 +379 @@
         inner_amf = inner_amf->next;
     }
+#ifdef DEBUG
+    printf("AMF serialize end\n");
+#endif
 
     total_serialized_size += rtmp_packet_insert_amf_chunk_header(
-        packet, amf_buffer, amf_with_chunk_header_size,
+        packet, amf_buffer, amf_size,
         amf_chunk_size,
         output_buffer + total_serialized_size);
@@ -383 +391 @@
 
     *packet_size = total_serialized_size;
+#ifdef DEBUG
+    printf("RTMP packet serialize end\n");
+#endif
 
     return RTMP_SUCCESS;
@@ -391 +402 @@
     rtmp_packet_t *packet,
     unsigned char *amf_buffer,
-    size_t amf_with_chunk_header_size,
+    size_t amf_size,
     size_t amf_chunk_size,
     unsigned char *output_buffer)
@@ -401 +412 @@
     total_serialized_size = 0;
     amf_buffer_count = 0;
-    while (total_serialized_size < amf_with_chunk_header_size) {
-        remaining_chunk_size = amf_with_chunk_header_size - amf_buffer_count;
+    remaining_chunk_size = amf_size - amf_buffer_count;
+    while (remaining_chunk_size > 0) {
+        remaining_chunk_size = amf_size - amf_buffer_count;
         if (remaining_chunk_size > amf_chunk_size) {
             memmove(

lang/c/librtmp/rtmp_packet.h

@@ -87 +87 @@
     rtmp_packet_t *packet,
     amf_packet_t *amf);
+extern void rtmp_packet_cleanup(rtmp_packet_t *packet);
 
 extern rtmp_result_t rtmp_packet_analyze_data(