external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

CI: Cover kernel utility

Browse source
This commit is contained in:
winlin 2019-02-04 15:11:41 +08:00
parent 572ce5ccff
commit 4187fa0068
5 changed files with 144 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
trunk/src/kernel/srs_kernel_buffer.cpp
View file

@ -251,24 +251,17 @@ void SrsBuffer::write_bytes(char* data, int size)
p += size;
}
SrsBitBuffer::SrsBitBuffer()
SrsBitBuffer::SrsBitBuffer(SrsBuffer* b)
{
cb = 0;
cb_left = 0;
stream = NULL;
stream = b;
}
SrsBitBuffer::~SrsBitBuffer()
{
}
srs_error_t SrsBitBuffer::initialize(SrsBuffer* s) {
stream = s;
cb = 0;
cb_left = 0;
return srs_success;
}
bool SrsBitBuffer::empty() {
if (cb_left) {
return false;

3
trunk/src/kernel/srs_kernel_buffer.hpp
View file

@ -206,10 +206,9 @@ private:
uint8_t cb_left;
SrsBuffer* stream;
public:
SrsBitBuffer();
SrsBitBuffer(SrsBuffer* b);
virtual ~SrsBitBuffer();
public:
virtual srs_error_t initialize(SrsBuffer* s);
virtual bool empty();
virtual int8_t read_bit();
};

5
trunk/src/kernel/srs_kernel_codec.cpp
View file

@ -894,10 +894,7 @@ srs_error_t SrsFormat::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
return srs_error_new(ERROR_HLS_DECODE_ERROR, "sps the level_idc invalid");
}
SrsBitBuffer bs;
if ((err = bs.initialize(&stream)) != srs_success) {
return srs_error_wrap(err, "init bit buffer");
}
SrsBitBuffer bs(&stream);
int32_t seq_parameter_set_id = -1;
if ((err = srs_avc_nalu_read_uev(&bs, seq_parameter_set_id)) != srs_success) {

8
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -77,6 +77,10 @@ srs_error_t srs_avc_nalu_read_uev(SrsBitBuffer* stream, int32_t& v)
v = (1 << leadingZeroBits) - 1;
for (int i = 0; i < (int)leadingZeroBits; i++) {
if (stream->empty()) {
return srs_error_new(ERROR_AVC_NALU_UEV, "no bytes for leadingZeroBits=%d", leadingZeroBits);
}
int32_t b = stream->read_bit();
v += b << (leadingZeroBits - 1 - i);
}
@ -97,8 +101,8 @@ srs_error_t srs_avc_nalu_read_bit(SrsBitBuffer* stream, int8_t& v)
return err;
}
static int64_t _srs_system_time_us_cache = 0;
static int64_t _srs_system_time_startup_time = 0;
int64_t _srs_system_time_us_cache = 0;
int64_t _srs_system_time_startup_time = 0;
int64_t srs_get_system_time_ms()
{