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

fix #302, remove the thread unsafe code, no static.

Browse source
This commit is contained in:
winlin 2015-03-23 21:19:04 +08:00
parent 1cb2992808
commit f69fa7273b
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_hds.cpp
View file

@ -146,7 +146,7 @@ public:
data.append(serialFlv(msg)); data.append(serialFlv(msg));
} }
static char box_header[8]; char box_header[8];
SrsStream ss; SrsStream ss;
ss.initialize(box_header, 8); ss.initialize(box_header, 8);
ss.write_4bytes(8 + data.size()); ss.write_4bytes(8 + data.size());

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 146 #define VERSION_REVISION 147
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"

12
trunk/src/kernel/srs_kernel_flv.cpp
View file

@ -74,7 +74,7 @@ int SrsFlvEncoder::write_header()
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// 9bytes header and 4bytes first previous-tag-size // 9bytes header and 4bytes first previous-tag-size
static char flv_header[] = { char flv_header[] = {
'F', 'L', 'V', // Signatures "FLV" 'F', 'L', 'V', // Signatures "FLV"
(char)0x01, // File version (for example, 0x01 for FLV version 1) (char)0x01, // File version (for example, 0x01 for FLV version 1)
(char)0x00, // 4, audio; 1, video; 5 audio+video. (char)0x00, // 4, audio; 1, video; 5 audio+video.
@ -118,7 +118,7 @@ int SrsFlvEncoder::write_metadata(char type, char* data, int size)
srs_assert(data); srs_assert(data);
// 11 bytes tag header // 11 bytes tag header
static char tag_header[] = { char tag_header[] = {
(char)type, // TagType UB [5], 18 = script data (char)type, // TagType UB [5], 18 = script data
(char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message. (char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message.
(char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies. (char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies.
@ -149,7 +149,7 @@ int SrsFlvEncoder::write_audio(int64_t timestamp, char* data, int size)
timestamp &= 0x7fffffff; timestamp &= 0x7fffffff;
// 11bytes tag header // 11bytes tag header
static char tag_header[] = { char tag_header[] = {
(char)SrsCodecFlvTagAudio, // TagType UB [5], 8 = audio (char)SrsCodecFlvTagAudio, // TagType UB [5], 8 = audio
(char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message. (char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message.
(char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies. (char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies.
@ -183,7 +183,7 @@ int SrsFlvEncoder::write_video(int64_t timestamp, char* data, int size)
timestamp &= 0x7fffffff; timestamp &= 0x7fffffff;
// 11bytes tag header // 11bytes tag header
static char tag_header[] = { char tag_header[] = {
(char)SrsCodecFlvTagVideo, // TagType UB [5], 9 = video (char)SrsCodecFlvTagVideo, // TagType UB [5], 9 = video
(char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message. (char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message.
(char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies. (char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies.
@ -231,7 +231,7 @@ int SrsFlvEncoder::write_tag(char* header, int header_size, char* tag, int tag_s
} }
// PreviousTagSizeN UI32 Size of last tag, including its header, in bytes. // PreviousTagSizeN UI32 Size of last tag, including its header, in bytes.
static char pre_size[SRS_FLV_PREVIOUS_TAG_SIZE]; char pre_size[SRS_FLV_PREVIOUS_TAG_SIZE];
if ((ret = tag_stream->initialize(pre_size, SRS_FLV_PREVIOUS_TAG_SIZE)) != ERROR_SUCCESS) { if ((ret = tag_stream->initialize(pre_size, SRS_FLV_PREVIOUS_TAG_SIZE)) != ERROR_SUCCESS) {
return ret; return ret;
} }
@ -426,7 +426,7 @@ int SrsFlvVodStreamDecoder::read_sequence_header_summary(int64_t* pstart, int* p
// and must be a sequence video and audio. // and must be a sequence video and audio.
// 11bytes tag header // 11bytes tag header
static char tag_header[] = { char tag_header[] = {
(char)0x00, // TagType UB [5], 9 = video, 8 = audio, 18 = script data (char)0x00, // TagType UB [5], 9 = video, 8 = audio, 18 = script data
(char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message. (char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message.
(char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies. (char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies.

2
trunk/src/kernel/srs_kernel_mp3.cpp
View file

@ -68,7 +68,7 @@ int SrsMp3Encoder::initialize(SrsFileWriter* fs)
int SrsMp3Encoder::write_header() int SrsMp3Encoder::write_header()
{ {
static char id3[] = { char id3[] = {
(char)0x49, (char)0x44, (char)0x33, // ID3 (char)0x49, (char)0x44, (char)0x33, // ID3
(char)0x03, (char)0x00, // version (char)0x03, (char)0x00, // version
(char)0x00, // flags (char)0x00, // flags

4
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -2772,7 +2772,7 @@ int SrsTsCache::do_cache_aac(SrsAvcAacCodec* codec, SrsCodecSample* sample)
// 6.2 Audio Data Transport Stream, ADTS // 6.2 Audio Data Transport Stream, ADTS
// in aac-iso-13818-7.pdf, page 26. // in aac-iso-13818-7.pdf, page 26.
// fixed 7bytes header // fixed 7bytes header
static u_int8_t adts_header[7] = {0xff, 0xf9, 0x00, 0x00, 0x00, 0x0f, 0xfc}; u_int8_t adts_header[7] = {0xff, 0xf9, 0x00, 0x00, 0x00, 0x0f, 0xfc};
/* /*
// adts_fixed_header // adts_fixed_header
// 2B, 16bits // 2B, 16bits
@ -2824,7 +2824,7 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample)
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// for type1/5/6, insert aud packet. // for type1/5/6, insert aud packet.
static u_int8_t aud_nal[] = { 0x00, 0x00, 0x00, 0x01, 0x09, 0xf0 }; u_int8_t aud_nal[] = { 0x00, 0x00, 0x00, 0x01, 0x09, 0xf0 };
bool sps_pps_sent = false; bool sps_pps_sent = false;
bool aud_sent = false; bool aud_sent = false;

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

@ -2340,7 +2340,7 @@ int srs_human_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int
const char* srs_human_format_time() const char* srs_human_format_time()
{ {
struct timeval tv; struct timeval tv;
static char buf[23]; char buf[23];
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));

2
trunk/src/protocol/srs_rtmp_sdk.cpp
View file

@ -260,7 +260,7 @@ int SrsHandshakeBytes::create_c0c1()
srs_random_generate(c0c1, 1537); srs_random_generate(c0c1, 1537);
// plain text required. // plain text required.
static SrsStream stream; SrsStream stream;
if ((ret = stream.initialize(c0c1, 9)) != ERROR_SUCCESS) { if ((ret = stream.initialize(c0c1, 9)) != ERROR_SUCCESS) {
return ret; return ret;
} }