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

Jump to bottom

FLV: Drop packet if header flag is not matched. v5.0.109 #3306

Merged
merged 2 commits into from
Dec 14, 2022
Merged

FLV: Drop packet if header flag is not matched. v5.0.109 #3306

merged 2 commits into from
Dec 14, 2022

Conversation

winlinvip
Copy link
Member

  1. Ignore audo or video packets if FLV header disable it.
  2. Reset has_audio if got some video frames but no audio frames.
  3. Reset has_video if got some audio frames but no video frames.
  4. Note that audio/video frames are not sequence header.

@winlinvip winlinvip added this to the 5.0 milestone Dec 13, 2022
@winlinvip winlinvip linked an issue Dec 13, 2022 that may be closed by this pull request
HTTP: FLV or TS stream outputs the correct header. The HTTP-FLV stream downloaded in the browser has a different FLV header than the stream pulled by ffmpeg. #939
Closed
xiaozhihong
xiaozhihong reviewed Dec 14, 2022
View reviewed changes
trunk/src/app/srs_app_http_stream.cpp Outdated Show resolved Hide resolved
trunk/src/kernel/srs_kernel_flv.cpp Show resolved Hide resolved
trunk/src/kernel/srs_kernel_flv.cpp Outdated Show resolved Hide resolved
@xiaozhihong xiaozhihong self-requested a review December 14, 2022 08:05
@winlinvip winlinvip changed the title FLV: Reset has_audio or has_video if only sequence header. v5.0.109 FLV: Reset has_audio or has_video if only sequence header. Dec 14, 2022
@winlinvip winlinvip changed the title FLV: Reset has_audio or has_video if only sequence header. FLV: Drop packet if header flag is not matched. v5.0.109 Dec 14, 2022
@winlinvip
FLV: Drop packet if header flag is not matched. v5.0.109
ac06d35 
1. Ignore audo or video packets if FLV header disable it.
2. Run: Add regression test config and run for IDEA.
3. Test: Refine regression test to allow no audio/video for FLV
4. Config: Whether drop packet if not match header.
@winlinvip winlinvip mentioned this pull request Dec 14, 2022
Closed
@winlinvip winlinvip merged commit 4551200 into ossrs:5.0release Dec 14, 2022
winlinvip added a commit that referenced this pull request Dec 18, 2022
@winlinvip
Merge branch v5.0.112 into develop
2f7e474 
1. SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323)
2. GB28181: Fix memory overlap for small packets. v5.0.111 (#3315)
3. FLV: Support set default has_av and disable guessing. v5.0.110 (#3311)
4. FLV: Drop packet if header flag is not matched. v5.0.109 (#3306)
5. FLV: Reset has_audio or has_video if only sequence header. (#3310)
winlinvip added a commit that referenced this pull request Dec 18, 2022
@winlinvip
Merge 5.0: FLV header and SRT bugfix. v6.0.6
2daf637 
1. SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323)
2. GB28181: Fix memory overlap for small packets. v5.0.111 (#3315)
3. FLV: Support set default has_av and disable guessing. v5.0.110 (#3311)
4. FLV: Drop packet if header flag is not matched. v5.0.109 (#3306)
5. FLV: Reset has_audio or has_video if only sequence header. (#3310)
@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

@xiaozhihong xiaozhihong xiaozhihong approved these changes

@chundonglinlin chundonglinlin Awaiting requested review from chundonglinlin

@chen-guanghua chen-guanghua Awaiting requested review from chen-guanghua

Assignees
No one assigned
Labels
TransByAI Translated by AI/GPT.
Projects
None yet
Milestone
5.0
2 participants
@winlinvip @xiaozhihong