-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
2 changed files
with
9 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1122,15 +1122,20 @@ srs_error_t SrsOriginHub::on_video(SrsSharedPtrMessage* shared_video, bool is_se | |
return err; | ||
} | ||
|
||
// Parse RTMP message to RTP packets, in FU-A if too large. | ||
if ((err = rtp->on_video(msg, format)) != srs_success) { | ||
// TODO: We should support more strategies. | ||
This comment has been minimized.
Sorry, something went wrong.
xiaozhihong
Collaborator
|
||
srs_warn("rtp: ignore video error %s", srs_error_desc(err).c_str()); | ||
srs_error_reset(err); | ||
rtp->on_unpublish(); | ||
} | ||
|
||
// TODO: FIXME: Refactor to move to rtp? | ||
// Remember the RTP packets for find_rtp_packet() to rtx or restore it. | ||
source->rtp_queue->push(msg->rtp_packets); | ||
|
||
if ((err = hls->on_video(msg, format)) != srs_success) { | ||
// TODO: We should support more strategies. | ||
// apply the error strategy for hls. | ||
// @see https://github.com/ossrs/srs/issues/264 | ||
std::string hls_error_strategy = _srs_config->get_hls_on_error(req->vhost); | ||
|
1 comment
on commit 1ee6b0a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see comments
Already fix, next commit