Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve timestamp type: int -> uint. #4232

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions trunk/src/app/srs_app_rtc_source.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,7 @@ srs_error_t SrsRtcFrameBuilder::transcode_audio(SrsRtpPacket *pkt)
srs_error_t err = srs_success;

// to common message.
uint32_t ts = pkt->get_avsync_time();
uint64_t ts = pkt->get_avsync_time();
if (is_first_audio_) {
int header_len = 0;
uint8_t* header = NULL;
Expand Down Expand Up @@ -1543,7 +1543,7 @@ srs_error_t SrsRtcFrameBuilder::transcode_audio(SrsRtpPacket *pkt)
return err;
}

void SrsRtcFrameBuilder::packet_aac(SrsCommonMessage* audio, char* data, int len, uint32_t pts, bool is_header)
void SrsRtcFrameBuilder::packet_aac(SrsCommonMessage* audio, char* data, int len, uint64_t pts, bool is_header)
{
int rtmp_len = len + 2;
audio->header.initialize_audio(rtmp_len, pts, 1);
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_rtc_source.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ class SrsRtcFrameBuilder
virtual srs_error_t on_rtp(SrsRtpPacket *pkt);
private:
srs_error_t transcode_audio(SrsRtpPacket *pkt);
void packet_aac(SrsCommonMessage* audio, char* data, int len, uint32_t pts, bool is_header);
void packet_aac(SrsCommonMessage* audio, char* data, int len, uint64_t pts, bool is_header);
private:
srs_error_t packet_video(SrsRtpPacket* pkt);
srs_error_t packet_video_key_frame(SrsRtpPacket* pkt);
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/kernel/srs_kernel_codec.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ class SrsFrame
{
public:
// The DTS/PTS in milliseconds, which is TBN=1000.
int64_t dts;
uint64_t dts;
// PTS = DTS + CTS.
int32_t cts;
public:
Expand Down
10 changes: 5 additions & 5 deletions trunk/src/kernel/srs_kernel_flv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,31 +109,31 @@ void SrsMessageHeader::initialize_amf0_script(int size, int stream)
message_type = RTMP_MSG_AMF0DataMessage;
payload_length = (int32_t)size;
timestamp_delta = (int32_t)0;
timestamp = (int64_t)0;
timestamp = 0;
stream_id = (int32_t)stream;

// amf0 script use connection2 chunk-id
prefer_cid = RTMP_CID_OverConnection2;
}

void SrsMessageHeader::initialize_audio(int size, uint32_t time, int stream)
void SrsMessageHeader::initialize_audio(int size, uint64_t time, int stream)
{
message_type = RTMP_MSG_AudioMessage;
payload_length = (int32_t)size;
timestamp_delta = (int32_t)time;
timestamp = (int64_t)time;
timestamp = time;
stream_id = (int32_t)stream;

// audio chunk-id
prefer_cid = RTMP_CID_Audio;
}

void SrsMessageHeader::initialize_video(int size, uint32_t time, int stream)
void SrsMessageHeader::initialize_video(int size, uint64_t time, int stream)
{
message_type = RTMP_MSG_VideoMessage;
payload_length = (int32_t)size;
timestamp_delta = (int32_t)time;
timestamp = (int64_t)time;
timestamp = time;
stream_id = (int32_t)stream;

// video chunk-id
Expand Down
6 changes: 3 additions & 3 deletions trunk/src/kernel/srs_kernel_flv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class SrsMessageHeader
// The 4 bytes are packed in the big-endian order.
// @remark, used as calc timestamp when decode and encode time.
// @remark, we use 64bits for large time for jitter detect and hls.
int64_t timestamp;
uint64_t timestamp;
public:
// Get the prefered cid(chunk stream id) which sendout over.
// set at decoding, and canbe used for directly send message,
Expand All @@ -177,9 +177,9 @@ class SrsMessageHeader
// Create a amf0 script header, set the size and stream_id.
void initialize_amf0_script(int size, int stream);
// Create a audio header, set the size, timestamp and stream_id.
void initialize_audio(int size, uint32_t time, int stream);
void initialize_audio(int size, uint64_t time, int stream);
// Create a video header, set the size, timestamp and stream_id.
void initialize_video(int size, uint32_t time, int stream);
void initialize_video(int size, uint64_t time, int stream);
};

// The message is raw data RTMP message, bytes oriented,
Expand Down
6 changes: 3 additions & 3 deletions trunk/src/kernel/srs_kernel_rtc_rtp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ class SrsRtpPacket
// The helper handler for decoder, use RAW payload if NULL.
ISrsRtspPacketDecodeHandler* decode_handler;
private:
int64_t avsync_time_;
uint64_t avsync_time_;
public:
SrsRtpPacket();
virtual ~SrsRtpPacket();
Expand Down Expand Up @@ -336,8 +336,8 @@ class SrsRtpPacket
public:
bool is_keyframe();
// Get and set the packet sync time in milliseconds.
void set_avsync_time(int64_t avsync_time) { avsync_time_ = avsync_time; }
int64_t get_avsync_time() const { return avsync_time_; }
void set_avsync_time(uint64_t avsync_time) { avsync_time_ = avsync_time; }
uint64_t get_avsync_time() const { return avsync_time_; }
};

// Single payload data.
Expand Down
Loading