Skip to content

Commit

Permalink
ActiveSpeakerObserver: revert 'dominantspeaker' event changes (#947)
Browse files Browse the repository at this point in the history
Reverts changes in PR #941 to avoid breaking changes.
  • Loading branch information
ibc authored Nov 5, 2022
1 parent d43e2a5 commit 7c04642
Show file tree
Hide file tree
Showing 17 changed files with 80 additions and 55 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

### NEXT

* ...
* `ActiveSpeakerObserver`: Revert 'dominantspeaker' event changes in PR #941 to avoid breaking changes (PR #947).


### 3.11.0
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Try it at [v3demo.mediasoup.org](https://v3demo.mediasoup.org) ([source code](ht

* Iñaki Baz Castillo [[website](https://inakibaz.me)|[github](https://github.com/ibc/)]
* José Luis Millán [[github](https://github.com/jmillan/)]
* Nazar Mokynskyi [[github](https://github.com/nazar-pc/)]


## Social
Expand Down
14 changes: 7 additions & 7 deletions node/lib/ActiveSpeakerObserver.d.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import { EnhancedEventEmitter } from './EnhancedEventEmitter';
import { RtpObserver, RtpObserverEvents, RtpObserverObserverEvents, RtpObserverConstructorOptions } from './RtpObserver';
import { Producer } from './Producer';
export interface ActiveSpeakerObserverOptions {
export declare type ActiveSpeakerObserverOptions = {
interval?: number;
/**
* Custom application data.
*/
appData?: Record<string, unknown>;
}
export interface ActiveSpeakerObserverActivity {
};
export declare type ActiveSpeakerObserverDominantSpeaker = {
/**
* The producer instance.
* The audio Producer instance.
*/
producer: Producer;
}
};
export declare type ActiveSpeakerObserverEvents = RtpObserverEvents & {
dominantspeaker: [Producer];
dominantspeaker: [ActiveSpeakerObserverDominantSpeaker];
};
export declare type ActiveSpeakerObserverObserverEvents = RtpObserverObserverEvents & {
dominantspeaker: [Producer];
dominantspeaker: [ActiveSpeakerObserverDominantSpeaker];
};
declare type RtpObserverObserverConstructorOptions = RtpObserverConstructorOptions;
export declare class ActiveSpeakerObserver extends RtpObserver<ActiveSpeakerObserverEvents> {
Expand Down
2 changes: 1 addition & 1 deletion node/lib/ActiveSpeakerObserver.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions node/lib/ActiveSpeakerObserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ class ActiveSpeakerObserver extends RtpObserver_1.RtpObserver {
const producer = this.getProducerById(data.producerId);
if (!producer)
break;
this.safeEmit('dominantspeaker', producer);
this.observer.safeEmit('dominantspeaker', producer);
const dominantSpeaker = {
producer
};
this.safeEmit('dominantspeaker', dominantSpeaker);
this.observer.safeEmit('dominantspeaker', dominantSpeaker);
break;
}
default:
Expand Down
12 changes: 6 additions & 6 deletions node/lib/AudioLevelObserver.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { EnhancedEventEmitter } from './EnhancedEventEmitter';
import { RtpObserver, RtpObserverEvents, RtpObserverObserverEvents, RtpObserverConstructorOptions } from './RtpObserver';
import { Producer } from './Producer';
export interface AudioLevelObserverOptions {
export declare type AudioLevelObserverOptions = {
/**
* Maximum number of entries in the 'volumes”' event. Default 1.
*/
Expand All @@ -19,18 +19,18 @@ export interface AudioLevelObserverOptions {
* Custom application data.
*/
appData?: Record<string, unknown>;
}
export interface AudioLevelObserverVolume {
};
export declare type AudioLevelObserverVolume = {
/**
* The audio producer instance.
* The audio Producer instance.
*/
producer: Producer;
/**
* The average volume (in dBvo from -127 to 0) of the audio producer in the
* The average volume (in dBvo from -127 to 0) of the audio Producer in the
* last interval.
*/
volume: number;
}
};
export declare type AudioLevelObserverEvents = RtpObserverEvents & {
volumes: [AudioLevelObserverVolume[]];
silence: [];
Expand Down
2 changes: 1 addition & 1 deletion node/lib/AudioLevelObserver.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions node/lib/Transport.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Consumer, ConsumerOptions } from './Consumer';
import { DataProducer, DataProducerOptions } from './DataProducer';
import { DataConsumer, DataConsumerOptions } from './DataConsumer';
import { RtpCapabilities } from './RtpParameters';
export interface TransportListenIp {
export declare type TransportListenIp = {
/**
* Listening IPv4 or IPv6.
*/
Expand All @@ -21,26 +21,26 @@ export interface TransportListenIp {
* private IP).
*/
announcedIp?: string;
}
};
/**
* Transport protocol.
*/
export declare type TransportProtocol = 'udp' | 'tcp';
export interface TransportTuple {
export declare type TransportTuple = {
localIp: string;
localPort: number;
remoteIp?: string;
remotePort?: number;
protocol: TransportProtocol;
}
};
/**
* Valid types for 'trace' event.
*/
export declare type TransportTraceEventType = 'probation' | 'bwe';
/**
* 'trace' event data.
*/
export interface TransportTraceEventData {
export declare type TransportTraceEventData = {
/**
* Trace type.
*/
Expand All @@ -57,7 +57,7 @@ export interface TransportTraceEventData {
* Per type information.
*/
info: any;
}
};
export declare type SctpState = 'new' | 'connecting' | 'connected' | 'failed' | 'closed';
export declare type TransportEvents = {
routerclose: [];
Expand Down
2 changes: 1 addition & 1 deletion node/lib/Transport.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions node/lib/WebRtcServer.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { EnhancedEventEmitter } from './EnhancedEventEmitter';
import { Channel } from './Channel';
import { TransportProtocol } from './Transport';
import { WebRtcTransport } from './WebRtcTransport';
export interface WebRtcServerListenInfo {
export declare type WebRtcServerListenInfo = {
/**
* Network protocol.
*/
Expand All @@ -20,7 +20,7 @@ export interface WebRtcServerListenInfo {
* Listening port.
*/
port?: number;
}
};
export declare type WebRtcServerOptions = {
/**
* Listen infos.
Expand Down
Loading

0 comments on commit 7c04642

Please sign in to comment.