添加版权信息以及命名空间

This commit is contained in:
xiongziliang 2018-09-25 09:55:41 +08:00
parent 92d35f885a
commit 923477dcad
5 changed files with 130 additions and 12 deletions

View File

@ -1,12 +1,38 @@
// /*
// Created by xzl on 2018/9/20. * MIT License
// *
* Copyright (c) 2016 xiongziliang <771730766@qq.com>
*
* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "HttpRequestSplitter.h" #include "HttpRequestSplitter.h"
#include "Util/logger.h" #include "Util/logger.h"
#include "Util/util.h" #include "Util/util.h"
using namespace ZL::Util; using namespace ZL::Util;
namespace ZL {
namespace Http {
void HttpRequestSplitter::input(const char *data,uint64_t len) { void HttpRequestSplitter::input(const char *data,uint64_t len) {
const char *ptr = data; const char *ptr = data;
if(!_remain_data.empty()){ if(!_remain_data.empty()){
@ -79,3 +105,8 @@ void HttpRequestSplitter::reset() {
_content_len = 0; _content_len = 0;
_remain_data.clear(); _remain_data.clear();
} }
} /* namespace Http */
} /* namespace ZL */

View File

@ -1,6 +1,28 @@
// /*
// Created by xzl on 2018/9/20. * MIT License
// *
* Copyright (c) 2016 xiongziliang <771730766@qq.com>
*
* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef ZLMEDIAKIT_HTTPREQUESTSPLITTER_H #ifndef ZLMEDIAKIT_HTTPREQUESTSPLITTER_H
#define ZLMEDIAKIT_HTTPREQUESTSPLITTER_H #define ZLMEDIAKIT_HTTPREQUESTSPLITTER_H
@ -8,6 +30,9 @@
#include <string> #include <string>
using namespace std; using namespace std;
namespace ZL {
namespace Http {
class HttpRequestSplitter { class HttpRequestSplitter {
public: public:
HttpRequestSplitter(){}; HttpRequestSplitter(){};
@ -54,5 +79,7 @@ private:
int64_t _content_len = 0; int64_t _content_len = 0;
}; };
} /* namespace Http */
} /* namespace ZL */
#endif //ZLMEDIAKIT_HTTPREQUESTSPLITTER_H #endif //ZLMEDIAKIT_HTTPREQUESTSPLITTER_H

View File

@ -1,6 +1,28 @@
// /*
// Created by xzl on 2018/9/21. * MIT License
// *
* Copyright (c) 2016 xiongziliang <771730766@qq.com>
*
* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "WebSocketSplitter.h" #include "WebSocketSplitter.h"
#include <sys/types.h> #include <sys/types.h>
@ -9,6 +31,11 @@
#include "Util/logger.h" #include "Util/logger.h"
#include "Util/util.h" #include "Util/util.h"
using namespace ZL::Util; using namespace ZL::Util;
namespace ZL {
namespace Http {
/** /**
* *
0 1 2 3 0 1 2 3
@ -176,6 +203,8 @@ void WebSocketSplitter::encode(uint8_t *data, uint64_t len) {
} /* namespace Http */
} /* namespace ZL */

View File

@ -1,6 +1,28 @@
// /*
// Created by xzl on 2018/9/21. * MIT License
// *
* Copyright (c) 2016 xiongziliang <771730766@qq.com>
*
* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef ZLMEDIAKIT_WEBSOCKETSPLITTER_H #ifndef ZLMEDIAKIT_WEBSOCKETSPLITTER_H
#define ZLMEDIAKIT_WEBSOCKETSPLITTER_H #define ZLMEDIAKIT_WEBSOCKETSPLITTER_H
@ -11,6 +33,10 @@
#include <memory> #include <memory>
using namespace std; using namespace std;
namespace ZL {
namespace Http {
class WebSocketHeader { class WebSocketHeader {
public: public:
typedef std::shared_ptr<WebSocketHeader> Ptr; typedef std::shared_ptr<WebSocketHeader> Ptr;
@ -96,5 +122,8 @@ private:
uint64_t _playload_offset = 0; uint64_t _playload_offset = 0;
}; };
} /* namespace Http */
} /* namespace ZL */
#endif //ZLMEDIAKIT_WEBSOCKETSPLITTER_H #endif //ZLMEDIAKIT_WEBSOCKETSPLITTER_H

View File

@ -45,6 +45,8 @@ using namespace ZL::Util;
using namespace ZL::Rtsp; using namespace ZL::Rtsp;
using namespace ZL::Player; using namespace ZL::Player;
using namespace ZL::Network; using namespace ZL::Network;
using namespace ZL::Http;
namespace ZL { namespace ZL {
namespace Rtsp { namespace Rtsp {