Added VoiceHook functions by accelerator74 · Pull Request #1247 · alliedmodders/sourcemod

accelerator74 · 2020-04-26T09:51:37Z

Added hooks when a player uses a microphone:

/**
 * Called when a client is speaking.
 *
 * @param client        The client index
 */
forward void OnClientSpeaking(int client);

/**
 * Called once a client speaking end.
 *
 * @param client        The client index
 */
forward void OnClientSpeakingEnd(int client);

And native function:

/**
 * Retrieves if the certain player is speaking.
 *
 * @param client        The client index
 * @return              True if player is speaking, false otherwise.
 * @error               Invalid client index.
 */
native bool IsClientSpeaking(int client);

Sorry for double request. My fails :(

When a player leaves during a voteban, he will be banned anyway. Also added a cvar with a ban time setting.

JoinedSenses · 2020-04-26T15:19:03Z

Adding comment here since other was deleted. Is there any other info that can be passed to this forward making it more useful besides just client?

accelerator74 · 2020-04-26T16:06:50Z

Is there any other info that can be passed to this forward making it more useful besides just client?

No, but there are plugins that use these hooks.

CrazyHackGUT · 2020-04-26T19:57:25Z

Why support only CS:GO? I think, this PR should not be merged before you don't add support to another possible games.

accelerator74 · 2020-04-27T03:33:30Z

It's supported for all games. For csgo uses ClientVoice hook, for others - ProccesVoiceData.

oscar-wos · 2020-05-02T17:19:09Z

This is a feature I would fully take advantage off if implemented

Headline

Code-wise this looks okay to me

KyleSanderson

https://github.com/alliedmodders/hl2sdk/blob/swarm/game/server/gameinterface.cpp#L3154 please add complete engine support.

extensions/sdktools/extension.cpp

KyleSanderson

So close - just need to invalidate timers on disconnection / level change. Where'd you get 0.3f from? I remember a peer saying this on direct frames said this wasn't enough so I'd like to understand where the metric came from.

extensions/sdktools/voice.cpp

accelerator74 · 2020-07-09T06:29:46Z

Where'd you get 0.3f from? I remember a peer saying this on direct frames said this wasn't enough so I'd like to understand where the metric came from.

0.3 was taken so as not to create constantly new timers when called and the OnClientSpeakingEnd hook is called correctly. This delay is also used in franc1sco's VoiceAnnounceEX plugin.

KyleSanderson · 2020-07-10T00:34:35Z

Where'd you get 0.3f from? I remember a peer saying this on direct frames said this wasn't enough so I'd like to understand where the metric came from.

0.3 was taken so as not to create constantly new timers when called and the OnClientSpeakingEnd hook is called correctly. This delay is also used in franc1sco's VoiceAnnounceEX plugin.

Yeah - this one in particular was really buggy with a clean imp... if there's issues we need to remember that this value is too low.

KyleSanderson

I apologize - totally not trying to bikeshed you here. I think we're super close (if there's other nits or stuff like that I'll own them after this).

Can you use CVTableHook here and compare vtables each time? That way if a client slips by this we don't miss them forever as we own the function ptr. With the flooding and other stuff going on in TF this may be used in a security fashion.

Can do something like:
https://github.com/alliedmodders/sourcemod/blob/master/extensions/sdkhooks/extension.cpp#L585
https://github.com/alliedmodders/sourcemod/blob/master/extensions/sdktools/hooks.cpp#L307

extensions/sdktools/voice.cpp

KyleSanderson

There's a merge conflict and load/unload issues in here.

extensions/sdktools/hooks.cpp

accelerator74 · 2020-07-10T19:29:15Z

There's a merge conflict

I don’t understand what’s wrong?)

Conflicting files
extensions/sdktools/hooks.h

asherkin · 2020-07-11T01:27:49Z

#1283 changed these hook lists from ke::Vector to std::vector. You'll want to git checkout master then git pull to update your local master branch, then git checkout voicehook and git rebase master to re-apply your changes on top of master - you'll then need to change the new ke::Vector you've added to a std::vector following the example of the other ones in that PR. Hopefully there should be no conflicts while updating, git should be able to figure it all out. If you have any trouble give a shout and someone can rebase it up for you.

asherkin

Couple of minor comments, but this looks pretty good.

I'm a little concerned about the timer logic but it looks like it should work without letting anything slip through the cracks (once the handle clearing bug mentioned is fixed / clarified). However, alternative implementations I would find less surprising would be:

Cancel any existing and schedule a new timer each voice frame, so if the timer ever triggers it is because the voice frames have stopped coming it - this'd remove the need to do the manual timing checks.
Instead of using timers just use a frame hook that checks time / frame count globally.

extensions/sdktools/voice.cpp

extensions/sdktools/extension.h

extensions/sdktools/voice.cpp

extensions/sdktools/extension.cpp

extensions/sdktools/hooks.cpp

extensions/sdktools/extension.cpp

Update from master

extensions/sdktools/extension.cpp

KyleSanderson

@asherkin I think this is solid enough (after the final bug) to get into the tree. If there's quirks or other stuff they shouldn't be catastrophic.

extensions/sdktools/voice.cpp

KyleSanderson · 2020-08-07T02:17:15Z

@asherkin what's the skinny on this one?

asherkin · 2020-08-15T17:46:07Z

Sorry for the delay cycling back to this, things have been super crazy with moving.

This is all looking good to me other than one issue, which is that the native is a no-op if there are no active consumers of the hook. I think we should just pull this in without the native to get the hook in-tree, as plugins can easily re-build the native behaviour using the hook and it can always be discussed separately if super common.

Was going to make that change myself before pulling it (and get someone else to do a final review), but it has been too long already so leaving this comment with the reasoning if you or KyleS want to make that change before I get a chance (but I'll make sure to review and pull if that happens.)

asherkin

LGTM, nice work!

Update basevotes

fd8ed94

When a player leaves during a voteban, he will be banned anyway. Also added a cvar with a ban time setting.

Headline added the Feature Request user requested feature label May 8, 2020

Headline approved these changes May 8, 2020

View reviewed changes

Update basevotes.sp

d3e462b

KyleSanderson requested changes Jul 9, 2020

View reviewed changes

extensions/sdktools/extension.cpp Outdated Show resolved Hide resolved

accelerator74 requested a review from KyleSanderson July 9, 2020 05:17

KyleSanderson requested changes Jul 9, 2020

View reviewed changes

extensions/sdktools/voice.cpp Outdated Show resolved Hide resolved

extensions/sdktools/voice.cpp Show resolved Hide resolved

accelerator74 requested a review from KyleSanderson July 9, 2020 06:44

KyleSanderson requested changes Jul 10, 2020

View reviewed changes

extensions/sdktools/voice.cpp Outdated Show resolved Hide resolved

accelerator74 requested a review from KyleSanderson July 10, 2020 06:55

KyleSanderson requested changes Jul 10, 2020

View reviewed changes

extensions/sdktools/hooks.cpp Show resolved Hide resolved

extensions/sdktools/hooks.cpp Outdated Show resolved Hide resolved

asherkin requested changes Jul 11, 2020

View reviewed changes

accelerator74 added 8 commits July 11, 2020 08:04

Added VoiceHook functions

d092880

Update extension.h

fcc38e3

Update extension.h

b17cd3c

Code optimization

48c6957

Added support for more engines

ef9850e

Invalidate timers

06dc8c8

Merge pull request #2 from alliedmodders/master

4976db3

Update from master

Fixes

ae7d8b0

accelerator74 requested a review from KyleSanderson July 11, 2020 05:51

accelerator74 requested a review from asherkin July 11, 2020 05:51

Update extension.cpp

3279f5f

accelerator74 commented Jul 11, 2020

View reviewed changes

extensions/sdktools/extension.cpp Show resolved Hide resolved

KyleSanderson requested changes Jul 12, 2020

View reviewed changes

extensions/sdktools/voice.cpp Outdated Show resolved Hide resolved

Update voice.cpp

a1ae7f7

accelerator74 requested a review from KyleSanderson July 12, 2020 18:57

correct Forward event type to ET_Ignore.

a012637

KyleSanderson approved these changes Jul 14, 2020

View reviewed changes

Scags mentioned this pull request Aug 3, 2020

No way to check BLUs for microphone? Scags/TF2-Jailbreak-Redux#85

Open

KyleSanderson added 2 commits August 16, 2020 15:55

sdktools_voice: de-implement IsClientSpeaking

e420249

sdktools_voice: Add notice/unbind IsClientSpeaking

bd82851

asherkin approved these changes Aug 18, 2020

View reviewed changes

KyleSanderson merged commit 1b86c85 into alliedmodders:master Aug 18, 2020

accelerator74 deleted the voicehook branch June 12, 2021 10:20

Uh oh!

Conversation

accelerator74 commented Apr 26, 2020

Uh oh!

JoinedSenses commented Apr 26, 2020

Uh oh!

accelerator74 commented Apr 26, 2020

Uh oh!

CrazyHackGUT commented Apr 26, 2020

Uh oh!

accelerator74 commented Apr 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oscar-wos commented May 2, 2020

Uh oh!

Headline left a comment

Choose a reason for hiding this comment

Uh oh!

KyleSanderson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

KyleSanderson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

accelerator74 commented Jul 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KyleSanderson commented Jul 10, 2020

Uh oh!

KyleSanderson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

KyleSanderson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

accelerator74 commented Jul 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asherkin commented Jul 11, 2020

Uh oh!

asherkin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

KyleSanderson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

KyleSanderson commented Aug 7, 2020

Uh oh!

asherkin commented Aug 15, 2020

Uh oh!

asherkin left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

accelerator74 commented Apr 27, 2020 •

edited

Loading

accelerator74 commented Jul 9, 2020 •

edited

Loading

accelerator74 commented Jul 10, 2020 •

edited

Loading