external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #464, support origin cluster api

Browse source
This commit is contained in:
winlin 2018-02-15 20:55:34 +08:00
parent d0fbf44d18
commit 469250f850
9 changed files with 185 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/protocol/srs_protocol_json.cpp
View file

@ -1818,11 +1818,11 @@ SrsAmf0Any* SrsJsonObject::to_amf0()
return obj;
}
void SrsJsonObject::set(string key, SrsJsonAny* value)
SrsJsonObject* SrsJsonObject::set(string key, SrsJsonAny* value)
{
if (!value) {
srs_warn("add a NULL propertity %s", key.c_str());
return;
return this;
}
std::vector<SrsJsonObjectPropertyType>::iterator it;
@ -1840,6 +1840,7 @@ void SrsJsonObject::set(string key, SrsJsonAny* value)
}
properties.push_back(std::make_pair(key, value));
return this;
}
SrsJsonAny* SrsJsonObject::get_property(string name)
@ -1980,9 +1981,10 @@ void SrsJsonArray::add(SrsJsonAny* value)
properties.push_back(value);
}
void SrsJsonArray::append(SrsJsonAny* value)
SrsJsonArray* SrsJsonArray::append(SrsJsonAny* value)
{
add(value);
return this;
}
string SrsJsonArray::dumps()

4
trunk/src/protocol/srs_protocol_json.hpp
View file

@ -145,7 +145,7 @@ public:
virtual std::string dumps();
virtual SrsAmf0Any* to_amf0();
public:
virtual void set(std::string key, SrsJsonAny* value);
virtual SrsJsonObject* set(std::string key, SrsJsonAny* value);
virtual SrsJsonAny* get_property(std::string name);
virtual SrsJsonAny* ensure_property_string(std::string name);
virtual SrsJsonAny* ensure_property_integer(std::string name);
@ -172,7 +172,7 @@ public:
virtual SrsJsonAny* at(int index);
virtual void add(SrsJsonAny* value);
// alias to add.
virtual void append(SrsJsonAny* value);
virtual SrsJsonArray* append(SrsJsonAny* value);
public:
virtual std::string dumps();
virtual SrsAmf0Any* to_amf0();