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

utest for amf0 object, refine the count of elem

Browse source
This commit is contained in:
winlin 2014-03-08 22:51:13 +08:00
parent 8ed9ae6242
commit 59db1dd260
4 changed files with 123 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

78
trunk/src/rtmp/srs_protocol_amf0.cpp
View file

@ -594,6 +594,23 @@ SrsAmf0Object::~SrsAmf0Object()
srs_freep(eof);
}
int SrsAmf0Object::size()
{
int size = 1;
for (int i = 0; i < properties->size(); i++){
std::string name = key_at(i);
SrsAmf0Any* value = value_at(i);
size += SrsAmf0Size::utf8(name);
size += SrsAmf0Size::any(value);
}
size += SrsAmf0Size::object_eof();
return size;
}
int SrsAmf0Object::read(SrsStream* stream)
{
int ret = ERROR_SUCCESS;
@ -691,21 +708,9 @@ int SrsAmf0Object::write(SrsStream* stream)
return ret;
}
int SrsAmf0Object::size()
int SrsAmf0Object::count()
{
int size = 1;
for (int i = 0; i < properties->size(); i++){
std::string name = key_at(i);
SrsAmf0Any* value = value_at(i);
size += SrsAmf0Size::utf8(name);
size += SrsAmf0Size::any(value);
}
size += SrsAmf0Size::object_eof();
return size;
return properties->size();
}
std::string SrsAmf0Object::key_at(int index)
@ -751,6 +756,23 @@ SrsAmf0EcmaArray::~SrsAmf0EcmaArray()
srs_freep(eof);
}
int SrsAmf0EcmaArray::size()
{
int size = 1 + 4;
for (int i = 0; i < properties->size(); i++){
std::string name = key_at(i);
SrsAmf0Any* value = value_at(i);
size += SrsAmf0Size::utf8(name);
size += SrsAmf0Size::any(value);
}
size += SrsAmf0Size::object_eof();
return size;
}
int SrsAmf0EcmaArray::read(SrsStream* stream)
{
int ret = ERROR_SUCCESS;
@ -782,7 +804,7 @@ int SrsAmf0EcmaArray::read(SrsStream* stream)
srs_verbose("amf0 read ecma_array count success. count=%d", count);
// value
this->count = count;
this->_count = count;
while (!stream->empty()) {
// detect whether is eof.
@ -837,8 +859,8 @@ int SrsAmf0EcmaArray::write(SrsStream* stream)
return ret;
}
stream->write_4bytes(this->count);
srs_verbose("amf0 write ecma_array count success. count=%d", value->count);
stream->write_4bytes(this->_count);
srs_verbose("amf0 write ecma_array count success. count=%d", _count);
// value
for (int i = 0; i < properties->size(); i++) {
@ -868,28 +890,16 @@ int SrsAmf0EcmaArray::write(SrsStream* stream)
return ret;
}
int SrsAmf0EcmaArray::size()
{
int size = 1 + 4;
for (int i = 0; i < properties->size(); i++){
std::string name = key_at(i);
SrsAmf0Any* value = value_at(i);
size += SrsAmf0Size::utf8(name);
size += SrsAmf0Size::any(value);
}
size += SrsAmf0Size::object_eof();
return size;
}
void SrsAmf0EcmaArray::clear()
{
properties->clear();
}
int SrsAmf0EcmaArray::count()
{
return properties->size();
}
std::string SrsAmf0EcmaArray::key_at(int index)
{
return properties->key_at(index);