Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
36ed78ba
Commit
36ed78ba
authored
5 years ago
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
规范函数命名
parent
dd80d6a6
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
9 行增加
和
16 行删除
+9
-16
src/Extension/H264.cpp
+3
-3
src/Extension/H264.h
+0
-1
src/Extension/H265.cpp
+4
-9
src/Extension/H265.h
+2
-3
没有找到文件。
src/Extension/H264.cpp
查看文件 @
36ed78ba
...
...
@@ -32,9 +32,6 @@ using namespace toolkit;
namespace
mediakit
{
bool
getAVCInfo
(
const
string
&
strSps
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
)
{
return
getAVCInfo
(
strSps
.
data
(),
strSps
.
size
(),
iVideoWidth
,
iVideoHeight
,
iVideoFps
);
}
bool
getAVCInfo
(
const
char
*
sps
,
int
sps_len
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
){
T_GetBitContext
tGetBitBuf
;
T_SPS
tH264SpsInfo
;
...
...
@@ -51,6 +48,9 @@ bool getAVCInfo(const char * sps,int sps_len,int &iVideoWidth, int &iVideoHeight
return
true
;
}
bool
getAVCInfo
(
const
string
&
strSps
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
)
{
return
getAVCInfo
(
strSps
.
data
(),
strSps
.
size
(),
iVideoWidth
,
iVideoHeight
,
iVideoFps
);
}
const
char
*
memfind
(
const
char
*
buf
,
int
len
,
const
char
*
subbuf
,
int
sublen
)
{
for
(
auto
i
=
0
;
i
<
len
-
sublen
;
++
i
)
{
...
...
This diff is collapsed.
Click to expand it.
src/Extension/H264.h
查看文件 @
36ed78ba
...
...
@@ -36,7 +36,6 @@ using namespace toolkit;
namespace
mediakit
{
bool
getAVCInfo
(
const
string
&
strSps
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
);
bool
getAVCInfo
(
const
char
*
sps
,
int
sps_len
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
);
void
splitH264
(
const
char
*
ptr
,
int
len
,
const
std
::
function
<
void
(
const
char
*
,
int
)
>
&
cb
);
/**
...
...
This diff is collapsed.
Click to expand it.
src/Extension/H265.cpp
查看文件 @
36ed78ba
...
...
@@ -30,14 +30,7 @@
namespace
mediakit
{
bool
getAVCH265Info
(
const
string
&
strVps
,
const
string
&
strSps
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
)
{
return
getAVC265Info
(
strVps
.
data
(),
strVps
.
size
(),
strSps
.
data
(),
strSps
.
size
(),
iVideoWidth
,
iVideoHeight
,
iVideoFps
);
}
bool
getAVC265Info
(
const
char
*
vps
,
int
vps_len
,
const
char
*
sps
,
int
sps_len
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
){
bool
getHEVCInfo
(
const
char
*
vps
,
int
vps_len
,
const
char
*
sps
,
int
sps_len
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
){
T_GetBitContext
tGetBitBuf
;
T_HEVCSPS
tH265SpsInfo
;
T_HEVCVPS
tH265VpsInfo
;
...
...
@@ -69,7 +62,9 @@ bool getAVC265Info(const char * vps, int vps_len,const char * sps,int sps_len,in
return
true
;
}
bool
getHEVCInfo
(
const
string
&
strVps
,
const
string
&
strSps
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
)
{
return
getHEVCInfo
(
strVps
.
data
(),
strVps
.
size
(),
strSps
.
data
(),
strSps
.
size
(),
iVideoWidth
,
iVideoHeight
,
iVideoFps
);
}
Sdp
::
Ptr
H265Track
::
getSdp
()
{
if
(
!
ready
()){
...
...
This diff is collapsed.
Click to expand it.
src/Extension/H265.h
查看文件 @
36ed78ba
...
...
@@ -36,8 +36,7 @@ using namespace toolkit;
namespace
mediakit
{
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
);
bool
getHEVCInfo
(
const
string
&
strVps
,
const
string
&
strSps
,
int
&
iVideoWidth
,
int
&
iVideoHeight
,
float
&
iVideoFps
);
/**
* 265帧类
...
...
@@ -336,7 +335,7 @@ private:
* 解析sps获取宽高fps
*/
void
onReady
(){
get
AVCH265Info
(
_vps
,
_sps
,
_width
,
_height
,
_fps
);
get
HEVCInfo
(
_vps
,
_sps
,
_width
,
_height
,
_fps
);
}
Track
::
Ptr
clone
()
override
{
return
std
::
make_shared
<
std
::
remove_reference
<
decltype
(
*
this
)
>::
type
>
(
*
this
);
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论