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

Merge SRS3.0

Browse source
This commit is contained in:
winlin 2020-10-31 19:25:56 +08:00
commit 8c1eca98b0
23 changed files with 82 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/protocol/srs_protocol_amf0.cpp
View file

@ -33,7 +33,7 @@ using namespace std;
#include <srs_kernel_buffer.hpp>
#include <srs_protocol_json.hpp>
using namespace _srs_internal;
using namespace srs_internal;
// AMF0 marker
#define RTMP_AMF0_Number 0x00
@ -1703,7 +1703,7 @@ srs_error_t srs_amf0_write_undefined(SrsBuffer* stream)
return err;
}
namespace _srs_internal
namespace srs_internal
{
srs_error_t srs_amf0_read_utf8(SrsBuffer* stream, string& value)
{

12
trunk/src/protocol/srs_protocol_amf0.hpp
View file

@ -36,7 +36,7 @@ class SrsAmf0StrictArray;
class SrsJsonAny;
// internal objects, user should never use it.
namespace _srs_internal
namespace srs_internal
{
class SrsUnSortedHashtable;
class SrsAmf0ObjectEOF;
@ -335,8 +335,8 @@ public:
class SrsAmf0Object : public SrsAmf0Any
{
private:
_srs_internal::SrsUnSortedHashtable* properties;
_srs_internal::SrsAmf0ObjectEOF* eof;
srs_internal::SrsUnSortedHashtable* properties;
srs_internal::SrsAmf0ObjectEOF* eof;
private:
friend class SrsAmf0Any;
/**
@ -425,8 +425,8 @@ public:
class SrsAmf0EcmaArray : public SrsAmf0Any
{
private:
_srs_internal::SrsUnSortedHashtable* properties;
_srs_internal::SrsAmf0ObjectEOF* eof;
srs_internal::SrsUnSortedHashtable* properties;
srs_internal::SrsAmf0ObjectEOF* eof;
int32_t _count;
private:
friend class SrsAmf0Any;
@ -626,7 +626,7 @@ extern srs_error_t srs_amf0_read_undefined(SrsBuffer* stream);
extern srs_error_t srs_amf0_write_undefined(SrsBuffer* stream);
// internal objects, user should never use it.
namespace _srs_internal
namespace srs_internal
{
/**
* read amf0 string from stream.

4
trunk/src/protocol/srs_rtmp_handshake.cpp
View file

@ -34,7 +34,7 @@
#include <srs_kernel_buffer.hpp>
#include <srs_kernel_utility.hpp>
using namespace _srs_internal;
using namespace srs_internal;
// for openssl_HMACsha256
#include <openssl/evp.h>
@ -112,7 +112,7 @@ static int DH_set_length(DH *dh, long length)
#endif
namespace _srs_internal
namespace srs_internal
{
// 68bytes FMS key which is used to sign the sever packet.
uint8_t SrsGenuineFMSKey[] = {

2
trunk/src/protocol/srs_rtmp_handshake.hpp
View file

@ -40,7 +40,7 @@ extern HMAC_CTX *HMAC_CTX_new(void);
extern void HMAC_CTX_free(HMAC_CTX *ctx);
#endif
namespace _srs_internal
namespace srs_internal
{
// The digest key generate size.
#define SRS_OpensslHashSize 512