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-09-22 08:59:21 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
dadfe101b4467cf1a664613347b6e347b2ae710f
dadfe101
1 parent
0e52fc6d
rename SrsBitStream to SrsBitBuffer
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
14 行增加
和
14 行删除
trunk/src/kernel/srs_kernel_buffer.cpp
trunk/src/kernel/srs_kernel_buffer.hpp
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_utility.cpp
trunk/src/kernel/srs_kernel_utility.hpp
trunk/src/kernel/srs_kernel_buffer.cpp
查看文件 @
dadfe10
...
...
@@ -252,30 +252,30 @@ void SrsBuffer::write_bytes(char* data, int size)
p
+=
size
;
}
SrsBit
Stream
::
SrsBitStream
()
SrsBit
Buffer
::
SrsBitBuffer
()
{
cb
=
0
;
cb_left
=
0
;
stream
=
NULL
;
}
SrsBit
Stream
::~
SrsBitStream
()
SrsBit
Buffer
::~
SrsBitBuffer
()
{
}
int
SrsBit
Stream
::
initialize
(
SrsBuffer
*
s
)
{
int
SrsBit
Buffer
::
initialize
(
SrsBuffer
*
s
)
{
stream
=
s
;
return
ERROR_SUCCESS
;
}
bool
SrsBit
Stream
::
empty
()
{
bool
SrsBit
Buffer
::
empty
()
{
if
(
cb_left
)
{
return
false
;
}
return
stream
->
empty
();
}
int8_t
SrsBit
Stream
::
read_bit
()
{
int8_t
SrsBit
Buffer
::
read_bit
()
{
if
(
!
cb_left
)
{
srs_assert
(
!
stream
->
empty
());
cb
=
stream
->
read_1bytes
();
...
...
trunk/src/kernel/srs_kernel_buffer.hpp
查看文件 @
dadfe10
...
...
@@ -159,15 +159,15 @@ public:
/**
* the bit stream.
*/
class
SrsBit
Stream
class
SrsBit
Buffer
{
private
:
int8_t
cb
;
u_int8_t
cb_left
;
SrsBuffer
*
stream
;
public
:
SrsBitStream
();
virtual
~
SrsBitStream
();
SrsBitBuffer
();
virtual
~
SrsBitBuffer
();
public
:
virtual
int
initialize
(
SrsBuffer
*
s
);
virtual
bool
empty
();
...
...
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
dadfe10
...
...
@@ -981,7 +981,7 @@ int SrsAvcAacCodec::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
return
ret
;
}
SrsBit
Stream
bs
;
SrsBit
Buffer
bs
;
if
((
ret
=
bs
.
initialize
(
&
stream
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
trunk/src/kernel/srs_kernel_utility.cpp
查看文件 @
dadfe10
...
...
@@ -48,7 +48,7 @@ using namespace std;
// @see SRS_SYS_TIME_RESOLUTION_MS_TIMES
#define SYS_TIME_RESOLUTION_US 300*1000
int
srs_avc_nalu_read_uev
(
SrsBit
Stream
*
stream
,
int32_t
&
v
)
int
srs_avc_nalu_read_uev
(
SrsBit
Buffer
*
stream
,
int32_t
&
v
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
@@ -82,7 +82,7 @@ int srs_avc_nalu_read_uev(SrsBitStream* stream, int32_t& v)
return
ret
;
}
int
srs_avc_nalu_read_bit
(
SrsBit
Stream
*
stream
,
int8_t
&
v
)
int
srs_avc_nalu_read_bit
(
SrsBit
Buffer
*
stream
,
int8_t
&
v
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/kernel/srs_kernel_utility.hpp
查看文件 @
dadfe10
...
...
@@ -34,15 +34,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector>
class
SrsBuffer
;
class
SrsBit
Stream
;
class
SrsBit
Buffer
;
// compare
#define srs_min(a, b) (((a) < (b))? (a) : (b))
#define srs_max(a, b) (((a) < (b))? (b) : (a))
// read nalu uev.
extern
int
srs_avc_nalu_read_uev
(
SrsBitStream
*
stream
,
int32_t
&
v
);
extern
int
srs_avc_nalu_read_bit
(
SrsBitStream
*
stream
,
int8_t
&
v
);
extern
int
srs_avc_nalu_read_uev
(
SrsBitBuffer
*
stream
,
int32_t
&
v
);
extern
int
srs_avc_nalu_read_bit
(
SrsBitBuffer
*
stream
,
int8_t
&
v
);
// get current system time in ms, use cache to avoid performance problem
extern
int64_t
srs_get_system_time_ms
();
...
...
请
注册
或
登录
后发表评论