diff --git a/circle.yml b/circle.yml index d6fae5a43..ed5eaf8ab 100644 --- a/circle.yml +++ b/circle.yml @@ -13,10 +13,10 @@ general: dependencies: override: - - sudo apt-get install -y valgrind + - echo "ok" test: override: - - (cd trunk && ./configure --without-ssl && make) + - (cd trunk && ./configure --without-ssl --without-valgrind && make) - (cd trunk && ./objs/srs_utest) diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index df85b23ae..b3d0ee8f2 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -73,7 +73,7 @@ SRS_EXPORT_LIBRTMP_PROJECT=NO # export the srs-librtmp to a single .h and .c, NO to disable it. SRS_EXPORT_LIBRTMP_SINGLE=NO # valgrind -SRS_VALGRIND=YES +SRS_VALGRIND=NO # ################################################################ # presets diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj index 779250e56..c92ed6415 100644 --- a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj +++ b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj @@ -445,6 +445,7 @@ 3CECAF961EDC100F00C50501 /* sched.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sched.c; path = "../../../objs/state-threads-1.9.1/sched.c"; sourceTree = ""; }; 3CECAF971EDC100F00C50501 /* stk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stk.c; path = "../../../objs/state-threads-1.9.1/stk.c"; sourceTree = ""; }; 3CECAF981EDC100F00C50501 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync.c; path = "../../../objs/state-threads-1.9.1/sync.c"; sourceTree = ""; }; + 3CFBDA271F0338A40054D63E /* circle.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = circle.yml; path = ../../../circle.yml; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -819,6 +820,7 @@ 3C1EE6D21AB1366500576EE9 /* doc */ = { isa = PBXGroup; children = ( + 3CFBDA271F0338A40054D63E /* circle.yml */, 3C1EE6D31AB1367D00576EE9 /* AUTHORS.txt */, 3C1EE6D51AB1367D00576EE9 /* LICENSE */, 3C1EE6D61AB1367D00576EE9 /* README.md */, diff --git a/trunk/src/kernel/srs_kernel_mp4.cpp b/trunk/src/kernel/srs_kernel_mp4.cpp index 79e1c388c..09e2c1cd1 100644 --- a/trunk/src/kernel/srs_kernel_mp4.cpp +++ b/trunk/src/kernel/srs_kernel_mp4.cpp @@ -1956,7 +1956,7 @@ SrsMp4AudioSampleEntry* SrsMp4TrackBox::mp4a() return box? box->mp4a():NULL; } -SrsMp4TrackHeaderBox::SrsMp4TrackHeaderBox() : creation_time(0), modification_time(0), track_ID(0) +SrsMp4TrackHeaderBox::SrsMp4TrackHeaderBox() : creation_time(0), modification_time(0), track_ID(0), duration(0) { type = SrsMp4BoxTypeTKHD; @@ -2263,7 +2263,7 @@ void SrsMp4MediaBox::set_minf(SrsMp4MediaInformationBox* v) boxes.push_back(v); } -SrsMp4MediaHeaderBox::SrsMp4MediaHeaderBox() : duration(0) +SrsMp4MediaHeaderBox::SrsMp4MediaHeaderBox() : creation_time(0), modification_time(0), duration(0) { type = SrsMp4BoxTypeMDHD; language = 0; @@ -5477,7 +5477,7 @@ int SrsMp4Decoder::load_next_box(SrsMp4Box** ppbox, uint32_t required_box_type) return ret; } - if (!required_box_type || box->type == required_box_type) { + if (!required_box_type || (uint32_t)box->type == required_box_type) { *ppbox = box; break; } @@ -5505,7 +5505,7 @@ int SrsMp4Decoder::do_load_next_box(SrsMp4Box** ppbox, uint32_t required_box_typ // 1. Any box, when no box type is required. // 2. Matched box, when box type match the required type. // 3. Mdat box, always decode the mdat because we only decode the header of it. - if (!required_box_type || box->type == required_box_type || box->is_mdat()) { + if (!required_box_type || (uint32_t)box->type == required_box_type || box->is_mdat()) { ret = box->decode(buffer); } @@ -5885,7 +5885,7 @@ int SrsMp4Encoder::copy_sequence_header(bool vsh, uint8_t* sample, uint32_t nb_s int ret = ERROR_SUCCESS; if (vsh && !pavcc.empty()) { - if (nb_sample == pavcc.size() && srs_bytes_equals(sample, &pavcc[0], (int)pavcc.size())) { + if (nb_sample == (uint32_t)pavcc.size() && srs_bytes_equals(sample, &pavcc[0], (int)pavcc.size())) { return ret; } @@ -5895,7 +5895,7 @@ int SrsMp4Encoder::copy_sequence_header(bool vsh, uint8_t* sample, uint32_t nb_s } if (!vsh && !pasc.empty()) { - if (nb_sample == pasc.size() && srs_bytes_equals(sample, &pasc[0], (int)pasc.size())) { + if (nb_sample == (uint32_t)pasc.size() && srs_bytes_equals(sample, &pasc[0], (int)pasc.size())) { return ret; }