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

Enable content detection #1911

Merged
merged 30 commits into from Jun 23, 2021
Merged

Enable content detection #1911

merged 30 commits into from Jun 23, 2021

Conversation

jailuthra
Copy link
Contributor

@jailuthra jailuthra commented Jun 9, 2021 •
edited

What does this pull request do? Explain your changes. (required)

Enable content detection (experimental) in go-livepeer.

Specific updates (required)

How did you test each of these updates (required)

End-to-end testing both locally and in staging.

Does this pull request close any open issues?

Fixes #1881

Checklist:

Base automatically changed from jai/results-wh-detection to jai/segprocessing-detection June 16, 2021 13:41
Base automatically changed from jai/segprocessing-detection to jai/auth-wh-detection June 16, 2021 13:41
Base automatically changed from jai/auth-wh-detection to jai/pb-detection June 16, 2021 13:42
Base automatically changed from jai/pb-detection to jai/expcaps June 16, 2021 13:42
@jailuthra
core: enable experimental capabilities
7c22cd3
@jailuthra
net: Add structures for content detection
37fbb56
@jailuthra
net: Add detector_enabled field in SegData
6e97cba
@jailuthra
mod: Update LPMS to livepeer/lpms@a387a4e
19ba441
@jailuthra
server,core: Parse detection config from webhook
66dafe1
@jailuthra
server,core: Test detection config and caps
4ec43f6
@jailuthra
server,core: Serialize detector profile
3cee371
@jailuthra
server: Deserialize detector profile
a220bd5
@jailuthra
server,core: Serialize detector results
ed36b01
@jailuthra
core/transcoder: Configure detection, extract results
b7c5605
@jailuthra
core,server: Run detection at the start of a LB session
81ff3d4 
Nvidia transcoder only allocates detection-related filters on the first
segment of a session.

If the B switches to a different O mid-stream on a segment that wasn't
scheduled for detection, we'll end up with a transcode session that
can't handle detection for subsequent segs.

So here we force-enable detection for the first segment of a new LB session.
@jailuthra
server/segment_rpc: Test detector (de)serialization
1f7a1c8
@jailuthra
cmd,server: Post detection results to webhook
3cf3d5c
@jailuthra
server: Add timeouts & improve errors for detection webhook
9711808
Base automatically changed from jai/expcaps to jai/scene-classification June 16, 2021 13:43
@jailuthra jailuthra force-pushed the jai/e2e-detection branch 2 times, most recently from 54052b6 to 59eae83 Compare June 16, 2021 14:24
@jailuthra jailuthra changed the title tools,ci: Enable content detection Enable content detection Jun 23, 2021
jailuthra added a commit that referenced this pull request Jun 23, 2021
@jailuthra
CHANGELOG_PENDING: Add entry for #1911
6ae5e46
@jailuthra
Copy link
Contributor Author

Cleaned up the commit history, and updated the description with the changes.

Keeping the target branch as jai/scene-classification to simplify review process, but we can merge this directly into master (as the changes in jai/scene-classification are already reviewed in #1895 - #1901)

Build is currently failing due to some unrelated certificate issue with upstream x264 - will look into it.

@jailuthra jailuthra marked this pull request as ready for review June 23, 2021 13:18
@jailuthra jailuthra requested a review from yondonfu June 23, 2021 13:26
yondonfu
yondonfu approved these changes Jun 23, 2021
View reviewed changes
Copy link
Member

@yondonfu yondonfu left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one comment about the pending changelog entry. Feel free to address and then merge after looking into the Windows build.

LGTM 🚢

CHANGELOG_PENDING.md Outdated Show resolved Hide resolved
@jailuthra
Copy link
Contributor Author

Feel free to address and then merge after looking into the Windows build.

The windows build has been failing for some other issue (GPG keyring) even for master, since https://github.com/livepeer/go-livepeer/runs/2887772138
Not taking any action for it on this PR and moving ahead for the merge.

Build is currently failing due to some unrelated certificate issue with upstream x264 - will look into it.

This was a networking blip in the Linux builds, and it got resolved after re-triggering the build.

@jailuthra jailuthra changed the base branch from jai/scene-classification to master June 23, 2021 15:08
@jailuthra jailuthra merged commit 887fb1c into master Jun 23, 2021
@jailuthra jailuthra deleted the jai/e2e-detection branch July 1, 2021 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yondonfu yondonfu yondonfu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Content Detection Integration (Experimental)
2 participants
@jailuthra @yondonfu