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.

Sign up for GitHub

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

Integrate depacketizer in ExternalOuput adding h264 #1124

Merged
merged 2 commits into from
Jan 12, 2018
Merged

Integrate depacketizer in ExternalOuput adding h264 #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bf1643
Integrate depacketizer in ExternalOuput adding h264
lodoyun Jan 12, 2018
2ad10fd
Merge branch 'master' into add/intregrateDepacketizer
lodoyun Jan 12, 2018
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
199 changes: 106 additions & 93 deletions erizo/src/erizo/media/Depacketizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@
#include <cstring>

namespace erizo {
void Depacketizer::reset_buffer() {
DEFINE_LOGGER(Depacketizer, "media.Depacketizer");

void Depacketizer::resetBuffer() {
buffer_ptr_ = buffer_;
}

void Depacketizer::reset() {
reset_impl();
reset_buffer();
resetImpl();
resetBuffer();
}

void Depacketizer::buffer_check(const int len) {
if (len + (buffer_ptr_ - buffer_) >= buffer_size_) {
bool Depacketizer::bufferCheck(const int len) {
if (len + (buffer_ptr_ - buffer_) >= kUnpackageBufferSize) {
reset();
throw Depacketizer_memory_error("Not enough buffer. Dropping frame. "
"Please adjust your Depacketizer::buffer_size");
ELOG_ERROR("Not enough buffer. Dropping frame. Please adjust your kUnpackageBufferSize in Depacketizer.h");
return false;
}
return true;
}

void Vp8_depacketizer::fetch_packet(unsigned char* pkt, const int len) {
void Vp8Depacketizer::fetchPacket(unsigned char* pkt, const int len) {
head_ = reinterpret_cast<const RtpHeader*>(pkt);
last_payload_ = std::unique_ptr<erizo::RTPPayloadVP8>(
parser_.parseVP8(reinterpret_cast<unsigned char*>(pkt + head_->getHeaderLength()),
len - head_->getHeaderLength()));
}

bool Vp8_depacketizer::process_packet() {
bool Vp8Depacketizer::processPacket() {
if (!last_payload_) {
return false;
}
Expand All @@ -36,147 +39,157 @@ bool Vp8_depacketizer::process_packet() {
bool deliver = false;

switch (search_state_) {
case Search_state::lookingForStart:
case SearchState::lookingForStart:
if (startOfFrame && endOfFrame) {
// This packet is a standalone frame. Send it on. Look for start.
reset_buffer();
buffer_check(last_payload_->dataLength);
std::memcpy(buffer(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
deliver = true;
resetBuffer();
if (bufferCheck(last_payload_->dataLength)) {
std::memcpy(buffer(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
deliver = true;
}
} else if (!startOfFrame && !endOfFrame) {
// This is neither the start nor the end of a frame. Reset our buffers. Look for start.
reset_buffer();
resetBuffer();
} else if (startOfFrame && !endOfFrame) {
// Found start frame. Copy to buffers. Look for our end.
buffer_check(last_payload_->dataLength);
std::memcpy(buffer_ptr(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
search_state_ = Search_state::lookingForEnd;
if (bufferCheck(last_payload_->dataLength)) {
std::memcpy(getBufferPtr(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
search_state_ = SearchState::lookingForEnd;
}
} else { // (!startOfFrame && endOfFrame)
// We got the end of a frame. Reset our buffers.
reset_buffer();
resetBuffer();
}
break;
case Search_state::lookingForEnd:
case SearchState::lookingForEnd:
if (startOfFrame && endOfFrame) {
// Unexpected. We were looking for the end of a frame, and got a whole new frame.
// Reset our buffers, send this frame on, and go to the looking for start state.
reset_buffer();
buffer_check(last_payload_->dataLength);
std::memcpy(buffer_ptr(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
deliver = true;
reset_impl();
resetBuffer();
if (bufferCheck(last_payload_->dataLength)) {
std::memcpy(getBufferPtr(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
deliver = true;
resetImpl();
}
} else if (!startOfFrame && !endOfFrame) {
// This is neither the start nor the end. Add it to our unpackage buffer.
buffer_check(last_payload_->dataLength);
std::memcpy(buffer_ptr(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
if (bufferCheck(last_payload_->dataLength)) {
std::memcpy(getBufferPtr(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
}
} else if (startOfFrame && !endOfFrame) {
// Unexpected. We got the start of a frame. Clear out our buffer, toss this payload in,
// and continue looking for the end.
reset_buffer();
buffer_check(last_payload_->dataLength);
std::memcpy(buffer_ptr(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
resetBuffer();
if (bufferCheck(last_payload_->dataLength)) {
std::memcpy(getBufferPtr(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
}
} else { // (!startOfFrame && endOfFrame)
// Got the end of a frame. Let's deliver and start looking for the start of a frame.
search_state_ = Search_state::lookingForStart;
buffer_check(last_payload_->dataLength);
std::memcpy(buffer_ptr(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
deliver = true;
search_state_ = SearchState::lookingForStart;
if (bufferCheck(last_payload_->dataLength)) {
std::memcpy(getBufferPtr(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
deliver = true;
}
}
break;
}

return deliver;
}

bool Vp8_depacketizer::is_keyframe() const {
bool Vp8Depacketizer::isKeyframe() const {
if (!last_payload_) {
return false;
}
return last_payload_->frameType == VP8FrameTypes::kVP8IFrame;
}

void Vp8_depacketizer::reset_impl() {
void Vp8Depacketizer::resetImpl() {
last_payload_ = nullptr;
search_state_ = Search_state::lookingForStart;
search_state_ = SearchState::lookingForStart;
}

void H264_depacketizer::fetch_packet(unsigned char* pkt, int len) {
void H264Depacketizer::fetchPacket(unsigned char* pkt, int len) {
const RtpHeader* head = reinterpret_cast<const RtpHeader*>(pkt);
last_payload_ = std::unique_ptr<erizo::RTPPayloadH264>(
parser_.parseH264(reinterpret_cast<unsigned char*>(pkt + head->getHeaderLength()),
len - head->getHeaderLength()));
}

bool H264_depacketizer::is_keyframe() const {
bool H264Depacketizer::isKeyframe() const {
if (!last_payload_) {
return false;
}
return last_payload_->frameType == H264FrameTypes::kH264IFrame;
}

void H264_depacketizer::reset_impl() {
void H264Depacketizer::resetImpl() {
last_payload_ = nullptr;
search_state_ = Search_state::lookingForStart;
search_state_ = SearchState::lookingForStart;
}

bool H264_depacketizer::process_packet() {
bool H264Depacketizer::processPacket() {
switch (last_payload_->nal_type) {
case single: {
if (search_state_ == Search_state::lookingForEnd) {
reset();
}
if (last_payload_->dataLength == 0) {
return false;
}
const auto total_size = last_payload_->dataLength + sizeof(RTPPayloadH264::start_sequence);
buffer_check(total_size);
std::memcpy(buffer_ptr(), RTPPayloadH264::start_sequence, sizeof(RTPPayloadH264::start_sequence));
set_buffer_ptr(buffer_ptr() + sizeof(RTPPayloadH264::start_sequence));
std::memcpy(buffer_ptr(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
return true;
}
case fragmented: {
if (last_payload_->dataLength == 0) {
return false;
}
const auto total_size = last_payload_->dataLength
+ sizeof(RTPPayloadH264::start_sequence)
+ last_payload_->fragment_nal_header_len;
buffer_check(total_size);
if (last_payload_->start_bit) {
if (search_state_ == Search_state::lookingForEnd) {
case single: {
if (search_state_ == SearchState::lookingForEnd) {
reset();
}
search_state_ = Search_state::lookingForEnd;
std::memcpy(buffer_ptr(), RTPPayloadH264::start_sequence, sizeof(RTPPayloadH264::start_sequence));
set_buffer_ptr(buffer_ptr() + sizeof(RTPPayloadH264::start_sequence));
std::memcpy(buffer_ptr(), &last_payload_->fragment_nal_header, last_payload_->fragment_nal_header_len);
set_buffer_ptr(buffer_ptr() + last_payload_->fragment_nal_header_len);
if (last_payload_->dataLength == 0) {
return false;
}
const auto total_size = last_payload_->dataLength + sizeof(RTPPayloadH264::start_sequence);
if (bufferCheck(total_size)) {
std::memcpy(getBufferPtr(), RTPPayloadH264::start_sequence, sizeof(RTPPayloadH264::start_sequence));
setBufferPtr(getBufferPtr() + sizeof(RTPPayloadH264::start_sequence));
std::memcpy(getBufferPtr(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
return true;
}
break;
}
std::memcpy(buffer_ptr(), last_payload_->data, last_payload_->dataLength);
set_buffer_ptr(buffer_ptr() + last_payload_->dataLength);
if (last_payload_->end_bit) {
search_state_ = Search_state::lookingForStart;
return true;
case fragmented: {
if (last_payload_->dataLength == 0) {
return false;
}
const auto total_size = last_payload_->dataLength
+ sizeof(RTPPayloadH264::start_sequence)
+ last_payload_->fragment_nal_header_len;
if (bufferCheck(total_size)) {
if (last_payload_->start_bit) {
if (search_state_ == SearchState::lookingForEnd) {
reset();
}
search_state_ = SearchState::lookingForEnd;
std::memcpy(getBufferPtr(), RTPPayloadH264::start_sequence, sizeof(RTPPayloadH264::start_sequence));
setBufferPtr(getBufferPtr() + sizeof(RTPPayloadH264::start_sequence));
std::memcpy(getBufferPtr(), &last_payload_->fragment_nal_header, last_payload_->fragment_nal_header_len);
setBufferPtr(getBufferPtr() + last_payload_->fragment_nal_header_len);
}
std::memcpy(getBufferPtr(), last_payload_->data, last_payload_->dataLength);
setBufferPtr(getBufferPtr() + last_payload_->dataLength);
if (last_payload_->end_bit) {
search_state_ = SearchState::lookingForStart;
return true;
}
}
break;
}
break;
}
case aggregated: {
if (last_payload_->unpacked_data_len == 0) {
return false;
case aggregated: {
if (last_payload_->unpacked_data_len == 0) {
return false;
}
if (bufferCheck(last_payload_->unpacked_data_len)) {
std::memcpy(getBufferPtr(), &last_payload_->unpacked_data[0], last_payload_->unpacked_data_len);
setBufferPtr(getBufferPtr() + last_payload_->unpacked_data_len);
return true;
}
}
buffer_check(last_payload_->unpacked_data_len);
std::memcpy(buffer_ptr(), &last_payload_->unpacked_data[0], last_payload_->unpacked_data_len);
set_buffer_ptr(buffer_ptr() + last_payload_->unpacked_data_len);
return true;
}
}
return false;
}
Expand Down
Loading