Skip to content

Config: Error when both HLS and HTTP-TS enabled.#3400

Merged
winlinvip merged 7 commits intoossrs:developfrom
chundonglinlin:feature/detect-conflict-hls-remux
Feb 8, 2023
Merged

Config: Error when both HLS and HTTP-TS enabled.#3400
winlinvip merged 7 commits intoossrs:developfrom
chundonglinlin:feature/detect-conflict-hls-remux

Conversation

@chundonglinlin
Copy link
Copy Markdown
Member

@chundonglinlin chundonglinlin commented Feb 2, 2023

If enable HLS and HTTP-TS, SRS can't identify the protocol(HLS or HTTP-TS). So when SRS start, we detect the conflict for HLS and HTTP-TS.

Test1

vhost __defaultVhost__ {
    http_remux {
        enabled     on;
        mount       [vhost]/[app]/[stream].ts;
    }
    hls {
        enabled         on;
        hls_path        ./objs/nginx/html;
        hls_fragment    10;
        hls_window      60;
    }
}

Test2

vhost __defaultVhost__ {
    http_remux {
        enabled     off;
        mount       [vhost]/[app]/[stream].ts;
    }
    hls {
        enabled         on;
        hls_path        ./objs/nginx/html;
        hls_fragment    10;
        hls_window      60;
    }
}

Test3

vhost __defaultVhost__ {
    http_remux {
        enabled     on;
        mount       [vhost]/[app]/[stream].ts;
    }
    hls {
        enabled         off;
        hls_path        ./objs/nginx/html;
        hls_fragment    10;
        hls_window      60;
    }
}

Test4

vhost __defaultVhost__ {
    http_remux {
        enabled     on;
        mount       [vhost]/[app]/[stream].ts;
    }
    http_remux {
        enabled     on;
        mount       [vhost]/[app]/[stream].flv;
    }
}

Test5

vhost __defaultVhost__ {
    http_remux {
        enabled     off;
        mount       [vhost]/[app]/[stream].ts;
    }
    http_remux {
        enabled     on;
        mount       [vhost]/[app]/[stream].flv;
    }
}

winlinvip
winlinvip reviewed Feb 7, 2023
View reviewed changes
@chundonglinlin chundonglinlin force-pushed the feature/detect-conflict-hls-remux branch from 1c2c1a2 to 49430dd Compare February 7, 2023 14:04
@chundonglinlin chundonglinlin force-pushed the feature/detect-conflict-hls-remux branch from 49430dd to f2ccac1 Compare February 7, 2023 14:06
@winlinvip winlinvip changed the title Config: Should return error when both HLS and HTTP-TS are enabled.(#3391) Config: Should error when both HLS and HTTP-TS enabled.(#3391) Feb 8, 2023
@winlinvip winlinvip linked an issue Feb 8, 2023 that may be closed by this pull request
Should return error when both HLS and HTTP-TS are enabled #3391
Closed
@winlinvip winlinvip changed the title Config: Should error when both HLS and HTTP-TS enabled.(#3391) Config: Error when both HLS and HTTP-TS enabled. Feb 8, 2023
@winlinvip winlinvip merged commit 5b001fe into ossrs:develop Feb 8, 2023
winlinvip added a commit that referenced this pull request Feb 8, 2023
@chundonglinlin @winlinvip @xiaozhihong
Config: Error when both HLS and HTTP-TS enabled. (#3400)
d1dec92 
PICK 5b001fe

Co-authored-by: winlin <winlin@vip.126.com>
Co-authored-by: john <hondaxiao@tencent.com>
@winlinvip winlinvip added the TransByAI Translated by AI/GPT. label Jul 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@winlinvip winlinvip winlinvip approved these changes

@xiaozhihong xiaozhihong xiaozhihong approved these changes

@duiniuluantanqin duiniuluantanqin Awaiting requested review from duiniuluantanqin

@mapengfei53 mapengfei53 Awaiting requested review from mapengfei53

Assignees

No one assigned

Labels

TransByAI Translated by AI/GPT.

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Should return error when both HLS and HTTP-TS are enabled

3 participants

@chundonglinlin @winlinvip @xiaozhihong