Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-29 22:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/zqsong/ZLMediaKit into zqsong

Browse Source
This commit is contained in:
xiongziliang
2019-08-02 13:40:15 +08:00
parent 1f89019818 0d57664fac
commit dd80d6a6bb
4 changed files with 747 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Extension/H265.h
View File

@@ -36,8 +36,8 @@ using namespace toolkit;
namespace mediakit {
bool getAVCH265Info(const string& strSps,int &iVideoWidth, int &iVideoHeight, float &iVideoFps);
bool getAVC265Info(const char * sps,int sps_len,int &iVideoWidth, int &iVideoHeight, float &iVideoFps);
bool getAVCH265Info(const string& strVps,const string& strSps,int &iVideoWidth, int &iVideoHeight, float &iVideoFps);
bool getAVC265Info(const char * vps, int vps_len,const char * sps,int sps_len,int &iVideoWidth, int &iVideoHeight, float &iVideoFps);
/**
* 265帧类
@@ -336,7 +336,7 @@ private:
* 解析sps获取宽高fps
*/
void onReady(){
getAVCH265Info(_sps,_width,_height,_fps);
getAVCH265Info(_vps,_sps,_width,_height,_fps);
}
Track::Ptr clone() override {
return std::make_shared<std::remove_reference<decltype(*this)>::type>(*this);