From d482cd29c4965b7d7153843c7ca3787debbd96af Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Wed, 16 Jan 2019 14:26:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Http/HttpClient.cpp | 1 + src/Http/HttpClient.h | 2 +- src/Http/HttpDownloader.cpp | 2 +- src/Http/HttpDownloader.h | 2 +- src/Http/HttpRequester.cpp | 2 +- src/Http/HttpRequester.h | 2 +- src/Rtmp/Rtmp.h | 1 + src/Rtsp/RtspSplitter.cpp | 1 + 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Http/HttpClient.cpp b/src/Http/HttpClient.cpp index be501fe5..0082f874 100644 --- a/src/Http/HttpClient.cpp +++ b/src/Http/HttpClient.cpp @@ -24,6 +24,7 @@ * SOFTWARE. */ +#include #include "HttpClient.h" #include "Rtsp/Rtsp.h" diff --git a/src/Http/HttpClient.h b/src/Http/HttpClient.h index 991920cd..fcf0ec8f 100644 --- a/src/Http/HttpClient.h +++ b/src/Http/HttpClient.h @@ -272,7 +272,7 @@ protected: * @param recvedSize 已收数据大小(包含本次数据大小),当其等于totalSize时将触发onResponseCompleted回调 * @param totalSize 总数据大小 */ - virtual void onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize){ + virtual void onResponseBody(const char *buf,int64_t size,int64_t recvedSize,int64_t totalSize){ DebugL << size << " " << recvedSize << " " << totalSize; }; diff --git a/src/Http/HttpDownloader.cpp b/src/Http/HttpDownloader.cpp index f379b115..4d96f2df 100644 --- a/src/Http/HttpDownloader.cpp +++ b/src/Http/HttpDownloader.cpp @@ -79,7 +79,7 @@ int64_t HttpDownloader::onResponseHeader(const string& status,const HttpHeader& return -1; } -void HttpDownloader::onResponseBody(const char* buf, size_t size, size_t recvedSize, size_t totalSize) { +void HttpDownloader::onResponseBody(const char* buf, int64_t size, int64_t recvedSize, int64_t totalSize) { if(_saveFile){ fwrite(buf,size,1,_saveFile); } diff --git a/src/Http/HttpDownloader.h b/src/Http/HttpDownloader.h index 4b3e3fae..5f8d0d56 100644 --- a/src/Http/HttpDownloader.h +++ b/src/Http/HttpDownloader.h @@ -48,7 +48,7 @@ public: } private: int64_t onResponseHeader(const string &status,const HttpHeader &headers) override; - void onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize) override; + void onResponseBody(const char *buf,int64_t size,int64_t recvedSize,int64_t totalSize) override; void onResponseCompleted() override; void onDisconnect(const SockException &ex) override; void closeFile(); diff --git a/src/Http/HttpRequester.cpp b/src/Http/HttpRequester.cpp index 0fb7ed01..48a9e1c2 100644 --- a/src/Http/HttpRequester.cpp +++ b/src/Http/HttpRequester.cpp @@ -40,7 +40,7 @@ int64_t HttpRequester::onResponseHeader(const string &status,const HttpHeader &h return 0; } -void HttpRequester::onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize) { +void HttpRequester::onResponseBody(const char *buf,int64_t size,int64_t recvedSize,int64_t totalSize) { _strRecvBody.append(buf,size); } diff --git a/src/Http/HttpRequester.h b/src/Http/HttpRequester.h index 0bd777bb..d862006d 100644 --- a/src/Http/HttpRequester.h +++ b/src/Http/HttpRequester.h @@ -42,7 +42,7 @@ public: void clear() override ; private: int64_t onResponseHeader(const string &status,const HttpHeader &headers) override; - void onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize) override; + void onResponseBody(const char *buf,int64_t size,int64_t recvedSize,int64_t totalSize) override; void onResponseCompleted() override; void onDisconnect(const SockException &ex) override; private: diff --git a/src/Rtmp/Rtmp.h b/src/Rtmp/Rtmp.h index c5f01097..604beff9 100644 --- a/src/Rtmp/Rtmp.h +++ b/src/Rtmp/Rtmp.h @@ -28,6 +28,7 @@ #include #include +#include #include "Util/util.h" #include "Util/logger.h" #include "Network/sockutil.h" diff --git a/src/Rtsp/RtspSplitter.cpp b/src/Rtsp/RtspSplitter.cpp index 70ba0cec..bfcfdf21 100644 --- a/src/Rtsp/RtspSplitter.cpp +++ b/src/Rtsp/RtspSplitter.cpp @@ -24,6 +24,7 @@ * SOFTWARE. */ +#include #include "RtspSplitter.h" namespace mediakit{