From 7dcfd6b02974a56554e63313fa47f7efa075df33 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 20 Aug 2020 18:05:40 +0800 Subject: [PATCH] Refine code --- trunk/src/app/srs_app_config.cpp | 3 ++- trunk/src/kernel/srs_kernel_aac.cpp | 2 ++ trunk/src/kernel/srs_kernel_mp4.cpp | 2 ++ trunk/src/protocol/srs_http_stack.cpp | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 2f44f120e..b790be70b 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -130,7 +130,7 @@ namespace _srs_internal // read total content from file. ssize_t nread = 0; if ((err = reader.read(start, filesize, &nread)) != srs_success) { - return srs_error_wrap(err, "read %d only %d bytes", filesize, nread); + return srs_error_wrap(err, "read %d only %d bytes", filesize, (int)nread); } return err; @@ -1140,6 +1140,7 @@ SrsConfig::SrsConfig() show_help = false; show_version = false; test_conf = false; + show_signature = false; root = new SrsConfDirective(); root->conf_line = 0; diff --git a/trunk/src/kernel/srs_kernel_aac.cpp b/trunk/src/kernel/srs_kernel_aac.cpp index 95fa34b7b..5a4d42499 100644 --- a/trunk/src/kernel/srs_kernel_aac.cpp +++ b/trunk/src/kernel/srs_kernel_aac.cpp @@ -46,6 +46,8 @@ SrsAacTransmuxer::SrsAacTransmuxer() writer = NULL; got_sequence_header = false; aac_object = SrsAacObjectTypeReserved; + aac_sample_rate = 0; + aac_channels = 0; } SrsAacTransmuxer::~SrsAacTransmuxer() diff --git a/trunk/src/kernel/srs_kernel_mp4.cpp b/trunk/src/kernel/srs_kernel_mp4.cpp index 5f76caf37..d943b6c4c 100644 --- a/trunk/src/kernel/srs_kernel_mp4.cpp +++ b/trunk/src/kernel/srs_kernel_mp4.cpp @@ -4581,6 +4581,8 @@ SrsMp4SegmentIndexBox::SrsMp4SegmentIndexBox() { type = SrsMp4BoxTypeSIDX; version = 0; + flags = reference_id = timescale = 0; + earliest_presentation_time = first_offset = 0; } SrsMp4SegmentIndexBox::~SrsMp4SegmentIndexBox() diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp index 93cda0fca..b34825b79 100644 --- a/trunk/src/protocol/srs_http_stack.cpp +++ b/trunk/src/protocol/srs_http_stack.cpp @@ -557,7 +557,7 @@ srs_error_t SrsHttpFileServer::copy(ISrsHttpResponseWriter* w, SrsFileReader* fs left -= nread; if ((err = w->write(buf, (int)nread)) != srs_success) { - return srs_error_wrap(err, "write limit=%d, bytes=%d, left=%d", max_read, nread, left); + return srs_error_wrap(err, "write limit=%d, bytes=%d, left=%d", max_read, (int)nread, left); } }