Feature/h265: Merged branches #68
Open
Conversation
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
1. Cache IDR frame's rtp timestamp instead of avsync timestamp. 2. Cache clock rate calculate by sender report. 3. Using srs_rtp_seq_distance instead of direct minus. 4. Add utest of av timestamp sync when duplicated sender report.
Revert "Change GB28181 to feature/gb28181. 4.0.127" This reverts commit 68c48e2.
* remove rtp jitbuffer enable/disable, only enable * remove rtp jitbuffer enable/disable, only enable Co-authored-by: [email protected] <[email protected]>
./configure: error: invalid option "--iconv"
* For #1747, Support HEVC/H.265 in SRT/RTMP/HLS.
* Fixed compile error.
* gb28181 support h265
Co-authored-by: runner365 <[email protected]>
Co-authored-by: Winlin <[email protected]>
* For #1747, Support HEVC/H.265 in SRT/RTMP/HLS. * Fixed compile error. * 1. optimize when to send hevc vps sps pps header 2. fix hevc I frame dropped by rtc before sending to consumer 3. fix overread in nalu parsing * ignore unknown payload data, otherwise it will be processed in other place * free err before return Co-authored-by: runner365 <[email protected]> Co-authored-by: yinjiaoyuan <[email protected]>
* fix nack encode seqnum * add nack encode utest * change Variable naming Co-authored-by: liyalong1 <[email protected]>
* protocol/utility: add srs_ipv4_to_num * protocol/utility: add srs_ipv4_within_mask * protocol/utility: add srs_get_cidr_mask and CIDR_VALUES static struct * protocol/utility: add srs_get_cidr_ipv4 * app/security: support cidr ip ranges in allow/deny rules * conf: update security example with cidr ranges * Security: Enable CIDR for allow/deny play/publish * Security: Enable CIDR for allow/deny play/publish * Security: Enable CIDR for allow/deny play/publish * fix compile error on centos6 Co-authored-by: Matheus Macabu <[email protected]>
the cmake option is ENABLE_APPS, so we should use --disable-apps or --enable-apps=0. this commit fixes the typo.
Co-authored-by: Winlin <[email protected]>
Co-authored-by: Winlin <[email protected]>
* SRT: parse srt url to supports multiple QueryStrings.(#2893) * SRT: url supports multiple QueryStrings by comma-separated key-value pairs with no nesting (#2893) * SRT: url supports multiple QueryStrings by comma-separated key-value pairs with no nesting (#2893) * SRT: Add comments for url. * Add utest for SRT URL parsing. * Update README. Co-authored-by: winlin <[email protected]>
* Fix parse file function did not handle err * Fix parse_file function did not handle err * Fix error message * Updated error information
merged code according to issue 2717 link: ossrs/srs#2717
merged with branch feature-gb28181 by Yuan combined scripts and tested build previous core version is 5.0.16 current core version is 5.0.25
|
Since the v6.0.4 has both GB28181 & HEVC features, this PR might be deprecated. This proj has been used in large projects and runs well for more than 8 month. Thanks again for the SRS team. |
winlinvip
force-pushed
the
feature/h265
branch
from
69ec66c
to
a623f4a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged branch feature/h265 & feature/gb28181
This PR contains the following commits
Note: Previous base version is 5.0.16, current core version is 5.0.25.