Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-03-10 17:04:02 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5c3c38684b25acce0cc749b4989501a49310607b
5c3c3868
1 parent
0ff49fd2
fix the bug of flv stream, metadata type should be 18
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
7 行增加
和
5 行删除
trunk/ide/srs_upp/init
trunk/src/app/srs_app_http_conn.cpp
trunk/src/kernel/srs_kernel_flv.cpp
trunk/src/kernel/srs_kernel_flv.hpp
trunk/ide/srs_upp/init
查看文件 @
5c3c386
#ifndef _srs_upp_icpp_init_stub
#define _srs_upp_icpp_init_stub
#ifndef _ide_srs_upp_icpp_init_stub
#define _ide_srs_upp_icpp_init_stub
#endif
...
...
trunk/src/app/srs_app_http_conn.cpp
查看文件 @
5c3c386
...
...
@@ -394,7 +394,7 @@ int SrsFlvStreamEncoder::write_video(int64_t timestamp, char* data, int size)
int
SrsFlvStreamEncoder
::
write_metadata
(
int64_t
timestamp
,
char
*
data
,
int
size
)
{
return
enc
->
write_metadata
(
timestamp
,
data
,
size
);
return
enc
->
write_metadata
(
SrsCodecFlvTagScript
,
data
,
size
);
}
bool
SrsFlvStreamEncoder
::
has_cache
()
...
...
trunk/src/kernel/srs_kernel_flv.cpp
查看文件 @
5c3c386
...
...
@@ -36,6 +36,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_kernel_file.hpp>
#include <srs_kernel_codec.hpp>
#define SRS_FLV_TAG_HEADER_SIZE 11
#define SRS_FLV_PREVIOUS_TAG_SIZE 4
...
...
@@ -149,7 +150,7 @@ int SrsFlvEncoder::write_audio(int64_t timestamp, char* data, int size)
// 11bytes tag header
static
char
tag_header
[]
=
{
(
char
)
8
,
// TagType UB [5], 8 = audio
(
char
)
SrsCodecFlvTagAudio
,
// TagType UB [5], 8 = audio
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
// DataSize UI24 Length of the message.
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
// Timestamp UI24 Time in milliseconds at which the data in this tag applies.
(
char
)
0x00
,
// TimestampExtended UI8
...
...
@@ -183,7 +184,7 @@ int SrsFlvEncoder::write_video(int64_t timestamp, char* data, int size)
// 11bytes tag header
static
char
tag_header
[]
=
{
(
char
)
9
,
// TagType UB [5], 9 = video
(
char
)
SrsCodecFlvTagVideo
,
// TagType UB [5], 9 = video
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
// DataSize UI24 Length of the message.
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
// Timestamp UI24 Time in milliseconds at which the data in this tag applies.
(
char
)
0x00
,
// TimestampExtended UI8
...
...
trunk/src/kernel/srs_kernel_flv.hpp
查看文件 @
5c3c386
...
...
@@ -67,6 +67,7 @@ public:
/**
* write flv metadata.
* @param type, the type of data, or other message type.
* @see SrsCodecFlvTag
* @param data, the amf0 metadata which serialize from:
* AMF0 string: onMetaData,
* AMF0 object: the metadata object.
...
...
请
注册
或
登录
后发表评论