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

support flv inject and flv http streaming with start=bytes. 0.9.122

Browse source
This commit is contained in:
winlin 2014-05-29 12:09:26 +08:00
parent d56f445076
commit 7ec202ee41
10 changed files with 241 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,6 +75,7 @@ public:
virtual int total_size();
virtual int read(SrsStream* stream);
virtual int write(SrsStream* stream);
virtual SrsAmf0Any* copy();
};
/**
@ -95,6 +96,7 @@ public:
virtual int total_size();
virtual int read(SrsStream* stream);
virtual int write(SrsStream* stream);
virtual SrsAmf0Any* copy();
};
/**
@ -114,6 +116,7 @@ public:
virtual int total_size();
virtual int read(SrsStream* stream);
virtual int write(SrsStream* stream);
virtual SrsAmf0Any* copy();
};
/**
@ -130,6 +133,7 @@ public:
virtual int total_size();
virtual int read(SrsStream* stream);
virtual int write(SrsStream* stream);
virtual SrsAmf0Any* copy();
};
/**
@ -146,6 +150,7 @@ public:
virtual int total_size();
virtual int read(SrsStream* stream);
virtual int write(SrsStream* stream);
virtual SrsAmf0Any* copy();
};
/**
@ -173,6 +178,8 @@ public:
virtual SrsAmf0Any* get_property(std::string name);
virtual SrsAmf0Any* ensure_property_string(std::string name);
virtual SrsAmf0Any* ensure_property_number(std::string name);
virtual void copy(__SrsUnSortedHashtable* src);
};
/**
@ -191,6 +198,7 @@ public:
virtual int total_size();
virtual int read(SrsStream* stream);
virtual int write(SrsStream* stream);
virtual SrsAmf0Any* copy();
};
/**
@ -310,6 +318,13 @@ SrsAmf0StrictArray* SrsAmf0Any::to_strict_array()
return p;
}
void SrsAmf0Any::set_number(double value)
{
__SrsAmf0Number* p = dynamic_cast<__SrsAmf0Number*>(this);
srs_assert(p != NULL);
p->value = value;
}
bool SrsAmf0Any::is_object_eof()
{
return marker == RTMP_AMF0_ObjectEnd;
@ -433,13 +448,7 @@ __SrsUnSortedHashtable::__SrsUnSortedHashtable()
__SrsUnSortedHashtable::~__SrsUnSortedHashtable()
{
std::vector<SrsAmf0ObjectPropertyType>::iterator it;
for (it = properties.begin(); it != properties.end(); ++it) {
SrsAmf0ObjectPropertyType& elem = *it;
SrsAmf0Any* any = elem.second;
srs_freep(any);
}
properties.clear();
clear();
}
int __SrsUnSortedHashtable::count()
@ -449,6 +458,12 @@ int __SrsUnSortedHashtable::count()
void __SrsUnSortedHashtable::clear()
{
std::vector<SrsAmf0ObjectPropertyType>::iterator it;
for (it = properties.begin(); it != properties.end(); ++it) {
SrsAmf0ObjectPropertyType& elem = *it;
SrsAmf0Any* any = elem.second;
srs_freep(any);
}
properties.clear();
}
@ -543,6 +558,17 @@ SrsAmf0Any* __SrsUnSortedHashtable::ensure_property_number(string name)
return prop;
}
void __SrsUnSortedHashtable::copy(__SrsUnSortedHashtable* src)
{
std::vector<SrsAmf0ObjectPropertyType>::iterator it;
for (it = src->properties.begin(); it != src->properties.end(); ++it) {
SrsAmf0ObjectPropertyType& elem = *it;
std::string key = elem.first;
SrsAmf0Any* any = elem.second;
set(key, any->copy());
}
}
__SrsAmf0ObjectEOF::__SrsAmf0ObjectEOF()
{
marker = RTMP_AMF0_ObjectEnd;
@ -623,6 +649,11 @@ int __SrsAmf0ObjectEOF::write(SrsStream* stream)
return ret;
}
SrsAmf0Any* __SrsAmf0ObjectEOF::copy()
{
return new __SrsAmf0ObjectEOF();
}
SrsAmf0Object::SrsAmf0Object()
{
properties = new __SrsUnSortedHashtable();
@ -750,6 +781,13 @@ int SrsAmf0Object::write(SrsStream* stream)
return ret;
}
SrsAmf0Any* SrsAmf0Object::copy()
{
SrsAmf0Object* copy = new SrsAmf0Object();
copy->properties->copy(properties);
return copy;
}
int SrsAmf0Object::count()
{
return properties->count();
@ -792,6 +830,7 @@ SrsAmf0Any* SrsAmf0Object::ensure_property_number(string name)
SrsAmf0EcmaArray::SrsAmf0EcmaArray()
{
_count = 0;
properties = new __SrsUnSortedHashtable();
eof = new __SrsAmf0ObjectEOF();
marker = RTMP_AMF0_EcmaArray;
@ -937,6 +976,14 @@ int SrsAmf0EcmaArray::write(SrsStream* stream)
return ret;
}
SrsAmf0Any* SrsAmf0EcmaArray::copy()
{
SrsAmf0EcmaArray* copy = new SrsAmf0EcmaArray();
copy->properties->copy(properties);
copy->_count = _count;
return copy;
}
void SrsAmf0EcmaArray::clear()
{
properties->clear();
@ -1097,6 +1144,20 @@ int SrsAmf0StrictArray::write(SrsStream* stream)
return ret;
}
SrsAmf0Any* SrsAmf0StrictArray::copy()
{
SrsAmf0StrictArray* copy = new SrsAmf0StrictArray();
std::vector<SrsAmf0Any*>::iterator it;
for (it = properties.begin(); it != properties.end(); ++it) {
SrsAmf0Any* any = *it;
copy->append(any->copy());
}
copy->_count = _count;
return copy;
}
void SrsAmf0StrictArray::clear()
{
properties.clear();
@ -1116,6 +1177,7 @@ SrsAmf0Any* SrsAmf0StrictArray::at(int index)
void SrsAmf0StrictArray::append(SrsAmf0Any* any)
{
properties.push_back(any);
_count = (int32_t)properties.size();
}
int SrsAmf0Size::utf8(string value)
@ -1216,6 +1278,12 @@ int __SrsAmf0String::write(SrsStream* stream)
return srs_amf0_write_string(stream, value);
}
SrsAmf0Any* __SrsAmf0String::copy()
{
__SrsAmf0String* copy = new __SrsAmf0String(value.c_str());
return copy;
}
__SrsAmf0Boolean::__SrsAmf0Boolean(bool _value)
{
marker = RTMP_AMF0_Boolean;
@ -1241,6 +1309,12 @@ int __SrsAmf0Boolean::write(SrsStream* stream)
return srs_amf0_write_boolean(stream, value);
}
SrsAmf0Any* __SrsAmf0Boolean::copy()
{
__SrsAmf0Boolean* copy = new __SrsAmf0Boolean(value);
return copy;
}
__SrsAmf0Number::__SrsAmf0Number(double _value)
{
marker = RTMP_AMF0_Number;
@ -1266,6 +1340,12 @@ int __SrsAmf0Number::write(SrsStream* stream)
return srs_amf0_write_number(stream, value);
}
SrsAmf0Any* __SrsAmf0Number::copy()
{
__SrsAmf0Number* copy = new __SrsAmf0Number(value);
return copy;
}
__SrsAmf0Null::__SrsAmf0Null()
{
marker = RTMP_AMF0_Null;
@ -1290,6 +1370,12 @@ int __SrsAmf0Null::write(SrsStream* stream)
return srs_amf0_write_null(stream);
}
SrsAmf0Any* __SrsAmf0Null::copy()
{
__SrsAmf0Null* copy = new __SrsAmf0Null();
return copy;
}
__SrsAmf0Undefined::__SrsAmf0Undefined()
{
marker = RTMP_AMF0_Undefined;
@ -1314,6 +1400,12 @@ int __SrsAmf0Undefined::write(SrsStream* stream)
return srs_amf0_write_undefined(stream);
}
SrsAmf0Any* __SrsAmf0Undefined::copy()
{
__SrsAmf0Undefined* copy = new __SrsAmf0Undefined();
return copy;
}
int srs_amf0_read_any(SrsStream* stream, SrsAmf0Any** ppvalue)
{
int ret = ERROR_SUCCESS;