mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-26 04:31:37 +08:00
返回值去除std::move
This commit is contained in:
parent
06f1731bca
commit
416d21df36
@ -1 +1 @@
|
|||||||
Subproject commit 311bee0aeff620f51bf43149b001c62079f40ea7
|
Subproject commit 8611e88c2eda178973662dcfe180691ff1d8ba35
|
@ -256,7 +256,7 @@ static C get_http_header( const char *response_header[]){
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return std::move(header);
|
return header;
|
||||||
}
|
}
|
||||||
|
|
||||||
API_EXPORT mk_http_body API_CALL mk_http_body_from_multi_form(const char *key_val[],const char *file_path){
|
API_EXPORT mk_http_body API_CALL mk_http_body_from_multi_form(const char *key_val[],const char *file_path){
|
||||||
|
@ -78,7 +78,7 @@ static C get_http_header( const char *response_header[]){
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return std::move(header);
|
return header;
|
||||||
}
|
}
|
||||||
|
|
||||||
API_EXPORT void API_CALL mk_http_requester_set_body(mk_http_requester ctx, mk_http_body body){
|
API_EXPORT void API_CALL mk_http_requester_set_body(mk_http_requester ctx, mk_http_body body){
|
||||||
|
@ -144,7 +144,7 @@ static ApiArgsType getAllArgs(const Parser &parser) {
|
|||||||
for (auto &pr : parser.getUrlArgs()) {
|
for (auto &pr : parser.getUrlArgs()) {
|
||||||
allArgs[pr.first] = pr.second;
|
allArgs[pr.first] = pr.second;
|
||||||
}
|
}
|
||||||
return std::move(allArgs);
|
return allArgs;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void addHttpListener(){
|
static inline void addHttpListener(){
|
||||||
|
@ -163,7 +163,7 @@ static ArgsType make_json(const MediaInfo &args){
|
|||||||
body["app"] = args._app;
|
body["app"] = args._app;
|
||||||
body["stream"] = args._streamid;
|
body["stream"] = args._streamid;
|
||||||
body["params"] = args._param_strs;
|
body["params"] = args._param_strs;
|
||||||
return std::move(body);
|
return body;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void reportServerStarted(){
|
static void reportServerStarted(){
|
||||||
|
@ -161,7 +161,7 @@ vector<Track::Ptr> MediaSink::getTracks(bool trackReady) const{
|
|||||||
}
|
}
|
||||||
ret.emplace_back(pr.second);
|
ret.emplace_back(pr.second);
|
||||||
}
|
}
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -135,7 +135,7 @@ Buffer::Ptr HttpFileBody::readData(uint32_t size) {
|
|||||||
//读到数据了
|
//读到数据了
|
||||||
ret->setSize(iRead);
|
ret->setSize(iRead);
|
||||||
_offset += iRead;
|
_offset += iRead;
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
//读取文件异常,文件真实长度小于声明长度
|
//读取文件异常,文件真实长度小于声明长度
|
||||||
_offset = _max_size;
|
_offset = _max_size;
|
||||||
@ -146,7 +146,7 @@ Buffer::Ptr HttpFileBody::readData(uint32_t size) {
|
|||||||
//mmap模式
|
//mmap模式
|
||||||
auto ret = std::make_shared<BufferMmap>(_map_addr,_offset,size);
|
auto ret = std::make_shared<BufferMmap>(_map_addr,_offset,size);
|
||||||
_offset += size;
|
_offset += size;
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////
|
||||||
|
@ -592,7 +592,7 @@ static string getFilePath(const Parser &parser,const MediaInfo &mediaInfo, TcpSe
|
|||||||
GET_CONFIG(string, rootPath, Http::kRootPath);
|
GET_CONFIG(string, rootPath, Http::kRootPath);
|
||||||
auto ret = File::absolutePath(enableVhost ? mediaInfo._vhost + parser.Url() : parser.Url(), rootPath);
|
auto ret = File::absolutePath(enableVhost ? mediaInfo._vhost + parser.Url() : parser.Url(), rootPath);
|
||||||
NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastHttpBeforeAccess, parser, ret, static_cast<SockInfo &>(sender));
|
NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastHttpBeforeAccess, parser, ret, static_cast<SockInfo &>(sender));
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -105,7 +105,7 @@ vector<Track::Ptr> Demuxer::getTracks(bool trackReady) const {
|
|||||||
ret.emplace_back(_audioTrack);
|
ret.emplace_back(_audioTrack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
float Demuxer::getDuration() const {
|
float Demuxer::getDuration() const {
|
||||||
|
@ -275,7 +275,7 @@ vector<Track::Ptr> MP4Demuxer::getTracks(bool trackReady) const {
|
|||||||
}
|
}
|
||||||
ret.push_back(pr.second);
|
ret.push_back(pr.second);
|
||||||
}
|
}
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t MP4Demuxer::getDurationMS() const {
|
uint64_t MP4Demuxer::getDurationMS() const {
|
||||||
|
@ -286,7 +286,7 @@ vector<SdpTrack::Ptr> SdpParser::getAvailableTrack() const {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
string SdpParser::toString() const {
|
string SdpParser::toString() const {
|
||||||
|
Loading…
Reference in New Issue
Block a user