diff --git a/trunk/research/librtmp/srs_aac_raw_publish.c b/trunk/research/librtmp/srs_aac_raw_publish.c index b1e951139..10ddfcfb8 100644 --- a/trunk/research/librtmp/srs_aac_raw_publish.c +++ b/trunk/research/librtmp/srs_aac_raw_publish.c @@ -95,7 +95,7 @@ int main(int argc, char** argv) // open file int raw_fd = open(raw_file, O_RDONLY); if (raw_fd < 0) { - srs_human_trace("open audio raw file %s failed.", raw_fd); + srs_human_trace("open audio raw file %s failed.", raw_file); goto rtmp_destroy; } diff --git a/trunk/research/librtmp/srs_audio_raw_publish.c b/trunk/research/librtmp/srs_audio_raw_publish.c index 4c9c89914..8c45984e3 100644 --- a/trunk/research/librtmp/srs_audio_raw_publish.c +++ b/trunk/research/librtmp/srs_audio_raw_publish.c @@ -47,7 +47,7 @@ int read_audio_frame(char* audio_raw, int file_size, char** pp, char** pdata, in if (file_size - (p - audio_raw) < 168) { srs_human_trace("audio must be 160+8 bytes. left %d bytes.", - file_size - (p - audio_raw)); + (int)(file_size - (p - audio_raw))); return - 1; } @@ -88,7 +88,7 @@ int main(int argc, char** argv) // open file int raw_fd = open(raw_file, O_RDONLY); if (raw_fd < 0) { - srs_human_trace("open audio raw file %s failed.", raw_fd); + srs_human_trace("open audio raw file %s failed.", raw_file); goto rtmp_destroy; } diff --git a/trunk/research/librtmp/srs_bandwidth_check.c b/trunk/research/librtmp/srs_bandwidth_check.c index 3a3fac75b..ddf3de957 100644 --- a/trunk/research/librtmp/srs_bandwidth_check.c +++ b/trunk/research/librtmp/srs_bandwidth_check.c @@ -132,6 +132,7 @@ rtmp_destroy: "\"srs_id\":%d, " "\"duration\":%d, " "\"play_duration\":%d, " + "\"publish_duration\":%d," "\"play_kbps\":%d, " "\"publish_kbps\":%d" "}", @@ -141,7 +142,7 @@ rtmp_destroy: (int)(end_time - start_time), play_duration, publish_duration, play_kbps, publish_kbps); - srs_human_trace(""); + srs_human_trace(" "); srs_human_trace("completed"); return ret; diff --git a/trunk/research/librtmp/srs_detect_rtmp.c b/trunk/research/librtmp/srs_detect_rtmp.c index 84d18cc34..df18a787f 100644 --- a/trunk/research/librtmp/srs_detect_rtmp.c +++ b/trunk/research/librtmp/srs_detect_rtmp.c @@ -197,7 +197,7 @@ rtmp_destroy: "\"remark2\": \"if code is not 0, user must ignore all data\"" ); - srs_human_trace(""); + srs_human_trace(" "); srs_human_trace("completed"); return ret; diff --git a/trunk/research/librtmp/srs_h264_raw_publish.c b/trunk/research/librtmp/srs_h264_raw_publish.c index d85da46d1..d111665dd 100644 --- a/trunk/research/librtmp/srs_h264_raw_publish.c +++ b/trunk/research/librtmp/srs_h264_raw_publish.c @@ -100,7 +100,7 @@ int main(int argc, char** argv) // open file int raw_fd = open(raw_file, O_RDONLY); if (raw_fd < 0) { - srs_human_trace("open h264 raw file %s failed.", raw_fd); + srs_human_trace("open h264 raw file %s failed.", raw_file); goto rtmp_destroy; } diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index e5405ae1b..d03b6dc08 100644 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -392,6 +392,12 @@ int SrsGopCache::cache(SrsSharedPtrMessage* msg) srs_verbose("gop cache is disabled."); return ret; } + + // disable gop cache when not h.264 + if (!SrsFlvCodec::video_is_h264(msg->payload, msg->size)) { + srs_info("gop donot cache video for none h.264"); + return ret; + } // got video, update the video count if acceptable if (msg->header.is_video()) { diff --git a/trunk/src/qt/srs/srs-qt.pro.user b/trunk/src/qt/srs/srs-qt.pro.user index 644bccae0..cf534d0dd 100644 --- a/trunk/src/qt/srs/srs-qt.pro.user +++ b/trunk/src/qt/srs/srs-qt.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget