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
d0a73d0f
Commit
d0a73d0f
authored
6 years ago
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
规范命名
parent
8f8eda93
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
6 行增加
和
6 行删除
+6
-6
src/Common/MultiMediaSourceMuxer.h
+2
-2
src/MediaFile/MediaReader.cpp
+1
-1
src/Rtsp/RtspMediaSource.h
+1
-1
src/RtspMuxer/RtspMediaSourceMuxer.h
+2
-2
没有找到文件。
src/Common/MultiMediaSourceMuxer.h
查看文件 @
d0a73d0f
...
...
@@ -79,8 +79,8 @@ public:
return
_rtsp
->
readerCount
()
+
_rtmp
->
readerCount
();
}
void
update
TimeStamp
(
uint32_t
stamp
){
_rtsp
->
update
TimeStamp
(
stamp
);
void
set
TimeStamp
(
uint32_t
stamp
){
_rtsp
->
set
TimeStamp
(
stamp
);
}
private
:
RtmpMediaSourceMuxer
::
Ptr
_rtmp
;
...
...
This diff is collapsed.
Click to expand it.
src/MediaFile/MediaReader.cpp
查看文件 @
d0a73d0f
...
...
@@ -306,7 +306,7 @@ void MediaReader::seek(int iSeekTime,bool bReStart){
setSeekTime
(
iSeekTime
);
}
}
_pChn
->
update
TimeStamp
(
_iSeekTime
);
_pChn
->
set
TimeStamp
(
_iSeekTime
);
if
(
bReStart
){
AsyncTaskThread
::
Instance
().
CancelTask
(
reinterpret_cast
<
uint64_t
>
(
this
));
...
...
This diff is collapsed.
Click to expand it.
src/Rtsp/RtspMediaSource.h
查看文件 @
d0a73d0f
...
...
@@ -92,7 +92,7 @@ public:
return
track
->
_time_stamp
;
}
void
update
TimeStamp
(
uint32_t
uiStamp
)
{
void
set
TimeStamp
(
uint32_t
uiStamp
)
{
auto
tracks
=
_sdpAttr
.
getAvailableTrack
();
for
(
auto
&
track
:
tracks
)
{
track
->
_time_stamp
=
uiStamp
;
...
...
This diff is collapsed.
Click to expand it.
src/RtspMuxer/RtspMediaSourceMuxer.h
查看文件 @
d0a73d0f
...
...
@@ -51,8 +51,8 @@ public:
int
readerCount
()
const
{
return
_mediaSouce
->
getRing
()
->
readerCount
();
}
void
update
TimeStamp
(
uint32_t
stamp
){
_mediaSouce
->
update
TimeStamp
(
stamp
);
void
set
TimeStamp
(
uint32_t
stamp
){
_mediaSouce
->
set
TimeStamp
(
stamp
);
}
private
:
void
onInited
()
override
{
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论