external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'srs.master'

Browse source
This commit is contained in:
winlin 2014-11-07 22:16:21 +08:00
commit 9b7f28f87b
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
trunk/src/libs/srs_librtmp.cpp
View file

@ -735,7 +735,7 @@ srs_amf0_t srs_amf0_parse(char* data, int size, int* nparsed)
return amf0; return amf0;
} }
srs_amf0_t srs_amf0_create_number(amf0_number value) srs_amf0_t srs_amf0_create_number(srs_amf0_number value)
{ {
return SrsAmf0Any::number(value); return SrsAmf0Any::number(value);
} }
@ -790,43 +790,43 @@ int srs_amf0_serialize(srs_amf0_t amf0, char* data, int size)
return ret; return ret;
} }
amf0_bool srs_amf0_is_string(srs_amf0_t amf0) srs_amf0_bool srs_amf0_is_string(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->is_string(); return any->is_string();
} }
amf0_bool srs_amf0_is_boolean(srs_amf0_t amf0) srs_amf0_bool srs_amf0_is_boolean(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->is_boolean(); return any->is_boolean();
} }
amf0_bool srs_amf0_is_number(srs_amf0_t amf0) srs_amf0_bool srs_amf0_is_number(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->is_number(); return any->is_number();
} }
amf0_bool srs_amf0_is_null(srs_amf0_t amf0) srs_amf0_bool srs_amf0_is_null(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->is_null(); return any->is_null();
} }
amf0_bool srs_amf0_is_object(srs_amf0_t amf0) srs_amf0_bool srs_amf0_is_object(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->is_object(); return any->is_object();
} }
amf0_bool srs_amf0_is_ecma_array(srs_amf0_t amf0) srs_amf0_bool srs_amf0_is_ecma_array(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->is_ecma_array(); return any->is_ecma_array();
} }
amf0_bool srs_amf0_is_strict_array(srs_amf0_t amf0) srs_amf0_bool srs_amf0_is_strict_array(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->is_strict_array(); return any->is_strict_array();
@ -838,19 +838,19 @@ const char* srs_amf0_to_string(srs_amf0_t amf0)
return any->to_str_raw(); return any->to_str_raw();
} }
amf0_bool srs_amf0_to_boolean(srs_amf0_t amf0) srs_amf0_bool srs_amf0_to_boolean(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->to_boolean(); return any->to_boolean();
} }
amf0_number srs_amf0_to_number(srs_amf0_t amf0) srs_amf0_number srs_amf0_to_number(srs_amf0_t amf0)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
return any->to_number(); return any->to_number();
} }
void srs_amf0_set_number(srs_amf0_t amf0, amf0_number value) void srs_amf0_set_number(srs_amf0_t amf0, srs_amf0_number value)
{ {
SrsAmf0Any* any = (SrsAmf0Any*)amf0; SrsAmf0Any* any = (SrsAmf0Any*)amf0;
any->set_number(value); any->set_number(value);

26
trunk/src/libs/srs_librtmp.hpp
View file

@ -269,10 +269,10 @@ extern flv_bool srs_flv_is_keyframe(char* data, int32_t size);
*************************************************************/ *************************************************************/
/* the output handler. */ /* the output handler. */
typedef void* srs_amf0_t; typedef void* srs_amf0_t;
typedef int amf0_bool; typedef int srs_amf0_bool;
typedef double amf0_number; typedef double srs_amf0_number;
extern srs_amf0_t srs_amf0_parse(char* data, int size, int* nparsed); extern srs_amf0_t srs_amf0_parse(char* data, int size, int* nparsed);
extern srs_amf0_t srs_amf0_create_number(amf0_number value); extern srs_amf0_t srs_amf0_create_number(srs_amf0_number value);
extern srs_amf0_t srs_amf0_create_ecma_array(); extern srs_amf0_t srs_amf0_create_ecma_array();
extern srs_amf0_t srs_amf0_create_strict_array(); extern srs_amf0_t srs_amf0_create_strict_array();
extern srs_amf0_t srs_amf0_create_object(); extern srs_amf0_t srs_amf0_create_object();
@ -282,19 +282,19 @@ extern void srs_amf0_free_bytes(char* data);
extern int srs_amf0_size(srs_amf0_t amf0); extern int srs_amf0_size(srs_amf0_t amf0);
extern int srs_amf0_serialize(srs_amf0_t amf0, char* data, int size); extern int srs_amf0_serialize(srs_amf0_t amf0, char* data, int size);
/* type detecter */ /* type detecter */
extern amf0_bool srs_amf0_is_string(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_is_string(srs_amf0_t amf0);
extern amf0_bool srs_amf0_is_boolean(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_is_boolean(srs_amf0_t amf0);
extern amf0_bool srs_amf0_is_number(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_is_number(srs_amf0_t amf0);
extern amf0_bool srs_amf0_is_null(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_is_null(srs_amf0_t amf0);
extern amf0_bool srs_amf0_is_object(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_is_object(srs_amf0_t amf0);
extern amf0_bool srs_amf0_is_ecma_array(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_is_ecma_array(srs_amf0_t amf0);
extern amf0_bool srs_amf0_is_strict_array(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_is_strict_array(srs_amf0_t amf0);
/* value converter */ /* value converter */
extern const char* srs_amf0_to_string(srs_amf0_t amf0); extern const char* srs_amf0_to_string(srs_amf0_t amf0);
extern amf0_bool srs_amf0_to_boolean(srs_amf0_t amf0); extern srs_amf0_bool srs_amf0_to_boolean(srs_amf0_t amf0);
extern amf0_number srs_amf0_to_number(srs_amf0_t amf0); extern srs_amf0_number srs_amf0_to_number(srs_amf0_t amf0);
/* value setter */ /* value setter */
extern void srs_amf0_set_number(srs_amf0_t amf0, amf0_number value); extern void srs_amf0_set_number(srs_amf0_t amf0, srs_amf0_number value);
/* object value converter */ /* object value converter */
extern int srs_amf0_object_property_count(srs_amf0_t amf0); extern int srs_amf0_object_property_count(srs_amf0_t amf0);
extern const char* srs_amf0_object_property_name_at(srs_amf0_t amf0, int index); extern const char* srs_amf0_object_property_name_at(srs_amf0_t amf0, int index);