GB28181: Fix #2570, remove useless audio track info in PMT when no audio #2738

qichaoshen82 · 2021-11-16T12:45:57Z

Fix #2570, remove useless audio track info in PMT when no audio

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: xialixin@kanzhun.com <xialixin@kanzhun.com>

Co-authored-by: xialixin@kanzhun.com <xialixin@kanzhun.com>

./configure: error: invalid option "--iconv"

codecov-commenter · 2021-11-16T12:51:00Z

Codecov Report

Merging #2738 (6558010) into feature/gb28181 (f6c445b) will increase coverage by 0.01%.
The diff coverage is 59.72%.

@@                 Coverage Diff                 @@
##           feature/gb28181    #2738      +/-   ##
===================================================
+ Coverage            59.81%   59.83%   +0.01%     
===================================================
  Files                  121      121              
  Lines                51195    51246      +51     
===================================================
+ Hits                 30622    30661      +39     
- Misses               20573    20585      +12

| Impacted Files | Coverage Δ | |'

Translated to English while maintaining the markdown structure:

'| Impacted Files | Coverage Δ | |
|---|---|---|
| trunk/src/app/srs_app_config.cpp | 62.75% <ø> (ø) | |
| trunk/src/app/srs_app_hls.cpp | 0.00% <0.00%> (ø) | |'

Translated to English while maintaining the markdown structure:

'| trunk/src/app/srs_app_config.cpp | 62.75% <ø> (ø) | |
| trunk/src/app/srs_app_hls.cpp | 0.00% <0.00%> (ø) | |
| trunk/src/kernel/srs_kernel_ts.cpp | 82.08% <68.25%> (-0.82%) | ⬇️ |

Continue to review full report at Codecov.

Legend - Click here to learn more
| Δ = absolute <relative> (impact), ø = not affected, ? = missing data'

Translated to English while maintaining the markdown structure:

'| Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update f6c445b...6558010. Read the comment docs.

TRANS_BY_GPT3

winlinvip · 2021-11-16T23:20:55Z

Thanks for your PR, assign to @duiniuluantanqin 😄

trunk/src/kernel/srs_kernel_ts.cpp

trunk/src/kernel/srs_kernel_ts.hpp

trunk/src/kernel/srs_kernel_ts.cpp

…and refine code

qichaoshen82 · 2021-11-18T01:31:26Z

Delete codec id from the configuration file and add codec settings in HLS.
@duiniuluantanqin @winlinvip

TRANS_BY_GPT3

…and refine code

trunk/src/app/srs_app_hls.cpp

duiniuluantanqin · 2021-11-22T07:11:49Z

@winlinvip I suggest merging this PR into the develop branch. It's not just a problem with GB, but a common issue. Even during live streaming, the problem can be reproduced without enabling audio.

TRANS_BY_GPT3

winlinvip · 2021-11-23T07:45:46Z

trunk/src/app/srs_app_config.cpp

@@ -2760,7 +2760,7 @@ srs_error_t SrsConfig::check_normal_config()
                for (int j = 0; j < (int)conf->directives.size(); j++) {
                    string m = conf->at(j)->name;
                    if (m != "enabled" && m != "hls_entry_prefix" && m != "hls_path" && m != "hls_fragment" && m != "hls_window" && m != "hls_on_error"
-                        && m != "hls_storage" && m != "hls_mount" && m != "hls_td_ratio" && m != "hls_aof_ratio" && m != "hls_acodec" && m != "hls_vcodec"
+                        && m != "hls_storage" && m != "hls_mount" && m != "hls_td_ratio" && m != "hls_aof_ratio"


If these two options have been configured before, it will not run directly, resulting in user startup failure.

This is an incompatible change, and users cannot use it. Refer to srs_config_transform_vhost to delete these two configuration items (and print a warning), so that they can be safely removed.

TRANS_BY_GPT3

trunk/src/app/srs_app_hls.cpp

winlinvip · 2021-11-23T07:49:21Z

trunk/src/utest/srs_utest_config.cpp

@@ -3522,13 +3522,11 @@ VOID TEST(ConfigMainTest, CheckVhostConfig5)

    if (true) {
        MockSrsConfig conf;
-        HELPER_ASSERT_SUCCESS(conf.parse(_MIN_OK_CONF "vhost ossrs.net{hls{hls_td_ratio 2.1;hls_aof_ratio 3.1;hls_window 10;hls_on_error xxx;hls_acodec xxx2;hls_vcodec xxx3;hls_nb_notify 5;hls_dts_directly off;hls_cleanup off;hls_dispose 10;hls_wait_keyframe off;}}"));
+        HELPER_ASSERT_SUCCESS(conf.parse(_MIN_OK_CONF "vhost ossrs.net{hls{hls_td_ratio 2.1;hls_aof_ratio 3.1;hls_window 10;hls_on_error xxx;hls_nb_notify 5;hls_dts_directly off;hls_cleanup off;hls_dispose 10;hls_wait_keyframe off;}}"));


This 'utest' cannot remove this configuration item, as it indicates that some users may have configured it this way, and it should not cause them to fail.

On the contrary, we should make the configuration compatible and allow this 'utest' to pass.

TRANS_BY_GPT3

winlinvip · 2021-11-23T07:52:26Z

trunk/src/kernel/srs_kernel_ts.cpp

+        for (idx=0; idx<size; idx++) {
+            msg = ts_msg_cache_for_verify_codec.at(idx);
+            if(msg) {            
+                context->encode(writer, msg, vcodec, acodec);


srs_error_t SrsTsContext::encode(ISrsStreamWriter* writer, SrsTsMessage* msg, SrsVideoCodecId vc, SrsAudioCodecId ac)

This function will return an error, and the error is lost here. When an error occurs, we have no idea what happened at all.

TRANS_BY_GPT3

trunk/src/app/srs_app_config.cpp

trunk/src/app/srs_app_hls.cpp

TanessaW

winlinvip · 2022-01-05T03:24:36Z

Migrate to ossrs/srs-gb28181#2

winlinvip and others added 13 commits October 27, 2021 18:08

GB28181: Support GB28181.

e60a102

Revert "Change GB28181 to feature/gb28181. 4.0.127" This reverts commit 68c48e2.

GB28181: Support ./configure --iconv=on|off to fix build fail.

e486e86

GB28181: fixed compile error when --log-info=on ossrs#2506

366a27c

GB28181: 优化CATALOG XML解析，支持大华平台<key/>空标签写法。

8a72019

GB28181: 忽略payload type不为96的ps数据

b6ea1df

GB28181: Delete invalid api '/api/v1/gb28181?action=sip_raw_data'

770a7b9

GB28181: Always enable jitter for RTP. (ossrs#2647)

3505a85

* remove rtp jitbuffer enable/disable, only enable * remove rtp jitbuffer enable/disable, only enable Co-authored-by: xialixin@kanzhun.com <xialixin@kanzhun.com>

GB28181: Check is es_info_length overflow es_map_length (ossrs#2650)

aa7ea44

Co-authored-by: xialixin@kanzhun.com <xialixin@kanzhun.com>

GB28181: Support query feature by API for GB+SIP (ossrs#2605)

b072bc2

GB28181: Fix build fail and warnings

cee585d

GB28181: Fix config check fail for jitterbuffer_enable removed

8fb34e0

GB28181: 解决./configure编译参数与--help不符. (ossrs#2493)

f6c445b

./configure: error: invalid option "--iconv"

Fix ossrs#2570, remove useless audio track info in PMT when no audio

4d078ac

winlinvip requested a review from duiniuluantanqin November 16, 2021 23:20

winlinvip assigned duiniuluantanqin Nov 16, 2021

winlinvip added the GB28181 For GB28181. label Nov 16, 2021

winlinvip changed the title ~~Fix #2570, remove useless audio track info in PMT when no audio~~ GB28181: Fix #2570, remove useless audio track info in PMT when no audio Nov 16, 2021

winlinvip linked an issue Nov 16, 2021 that may be closed by this pull request

GB28181: Dahua/Hikvision cameras, when streaming to SRS without enabling audio, using ffplay m3u8, encounter Stream #0:0: Audio: aac ([15][0][0][0] / 0x000F), 0 channels, fltp. #2570

Closed

qichaoshen82 mentioned this pull request Nov 17, 2021

GB28181: The second time pulling the stream with webrtc has a very slow response. #2661

Closed

qichaoshen82 force-pushed the feature/gb28181 branch from 982e866 to 4d078ac Compare November 17, 2021 09:08

duiniuluantanqin reviewed Nov 17, 2021

View reviewed changes

trunk/src/kernel/srs_kernel_ts.cpp Show resolved Hide resolved

winlinvip reviewed Nov 17, 2021

View reviewed changes

trunk/src/kernel/srs_kernel_ts.cpp Outdated Show resolved Hide resolved

winlinvip reviewed Nov 17, 2021

View reviewed changes

trunk/src/kernel/srs_kernel_ts.hpp Outdated Show resolved Hide resolved

winlinvip reviewed Nov 17, 2021

View reviewed changes

trunk/src/kernel/srs_kernel_ts.cpp Show resolved Hide resolved

root added 2 commits November 17, 2021 21:29

Fix ossrs#2570, remove useless audio track info in PMT when no audio …

9eb3e60

…and refine code

Fix ossrs#2570, remove useless audio track info in PMT when no audio …

8adaae6

…and refine code

Fix ossrs#2570, remove useless audio track info in PMT when no audio …

2d2d6d7

…and refine code

duiniuluantanqin reviewed Nov 20, 2021

View reviewed changes

trunk/src/app/srs_app_hls.cpp Outdated Show resolved Hide resolved

duiniuluantanqin approved these changes Nov 22, 2021

View reviewed changes

winlinvip reviewed Nov 23, 2021

View reviewed changes

trunk/src/app/srs_app_hls.cpp Show resolved Hide resolved

winlinvip reviewed Nov 23, 2021

View reviewed changes

qichaoshen82 force-pushed the feature/gb28181 branch from d377e84 to 2d2d6d7 Compare November 24, 2021 01:54

root added 3 commits November 24, 2021 12:40

Fix ossrs#2570, remove useless audio track info in PMT when no audio

f91fedd

Fix ossrs#2570, remove useless audio track info in PMT when no audio

394fff9

Fix ossrs#2570, remove useless audio track info in PMT when no audio

535dbe3

qichaoshen82 requested a review from winlinvip November 24, 2021 09:43

duiniuluantanqin reviewed Nov 25, 2021

View reviewed changes

trunk/src/app/srs_app_config.cpp Outdated Show resolved Hide resolved

trunk/src/app/srs_app_hls.cpp Show resolved Hide resolved

Fix ossrs#2570, remove useless audio track info in PMT when no audio

6558010

duiniuluantanqin approved these changes Nov 29, 2021

View reviewed changes

winlinvip force-pushed the feature/gb28181 branch from f6c445b to 72ad526 Compare December 4, 2021 03:49

TanessaW approved these changes Dec 20, 2021

View reviewed changes

This comment was marked as spam.

Sign in to view

ossrs blocked TanessaW Dec 21, 2021

winlinvip mentioned this pull request Jan 5, 2022

Fix #2570, remove useless audio track info in PMT when no audio ossrs/srs-gb28181#2

Open

winlinvip closed this Jan 5, 2022

winlinvip added the TransByAI Translated by AI/GPT. label Jul 29, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GB28181: Fix #2570, remove useless audio track info in PMT when no audio #2738

GB28181: Fix #2570, remove useless audio track info in PMT when no audio #2738

qichaoshen82 commented Nov 16, 2021

codecov-commenter commented Nov 16, 2021 •

edited by winlinvip

Loading

winlinvip commented Nov 16, 2021

qichaoshen82 commented Nov 18, 2021 •

edited by winlinvip

Loading

duiniuluantanqin commented Nov 22, 2021 •

edited by winlinvip

Loading

winlinvip Nov 23, 2021 •

edited

Loading

winlinvip Nov 23, 2021 •

edited

Loading

winlinvip Nov 23, 2021 •

edited

Loading

TanessaW left a comment

This comment was marked as spam.

winlinvip commented Jan 5, 2022

GB28181: Fix #2570, remove useless audio track info in PMT when no audio #2738

GB28181: Fix #2570, remove useless audio track info in PMT when no audio #2738

Conversation

qichaoshen82 commented Nov 16, 2021

codecov-commenter commented Nov 16, 2021 • edited by winlinvip Loading

Codecov Report

winlinvip commented Nov 16, 2021

qichaoshen82 commented Nov 18, 2021 • edited by winlinvip Loading

duiniuluantanqin commented Nov 22, 2021 • edited by winlinvip Loading

winlinvip Nov 23, 2021 • edited Loading

Choose a reason for hiding this comment

winlinvip Nov 23, 2021 • edited Loading

Choose a reason for hiding this comment

winlinvip Nov 23, 2021 • edited Loading

Choose a reason for hiding this comment

TanessaW left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

winlinvip commented Jan 5, 2022

codecov-commenter commented Nov 16, 2021 •

edited by winlinvip

Loading

qichaoshen82 commented Nov 18, 2021 •

edited by winlinvip

Loading

duiniuluantanqin commented Nov 22, 2021 •

edited by winlinvip

Loading

winlinvip Nov 23, 2021 •

edited

Loading

winlinvip Nov 23, 2021 •

edited

Loading

winlinvip Nov 23, 2021 •

edited

Loading