瀏覽代碼

feat(ts) convert MediaType and its usages

dev1
Gary Hunt 3 年之前
父節點
當前提交
6d428ca19b
沒有連結到貢獻者的電子郵件帳戶。
共有 39 個檔案被更改,包括 91 行新增93 行删除
  1. 1
    1
      JitsiConference.js
  2. 1
    1
      JitsiConferenceEventManager.js
  3. 1
    1
      JitsiMediaDevices.js
  4. 1
    1
      JitsiMeetJS.js
  5. 1
    1
      JitsiParticipant.js
  6. 1
    1
      modules/RTC/CodecSelection.js
  7. 1
    1
      modules/RTC/JitsiLocalTrack.js
  8. 1
    1
      modules/RTC/JitsiTrack.js
  9. 1
    1
      modules/RTC/RTC.js
  10. 1
    1
      modules/RTC/TPCUtils.js
  11. 1
    1
      modules/RTC/TraceablePeerConnection.js
  12. 1
    1
      modules/connectivity/ParticipantConnectionStatus.js
  13. 1
    1
      modules/proxyconnection/ProxyConnectionService.js
  14. 1
    1
      modules/sdp/LocalSdpMunger.js
  15. 1
    1
      modules/sdp/RtxModifier.js
  16. 1
    1
      modules/sdp/SDPSimulcast.spec.js
  17. 1
    1
      modules/sdp/SdpConsistency.js
  18. 3
    3
      modules/sdp/SdpSimulcast.ts
  19. 1
    1
      modules/statistics/AudioOutputProblemDetector.js
  20. 1
    1
      modules/statistics/AvgRTPStatsReporter.js
  21. 1
    1
      modules/statistics/RTPStatsCollector.js
  22. 1
    1
      modules/xmpp/AVModeration.js
  23. 1
    1
      modules/xmpp/ChatRoom.js
  24. 1
    1
      modules/xmpp/JingleHelperFunctions.js
  25. 1
    1
      modules/xmpp/JingleSessionPC.js
  26. 1
    1
      modules/xmpp/SignalingLayerImpl.js
  27. 1
    1
      modules/xmpp/SignalingLayerImpl.spec.js
  28. 1
    1
      modules/xmpp/strophe.jingle.js
  29. 0
    14
      service/RTC/MediaType.js
  30. 6
    12
      service/RTC/MediaType.spec.ts
  31. 16
    0
      service/RTC/MediaType.ts
  32. 1
    1
      service/RTC/SignalingLayer.js
  33. 6
    6
      types/auto/JitsiConference.d.ts
  34. 2
    2
      types/auto/JitsiParticipant.d.ts
  35. 3
    3
      types/auto/modules/RTC/RTC.d.ts
  36. 7
    7
      types/auto/modules/RTC/TraceablePeerConnection.d.ts
  37. 2
    2
      types/auto/modules/xmpp/ChatRoom.d.ts
  38. 14
    12
      types/auto/service/RTC/MediaType.d.ts
  39. 4
    4
      types/auto/service/RTC/SignalingLayer.d.ts

+ 1
- 1
JitsiConference.js 查看文件

54
 } from './modules/xmpp/xmpp';
54
 } from './modules/xmpp/xmpp';
55
 import BridgeVideoType from './service/RTC/BridgeVideoType';
55
 import BridgeVideoType from './service/RTC/BridgeVideoType';
56
 import CodecMimeType from './service/RTC/CodecMimeType';
56
 import CodecMimeType from './service/RTC/CodecMimeType';
57
-import * as MediaType from './service/RTC/MediaType';
57
+import { MediaType } from './service/RTC/MediaType';
58
 import RTCEvents from './service/RTC/RTCEvents';
58
 import RTCEvents from './service/RTC/RTCEvents';
59
 import { getSourceNameForJitsiTrack } from './service/RTC/SignalingLayer';
59
 import { getSourceNameForJitsiTrack } from './service/RTC/SignalingLayer';
60
 import VideoType from './service/RTC/VideoType';
60
 import VideoType from './service/RTC/VideoType';

+ 1
- 1
JitsiConferenceEventManager.js 查看文件

6
 import { SPEAKERS_AUDIO_LEVELS } from './modules/statistics/constants';
6
 import { SPEAKERS_AUDIO_LEVELS } from './modules/statistics/constants';
7
 import Statistics from './modules/statistics/statistics';
7
 import Statistics from './modules/statistics/statistics';
8
 import EventEmitterForwarder from './modules/util/EventEmitterForwarder';
8
 import EventEmitterForwarder from './modules/util/EventEmitterForwarder';
9
-import * as MediaType from './service/RTC/MediaType';
9
+import { MediaType } from './service/RTC/MediaType';
10
 import RTCEvents from './service/RTC/RTCEvents';
10
 import RTCEvents from './service/RTC/RTCEvents';
11
 import VideoType from './service/RTC/VideoType';
11
 import VideoType from './service/RTC/VideoType';
12
 import AuthenticationEvents
12
 import AuthenticationEvents

+ 1
- 1
JitsiMediaDevices.js 查看文件

4
 import RTC from './modules/RTC/RTC';
4
 import RTC from './modules/RTC/RTC';
5
 import browser from './modules/browser';
5
 import browser from './modules/browser';
6
 import Statistics from './modules/statistics/statistics';
6
 import Statistics from './modules/statistics/statistics';
7
-import * as MediaType from './service/RTC/MediaType';
7
+import { MediaType } from './service/RTC/MediaType';
8
 import RTCEvents from './service/RTC/RTCEvents';
8
 import RTCEvents from './service/RTC/RTCEvents';
9
 
9
 
10
 const AUDIO_PERMISSION_NAME = 'microphone';
10
 const AUDIO_PERMISSION_NAME = 'microphone';

+ 1
- 1
JitsiMeetJS.js 查看文件

33
 import ScriptUtil from './modules/util/ScriptUtil';
33
 import ScriptUtil from './modules/util/ScriptUtil';
34
 import * as VideoSIPGWConstants from './modules/videosipgw/VideoSIPGWConstants';
34
 import * as VideoSIPGWConstants from './modules/videosipgw/VideoSIPGWConstants';
35
 import AudioMixer from './modules/webaudio/AudioMixer';
35
 import AudioMixer from './modules/webaudio/AudioMixer';
36
-import * as MediaType from './service/RTC/MediaType';
36
+import { MediaType } from './service/RTC/MediaType';
37
 import * as ConnectionQualityEvents
37
 import * as ConnectionQualityEvents
38
     from './service/connectivity/ConnectionQualityEvents';
38
     from './service/connectivity/ConnectionQualityEvents';
39
 import * as E2ePingEvents from './service/e2eping/E2ePingEvents';
39
 import * as E2ePingEvents from './service/e2eping/E2ePingEvents';

+ 1
- 1
JitsiParticipant.js 查看文件

5
 import * as JitsiConferenceEvents from './JitsiConferenceEvents';
5
 import * as JitsiConferenceEvents from './JitsiConferenceEvents';
6
 import { ParticipantConnectionStatus }
6
 import { ParticipantConnectionStatus }
7
     from './modules/connectivity/ParticipantConnectionStatus';
7
     from './modules/connectivity/ParticipantConnectionStatus';
8
-import * as MediaType from './service/RTC/MediaType';
8
+import { MediaType } from './service/RTC/MediaType';
9
 
9
 
10
 /**
10
 /**
11
  * Represents a participant in (i.e. a member of) a conference.
11
  * Represents a participant in (i.e. a member of) a conference.

+ 1
- 1
modules/RTC/CodecSelection.js 查看文件

3
 
3
 
4
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
4
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
5
 import CodecMimeType from '../../service/RTC/CodecMimeType';
5
 import CodecMimeType from '../../service/RTC/CodecMimeType';
6
-import * as MediaType from '../../service/RTC/MediaType';
6
+import { MediaType } from '../../service/RTC/MediaType';
7
 import browser from '../browser';
7
 import browser from '../browser';
8
 
8
 
9
 const logger = getLogger(__filename);
9
 const logger = getLogger(__filename);

+ 1
- 1
modules/RTC/JitsiLocalTrack.js 查看文件

11
     TRACK_MUTE_CHANGED
11
     TRACK_MUTE_CHANGED
12
 } from '../../JitsiTrackEvents';
12
 } from '../../JitsiTrackEvents';
13
 import CameraFacingMode from '../../service/RTC/CameraFacingMode';
13
 import CameraFacingMode from '../../service/RTC/CameraFacingMode';
14
-import * as MediaType from '../../service/RTC/MediaType';
14
+import { MediaType } from '../../service/RTC/MediaType';
15
 import RTCEvents from '../../service/RTC/RTCEvents';
15
 import RTCEvents from '../../service/RTC/RTCEvents';
16
 import VideoType from '../../service/RTC/VideoType';
16
 import VideoType from '../../service/RTC/VideoType';
17
 import {
17
 import {

+ 1
- 1
modules/RTC/JitsiTrack.js 查看文件

2
 import EventEmitter from 'events';
2
 import EventEmitter from 'events';
3
 
3
 
4
 import * as JitsiTrackEvents from '../../JitsiTrackEvents';
4
 import * as JitsiTrackEvents from '../../JitsiTrackEvents';
5
-import * as MediaType from '../../service/RTC/MediaType';
5
+import { MediaType } from '../../service/RTC/MediaType';
6
 import browser from '../browser';
6
 import browser from '../browser';
7
 
7
 
8
 import RTCUtils from './RTCUtils';
8
 import RTCUtils from './RTCUtils';

+ 1
- 1
modules/RTC/RTC.js 查看文件

2
 
2
 
3
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
3
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
4
 import BridgeVideoType from '../../service/RTC/BridgeVideoType';
4
 import BridgeVideoType from '../../service/RTC/BridgeVideoType';
5
-import * as MediaType from '../../service/RTC/MediaType';
5
+import { MediaType } from '../../service/RTC/MediaType';
6
 import RTCEvents from '../../service/RTC/RTCEvents';
6
 import RTCEvents from '../../service/RTC/RTCEvents';
7
 import browser from '../browser';
7
 import browser from '../browser';
8
 import FeatureFlags from '../flags/FeatureFlags';
8
 import FeatureFlags from '../flags/FeatureFlags';

+ 1
- 1
modules/RTC/TPCUtils.js 查看文件

2
 import transform from 'sdp-transform';
2
 import transform from 'sdp-transform';
3
 
3
 
4
 import MediaDirection from '../../service/RTC/MediaDirection';
4
 import MediaDirection from '../../service/RTC/MediaDirection';
5
-import * as MediaType from '../../service/RTC/MediaType';
5
+import { MediaType } from '../../service/RTC/MediaType';
6
 import VideoType from '../../service/RTC/VideoType';
6
 import VideoType from '../../service/RTC/VideoType';
7
 import browser from '../browser';
7
 import browser from '../browser';
8
 
8
 

+ 1
- 1
modules/RTC/TraceablePeerConnection.js 查看文件

4
 
4
 
5
 import * as CodecMimeType from '../../service/RTC/CodecMimeType';
5
 import * as CodecMimeType from '../../service/RTC/CodecMimeType';
6
 import MediaDirection from '../../service/RTC/MediaDirection';
6
 import MediaDirection from '../../service/RTC/MediaDirection';
7
-import * as MediaType from '../../service/RTC/MediaType';
7
+import { MediaType } from '../../service/RTC/MediaType';
8
 import RTCEvents from '../../service/RTC/RTCEvents';
8
 import RTCEvents from '../../service/RTC/RTCEvents';
9
 import * as SignalingEvents from '../../service/RTC/SignalingEvents';
9
 import * as SignalingEvents from '../../service/RTC/SignalingEvents';
10
 import { getSourceNameForJitsiTrack } from '../../service/RTC/SignalingLayer';
10
 import { getSourceNameForJitsiTrack } from '../../service/RTC/SignalingLayer';

+ 1
- 1
modules/connectivity/ParticipantConnectionStatus.js 查看文件

2
 
2
 
3
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
3
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
4
 import * as JitsiTrackEvents from '../../JitsiTrackEvents';
4
 import * as JitsiTrackEvents from '../../JitsiTrackEvents';
5
-import * as MediaType from '../../service/RTC/MediaType';
5
+import { MediaType } from '../../service/RTC/MediaType';
6
 import RTCEvents from '../../service/RTC/RTCEvents';
6
 import RTCEvents from '../../service/RTC/RTCEvents';
7
 import { createParticipantConnectionStatusEvent } from '../../service/statistics/AnalyticsEvents';
7
 import { createParticipantConnectionStatusEvent } from '../../service/statistics/AnalyticsEvents';
8
 import browser from '../browser';
8
 import browser from '../browser';

+ 1
- 1
modules/proxyconnection/ProxyConnectionService.js 查看文件

3
 import { getLogger } from '@jitsi/logger';
3
 import { getLogger } from '@jitsi/logger';
4
 import { $iq } from 'strophe.js';
4
 import { $iq } from 'strophe.js';
5
 
5
 
6
-import * as MediaType from '../../service/RTC/MediaType';
6
+import { MediaType } from '../../service/RTC/MediaType';
7
 import VideoType from '../../service/RTC/VideoType';
7
 import VideoType from '../../service/RTC/VideoType';
8
 import RTC from '../RTC/RTC';
8
 import RTC from '../RTC/RTC';
9
 
9
 

+ 1
- 1
modules/sdp/LocalSdpMunger.js 查看文件

1
 import { getLogger } from '@jitsi/logger';
1
 import { getLogger } from '@jitsi/logger';
2
 
2
 
3
 import MediaDirection from '../../service/RTC/MediaDirection';
3
 import MediaDirection from '../../service/RTC/MediaDirection';
4
-import * as MediaType from '../../service/RTC/MediaType';
4
+import { MediaType } from '../../service/RTC/MediaType';
5
 import { getSourceNameForJitsiTrack } from '../../service/RTC/SignalingLayer';
5
 import { getSourceNameForJitsiTrack } from '../../service/RTC/SignalingLayer';
6
 import VideoType from '../../service/RTC/VideoType';
6
 import VideoType from '../../service/RTC/VideoType';
7
 import FeatureFlags from '../flags/FeatureFlags';
7
 import FeatureFlags from '../flags/FeatureFlags';

+ 1
- 1
modules/sdp/RtxModifier.js 查看文件

1
 import { getLogger } from '@jitsi/logger';
1
 import { getLogger } from '@jitsi/logger';
2
 
2
 
3
 import MediaDirection from '../../service/RTC/MediaDirection';
3
 import MediaDirection from '../../service/RTC/MediaDirection';
4
-import * as MediaType from '../../service/RTC/MediaType';
4
+import { MediaType } from '../../service/RTC/MediaType';
5
 
5
 
6
 import SDPUtil from './SDPUtil';
6
 import SDPUtil from './SDPUtil';
7
 import { parseSecondarySSRC, SdpTransformWrap } from './SdpTransformUtil';
7
 import { parseSecondarySSRC, SdpTransformWrap } from './SdpTransformUtil';

+ 1
- 1
modules/sdp/SDPSimulcast.spec.js 查看文件

1
 import * as transform from 'sdp-transform';
1
 import * as transform from 'sdp-transform';
2
 
2
 
3
-import * as MediaType from '../../service/RTC/MediaType';
3
+import { MediaType } from '../../service/RTC/MediaType';
4
 
4
 
5
 import { default as SampleSdpStrings } from './SampleSdpStrings.js';
5
 import { default as SampleSdpStrings } from './SampleSdpStrings.js';
6
 import SdpSimulcast from './SdpSimulcast.ts';
6
 import SdpSimulcast from './SdpSimulcast.ts';

+ 1
- 1
modules/sdp/SdpConsistency.js 查看文件

1
 import { getLogger } from '@jitsi/logger';
1
 import { getLogger } from '@jitsi/logger';
2
 
2
 
3
-import * as MediaType from '../../service/RTC/MediaType';
3
+import { MediaType } from '../../service/RTC/MediaType';
4
 
4
 
5
 import {
5
 import {
6
     parsePrimarySSRC,
6
     parsePrimarySSRC,

+ 3
- 3
modules/sdp/SdpSimulcast.ts 查看文件

1
 import MediaDirection from '../../service/RTC/MediaDirection';
1
 import MediaDirection from '../../service/RTC/MediaDirection';
2
-import * as MediaType from '../../service/RTC/MediaType';
2
+import { MediaType } from '../../service/RTC/MediaType';
3
 
3
 
4
 import * as transform from 'sdp-transform';
4
 import * as transform from 'sdp-transform';
5
 
5
 
119
 
119
 
120
         // Generate SIM layers.
120
         // Generate SIM layers.
121
         const simSsrcs = [];
121
         const simSsrcs = [];
122
-    
122
+
123
         for (let i = 0; i < this._options.numOfLayers - 1; ++i) {
123
         for (let i = 0; i < this._options.numOfLayers - 1; ++i) {
124
             const simSsrc = this._generateSsrc();
124
             const simSsrc = this._generateSsrc();
125
 
125
 
132
             semantics: 'SIM',
132
             semantics: 'SIM',
133
             ssrcs: primarySsrc + ' ' + simSsrcs.join(' ')
133
             ssrcs: primarySsrc + ' ' + simSsrcs.join(' ')
134
         });
134
         });
135
-    
135
+
136
         return mLine;
136
         return mLine;
137
     }
137
     }
138
 
138
 

+ 1
- 1
modules/statistics/AudioOutputProblemDetector.js 查看文件

1
 import { getLogger } from '@jitsi/logger';
1
 import { getLogger } from '@jitsi/logger';
2
 
2
 
3
 import * as ConferenceEvents from '../../JitsiConferenceEvents';
3
 import * as ConferenceEvents from '../../JitsiConferenceEvents';
4
-import * as MediaType from '../../service/RTC/MediaType';
4
+import { MediaType } from '../../service/RTC/MediaType';
5
 import * as ConnectionQualityEvents from '../../service/connectivity/ConnectionQualityEvents';
5
 import * as ConnectionQualityEvents from '../../service/connectivity/ConnectionQualityEvents';
6
 import { createAudioOutputProblemEvent } from '../../service/statistics/AnalyticsEvents';
6
 import { createAudioOutputProblemEvent } from '../../service/statistics/AnalyticsEvents';
7
 
7
 

+ 1
- 1
modules/statistics/AvgRTPStatsReporter.js 查看文件

2
 import isEqual from 'lodash.isequal';
2
 import isEqual from 'lodash.isequal';
3
 
3
 
4
 import * as ConferenceEvents from '../../JitsiConferenceEvents';
4
 import * as ConferenceEvents from '../../JitsiConferenceEvents';
5
-import * as MediaType from '../../service/RTC/MediaType';
5
+import { MediaType } from '../../service/RTC/MediaType';
6
 import * as VideoType from '../../service/RTC/VideoType';
6
 import * as VideoType from '../../service/RTC/VideoType';
7
 import * as ConnectionQualityEvents
7
 import * as ConnectionQualityEvents
8
     from '../../service/connectivity/ConnectionQualityEvents';
8
     from '../../service/connectivity/ConnectionQualityEvents';

+ 1
- 1
modules/statistics/RTPStatsCollector.js 查看文件

1
 import { getLogger } from '@jitsi/logger';
1
 import { getLogger } from '@jitsi/logger';
2
 
2
 
3
-import * as MediaType from '../../service/RTC/MediaType';
3
+import { MediaType } from '../../service/RTC/MediaType';
4
 import * as StatisticsEvents from '../../service/statistics/Events';
4
 import * as StatisticsEvents from '../../service/statistics/Events';
5
 import browser from '../browser';
5
 import browser from '../browser';
6
 
6
 

+ 1
- 1
modules/xmpp/AVModeration.js 查看文件

1
 import { getLogger } from '@jitsi/logger';
1
 import { getLogger } from '@jitsi/logger';
2
 import { $msg } from 'strophe.js';
2
 import { $msg } from 'strophe.js';
3
 
3
 
4
-import * as MediaType from '../../service/RTC/MediaType';
4
+import { MediaType } from '../../service/RTC/MediaType';
5
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
5
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
6
 
6
 
7
 const logger = getLogger(__filename);
7
 const logger = getLogger(__filename);

+ 1
- 1
modules/xmpp/ChatRoom.js 查看文件

5
 import { $iq, $msg, $pres, Strophe } from 'strophe.js';
5
 import { $iq, $msg, $pres, Strophe } from 'strophe.js';
6
 
6
 
7
 import * as JitsiTranscriptionStatus from '../../JitsiTranscriptionStatus';
7
 import * as JitsiTranscriptionStatus from '../../JitsiTranscriptionStatus';
8
-import * as MediaType from '../../service/RTC/MediaType';
8
+import { MediaType } from '../../service/RTC/MediaType';
9
 import VideoType from '../../service/RTC/VideoType';
9
 import VideoType from '../../service/RTC/VideoType';
10
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
10
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
11
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
11
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';

+ 1
- 1
modules/xmpp/JingleHelperFunctions.js 查看文件

3
 import { getLogger } from '@jitsi/logger';
3
 import { getLogger } from '@jitsi/logger';
4
 import { $build } from 'strophe.js';
4
 import { $build } from 'strophe.js';
5
 
5
 
6
-import * as MediaType from '../../service/RTC/MediaType';
6
+import { MediaType } from '../../service/RTC/MediaType';
7
 import FeatureFlags from '../flags/FeatureFlags';
7
 import FeatureFlags from '../flags/FeatureFlags';
8
 
8
 
9
 const logger = getLogger(__filename);
9
 const logger = getLogger(__filename);

+ 1
- 1
modules/xmpp/JingleSessionPC.js 查看文件

5
 
5
 
6
 import * as CodecMimeType from '../../service/RTC/CodecMimeType';
6
 import * as CodecMimeType from '../../service/RTC/CodecMimeType';
7
 import MediaDirection from '../../service/RTC/MediaDirection';
7
 import MediaDirection from '../../service/RTC/MediaDirection';
8
-import * as MediaType from '../../service/RTC/MediaType';
8
+import { MediaType } from '../../service/RTC/MediaType';
9
 import {
9
 import {
10
     ICE_DURATION,
10
     ICE_DURATION,
11
     ICE_STATE_CHANGED
11
     ICE_STATE_CHANGED

+ 1
- 1
modules/xmpp/SignalingLayerImpl.js 查看文件

1
 import { getLogger } from '@jitsi/logger';
1
 import { getLogger } from '@jitsi/logger';
2
 import { Strophe } from 'strophe.js';
2
 import { Strophe } from 'strophe.js';
3
 
3
 
4
-import * as MediaType from '../../service/RTC/MediaType';
4
+import { MediaType } from '../../service/RTC/MediaType';
5
 import * as SignalingEvents from '../../service/RTC/SignalingEvents';
5
 import * as SignalingEvents from '../../service/RTC/SignalingEvents';
6
 import SignalingLayer, { getMediaTypeFromSourceName } from '../../service/RTC/SignalingLayer';
6
 import SignalingLayer, { getMediaTypeFromSourceName } from '../../service/RTC/SignalingLayer';
7
 import VideoType from '../../service/RTC/VideoType';
7
 import VideoType from '../../service/RTC/VideoType';

+ 1
- 1
modules/xmpp/SignalingLayerImpl.spec.js 查看文件

1
-import * as MediaType from '../../service/RTC/MediaType';
1
+import { MediaType } from '../../service/RTC/MediaType';
2
 import * as SignalingEvents from '../../service/RTC/SignalingEvents';
2
 import * as SignalingEvents from '../../service/RTC/SignalingEvents';
3
 import { getSourceNameForJitsiTrack } from '../../service/RTC/SignalingLayer';
3
 import { getSourceNameForJitsiTrack } from '../../service/RTC/SignalingLayer';
4
 import VideoType from '../../service/RTC/VideoType';
4
 import VideoType from '../../service/RTC/VideoType';

+ 1
- 1
modules/xmpp/strophe.jingle.js 查看文件

3
 import { getLogger } from '@jitsi/logger';
3
 import { getLogger } from '@jitsi/logger';
4
 import { $iq, Strophe } from 'strophe.js';
4
 import { $iq, Strophe } from 'strophe.js';
5
 
5
 
6
-import * as MediaType from '../../service/RTC/MediaType';
6
+import { MediaType } from '../../service/RTC/MediaType';
7
 import {
7
 import {
8
     ACTION_JINGLE_TR_RECEIVED,
8
     ACTION_JINGLE_TR_RECEIVED,
9
     ACTION_JINGLE_TR_SUCCESS,
9
     ACTION_JINGLE_TR_SUCCESS,

+ 0
- 14
service/RTC/MediaType.js 查看文件

1
-/**
2
- * The audio type.
3
- */
4
-export const AUDIO = 'audio';
5
-
6
-/**
7
- * The presenter type.
8
- */
9
-export const PRESENTER = 'presenter';
10
-
11
-/**
12
- * The video type.
13
- */
14
-export const VIDEO = 'video';

+ 6
- 12
service/RTC/MediaType.spec.ts 查看文件

4
 
4
 
5
 describe( "/service/RTC/MediaType members", () => {
5
 describe( "/service/RTC/MediaType members", () => {
6
     const {
6
     const {
7
-        AUDIO,
8
-        PRESENTER,
9
-        VIDEO,
10
         MediaType,
7
         MediaType,
11
         ...others
8
         ...others
12
-    } = exported as any; // TODO: remove cast after typescript conversion
9
+    } = exported;
13
 
10
 
14
     it( "known members", () => {
11
     it( "known members", () => {
15
-        expect( AUDIO ).toBe( 'audio' );
16
-        expect( PRESENTER ).toBe( 'presenter' );
17
-        expect( VIDEO ).toBe( 'video' );
18
-        if ( MediaType ) {
19
-            expect( MediaType.AUDIO ).toBe( 'audio' );
20
-            expect( MediaType.PRESENTER ).toBe( 'presenter' );
21
-            expect( MediaType.VIDEO ).toBe( 'video' );
22
-        }
12
+        expect( MediaType ).toBeDefined();
13
+
14
+        expect( MediaType.AUDIO ).toBe( 'audio' );
15
+        expect( MediaType.PRESENTER ).toBe( 'presenter' );
16
+        expect( MediaType.VIDEO ).toBe( 'video' );
23
     } );
17
     } );
24
 
18
 
25
     it( "unknown members", () => {
19
     it( "unknown members", () => {

+ 16
- 0
service/RTC/MediaType.ts 查看文件

1
+export enum MediaType {
2
+    /**
3
+     * The audio type.
4
+     */
5
+    AUDIO = 'audio',
6
+
7
+    /**
8
+     * The presenter type.
9
+     */
10
+    PRESENTER = 'presenter',
11
+
12
+    /**
13
+     * The video type.
14
+     */
15
+    VIDEO = 'video'
16
+}

+ 1
- 1
service/RTC/SignalingLayer.js 查看文件

1
 
1
 
2
 import Listenable from '../../modules/util/Listenable';
2
 import Listenable from '../../modules/util/Listenable';
3
-import * as MediaType from '../../service/RTC/MediaType';
3
+import { MediaType } from '../../service/RTC/MediaType';
4
 
4
 
5
 /**
5
 /**
6
  * @typedef {string} EndpointId
6
  * @typedef {string} EndpointId

+ 6
- 6
types/auto/JitsiConference.d.ts 查看文件

305
      * specific type is given.
305
      * specific type is given.
306
      * @param {MediaType} [mediaType] Optional media type (audio or video).
306
      * @param {MediaType} [mediaType] Optional media type (audio or video).
307
      */
307
      */
308
-    getLocalTracks(mediaType?: typeof MediaType): any[];
308
+    getLocalTracks(mediaType?: MediaType): any[];
309
     /**
309
     /**
310
      * Obtains local audio track.
310
      * Obtains local audio track.
311
      * @return {JitsiLocalTrack|null}
311
      * @return {JitsiLocalTrack|null}
1160
      * Enables AV Moderation.
1160
      * Enables AV Moderation.
1161
      * @param {MediaType} mediaType "audio" or "video"
1161
      * @param {MediaType} mediaType "audio" or "video"
1162
      */
1162
      */
1163
-    enableAVModeration(mediaType: typeof MediaType): void;
1163
+    enableAVModeration(mediaType: MediaType): void;
1164
     /**
1164
     /**
1165
      * Disables AV Moderation.
1165
      * Disables AV Moderation.
1166
      * @param {MediaType} mediaType "audio" or "video"
1166
      * @param {MediaType} mediaType "audio" or "video"
1167
      */
1167
      */
1168
-    disableAVModeration(mediaType: typeof MediaType): void;
1168
+    disableAVModeration(mediaType: MediaType): void;
1169
     /**
1169
     /**
1170
      * Approve participant access to certain media, allows unmuting audio or video.
1170
      * Approve participant access to certain media, allows unmuting audio or video.
1171
      *
1171
      *
1172
      * @param {MediaType} mediaType "audio" or "video"
1172
      * @param {MediaType} mediaType "audio" or "video"
1173
      * @param id the id of the participant.
1173
      * @param id the id of the participant.
1174
      */
1174
      */
1175
-    avModerationApprove(mediaType: typeof MediaType, id: any): void;
1175
+    avModerationApprove(mediaType: MediaType, id: any): void;
1176
     /**
1176
     /**
1177
      * Reject participant access to certain media, blocks unmuting audio or video.
1177
      * Reject participant access to certain media, blocks unmuting audio or video.
1178
      *
1178
      *
1179
      * @param {MediaType} mediaType "audio" or "video"
1179
      * @param {MediaType} mediaType "audio" or "video"
1180
      * @param id the id of the participant.
1180
      * @param id the id of the participant.
1181
      */
1181
      */
1182
-    avModerationReject(mediaType: typeof MediaType, id: any): void;
1182
+    avModerationReject(mediaType: MediaType, id: any): void;
1183
     /**
1183
     /**
1184
      * Returns the breakout rooms manager object.
1184
      * Returns the breakout rooms manager object.
1185
      *
1185
      *
1224
 import NoAudioSignalDetection from "./modules/detection/NoAudioSignalDetection";
1224
 import NoAudioSignalDetection from "./modules/detection/NoAudioSignalDetection";
1225
 import Jvb121EventGenerator from "./modules/event/Jvb121EventGenerator";
1225
 import Jvb121EventGenerator from "./modules/event/Jvb121EventGenerator";
1226
 import P2PDominantSpeakerDetection from "./modules/detection/P2PDominantSpeakerDetection";
1226
 import P2PDominantSpeakerDetection from "./modules/detection/P2PDominantSpeakerDetection";
1227
-import * as MediaType from "./service/RTC/MediaType";
1227
+import { MediaType } from "./service/RTC/MediaType";
1228
 import Transcriber from "./modules/transcription/transcriber";
1228
 import Transcriber from "./modules/transcription/transcriber";
1229
 import JitsiParticipant from "./JitsiParticipant";
1229
 import JitsiParticipant from "./JitsiParticipant";
1230
 import IceFailedHandling from "./modules/connectivity/IceFailedHandling";
1230
 import IceFailedHandling from "./modules/connectivity/IceFailedHandling";

+ 2
- 2
types/auto/JitsiParticipant.d.ts 查看文件

84
      * @returns {Array.<JitsiTrack>} an array of media tracks for this
84
      * @returns {Array.<JitsiTrack>} an array of media tracks for this
85
      * participant, for given media type.
85
      * participant, for given media type.
86
      */
86
      */
87
-    getTracksByMediaType(mediaType: typeof MediaType): Array<any>;
87
+    getTracksByMediaType(mediaType: MediaType): Array<any>;
88
     /**
88
     /**
89
      * @returns {String} The ID of this participant.
89
      * @returns {String} The ID of this participant.
90
      */
90
      */
204
     setBotType(newBotType: string): void;
204
     setBotType(newBotType: string): void;
205
     _botType: string;
205
     _botType: string;
206
 }
206
 }
207
-import * as MediaType from "./service/RTC/MediaType";
207
+import { MediaType } from "./service/RTC/MediaType";

+ 3
- 3
types/auto/modules/RTC/RTC.d.ts 查看文件

387
      * @param {MediaType} [mediaType] Optional media type filter.
387
      * @param {MediaType} [mediaType] Optional media type filter.
388
      * (audio or video).
388
      * (audio or video).
389
      */
389
      */
390
-    getLocalTracks(mediaType?: typeof MediaType): any[];
390
+    getLocalTracks(mediaType?: MediaType): any[];
391
     /**
391
     /**
392
      * Obtains all remote tracks currently known to this RTC module instance.
392
      * Obtains all remote tracks currently known to this RTC module instance.
393
      * @param {MediaType} [mediaType] The remote tracks will be filtered
393
      * @param {MediaType} [mediaType] The remote tracks will be filtered
394
      *      by their media type if this argument is specified.
394
      *      by their media type if this argument is specified.
395
      * @return {Array<JitsiRemoteTrack>}
395
      * @return {Array<JitsiRemoteTrack>}
396
      */
396
      */
397
-    getRemoteTracks(mediaType?: typeof MediaType): Array<any>;
397
+    getRemoteTracks(mediaType?: MediaType): Array<any>;
398
     /**
398
     /**
399
      * Set mute for all local audio streams attached to the conference.
399
      * Set mute for all local audio streams attached to the conference.
400
      * @param value The mute value.
400
      * @param value The mute value.
466
 import TraceablePeerConnection from "./TraceablePeerConnection";
466
 import TraceablePeerConnection from "./TraceablePeerConnection";
467
 import BridgeChannel from "./BridgeChannel";
467
 import BridgeChannel from "./BridgeChannel";
468
 import JitsiLocalTrack from "./JitsiLocalTrack";
468
 import JitsiLocalTrack from "./JitsiLocalTrack";
469
-import * as MediaType from "../../service/RTC/MediaType";
469
+import { MediaType } from "../../service/RTC/MediaType";

+ 7
- 7
types/auto/modules/RTC/TraceablePeerConnection.d.ts 查看文件

129
      * remote tracks.
129
      * remote tracks.
130
      * @type {Map<string, Map<MediaType, Set<JitsiRemoteTrack>>>}
130
      * @type {Map<string, Map<MediaType, Set<JitsiRemoteTrack>>>}
131
      */
131
      */
132
-    remoteTracks: Map<string, Map<typeof MediaType, Set<JitsiRemoteTrack>>>;
132
+    remoteTracks: Map<string, Map<MediaType, Set<JitsiRemoteTrack>>>;
133
     /**
133
     /**
134
      * A map which stores local tracks mapped by {@link JitsiLocalTrack.rtcId}
134
      * A map which stores local tracks mapped by {@link JitsiLocalTrack.rtcId}
135
      * @type {Map<number, JitsiLocalTrack>}
135
      * @type {Map<number, JitsiLocalTrack>}
305
      * @param {MediaType} [mediaType]
305
      * @param {MediaType} [mediaType]
306
      * @return {Array<JitsiLocalTrack>}
306
      * @return {Array<JitsiLocalTrack>}
307
      */
307
      */
308
-    getLocalTracks(mediaType?: typeof MediaType): Array<any>;
308
+    getLocalTracks(mediaType?: MediaType): Array<any>;
309
     /**
309
     /**
310
      * Retrieves the local video tracks.
310
      * Retrieves the local video tracks.
311
      *
311
      *
319
      * @param {MediaType} mediaType - The media type.
319
      * @param {MediaType} mediaType - The media type.
320
      * @return {boolean}
320
      * @return {boolean}
321
      */
321
      */
322
-    hasAnyTracksOfType(mediaType: typeof MediaType): boolean;
322
+    hasAnyTracksOfType(mediaType: MediaType): boolean;
323
     /**
323
     /**
324
      * Obtains all remote tracks currently known to this PeerConnection instance.
324
      * Obtains all remote tracks currently known to this PeerConnection instance.
325
      *
325
      *
328
      * specified.
328
      * specified.
329
      * @return {Array<JitsiRemoteTrack>}
329
      * @return {Array<JitsiRemoteTrack>}
330
      */
330
      */
331
-    getRemoteTracks(endpointId?: string, mediaType?: typeof MediaType): Array<JitsiRemoteTrack>;
331
+    getRemoteTracks(endpointId?: string, mediaType?: MediaType): Array<JitsiRemoteTrack>;
332
     /**
332
     /**
333
      * Parses the remote description and returns the sdp lines of the sources associated with a remote participant.
333
      * Parses the remote description and returns the sdp lines of the sources associated with a remote participant.
334
      *
334
      *
386
      * @param {boolean} muted the initial muted status
386
      * @param {boolean} muted the initial muted status
387
      * @param {String} sourceName the track's source name
387
      * @param {String} sourceName the track's source name
388
      */
388
      */
389
-    _createRemoteTrack(ownerEndpointId: string, stream: MediaStream, track: MediaStreamTrack, mediaType: typeof MediaType, videoType?: {
389
+    _createRemoteTrack(ownerEndpointId: string, stream: MediaStream, track: MediaStreamTrack, mediaType: MediaType, videoType?: {
390
         CAMERA: string;
390
         CAMERA: string;
391
         DESKTOP: string;
391
         DESKTOP: string;
392
     }, ssrc: number, muted: boolean, sourceName: string): void;
392
     }, ssrc: number, muted: boolean, sourceName: string): void;
545
     }): void;
545
     }): void;
546
     codecPreference: {
546
     codecPreference: {
547
         enable: boolean;
547
         enable: boolean;
548
-        mediaType: string;
548
+        mediaType: MediaType;
549
         mimeType: {
549
         mimeType: {
550
             H264: string;
550
             H264: string;
551
             OPUS: string;
551
             OPUS: string;
772
     toString(): string;
772
     toString(): string;
773
 }
773
 }
774
 import RTC from "./RTC";
774
 import RTC from "./RTC";
775
-import * as MediaType from "../../service/RTC/MediaType";
775
+import { MediaType } from "../../service/RTC/MediaType";
776
 import JitsiRemoteTrack from "./JitsiRemoteTrack";
776
 import JitsiRemoteTrack from "./JitsiRemoteTrack";
777
 import { TPCUtils } from "./TPCUtils";
777
 import { TPCUtils } from "./TPCUtils";
778
 import SdpConsistency from "../sdp/SdpConsistency";
778
 import SdpConsistency from "../sdp/SdpConsistency";

+ 2
- 2
types/auto/modules/xmpp/ChatRoom.d.ts 查看文件

293
      * info or <tt>null</tt> either if there is no presence available or if
293
      * info or <tt>null</tt> either if there is no presence available or if
294
      * the media type given is invalid.
294
      * the media type given is invalid.
295
      */
295
      */
296
-    getMediaPresenceInfo(endpointId: string, mediaType: typeof MediaType): any;
296
+    getMediaPresenceInfo(endpointId: string, mediaType: MediaType): any;
297
     /**
297
     /**
298
      * Returns the last presence advertised by a MUC member.
298
      * Returns the last presence advertised by a MUC member.
299
      * @param {string} mucNick
299
      * @param {string} mucNick
376
 import AVModeration from "./AVModeration";
376
 import AVModeration from "./AVModeration";
377
 import BreakoutRooms from "./BreakoutRooms";
377
 import BreakoutRooms from "./BreakoutRooms";
378
 import * as JitsiTranscriptionStatus from "../../JitsiTranscriptionStatus";
378
 import * as JitsiTranscriptionStatus from "../../JitsiTranscriptionStatus";
379
-import * as MediaType from "../../service/RTC/MediaType";
379
+import { MediaType } from "../../service/RTC/MediaType";

+ 14
- 12
types/auto/service/RTC/MediaType.d.ts 查看文件

1
-/**
2
- * The audio type.
3
- */
4
-export const AUDIO: "audio";
5
-/**
6
- * The presenter type.
7
- */
8
-export const PRESENTER: "presenter";
9
-/**
10
- * The video type.
11
- */
12
-export const VIDEO: "video";
1
+export declare enum MediaType {
2
+    /**
3
+     * The audio type.
4
+     */
5
+    AUDIO = "audio",
6
+    /**
7
+     * The presenter type.
8
+     */
9
+    PRESENTER = "presenter",
10
+    /**
11
+     * The video type.
12
+     */
13
+    VIDEO = "video"
14
+}

+ 4
- 4
types/auto/service/RTC/SignalingLayer.d.ts 查看文件

19
  * @param {number} trackIdx - Track index (or sender idx? - to be figured out) starting from 0.
19
  * @param {number} trackIdx - Track index (or sender idx? - to be figured out) starting from 0.
20
  * @returns {SourceName} eg. endpointA-v0
20
  * @returns {SourceName} eg. endpointA-v0
21
  */
21
  */
22
-export function getSourceNameForJitsiTrack(endpointId: EndpointId, mediaType: typeof MediaType, trackIdx: number): SourceName;
22
+export function getSourceNameForJitsiTrack(endpointId: EndpointId, mediaType: MediaType, trackIdx: number): SourceName;
23
 /**
23
 /**
24
  * Extracts MediaType from give source name (must be in the correct format as generated by
24
  * Extracts MediaType from give source name (must be in the correct format as generated by
25
  * {@link getSourceNameForJitsiTrack}).
25
  * {@link getSourceNameForJitsiTrack}).
27
  * @param {SourceName} sourceName - the source name.
27
  * @param {SourceName} sourceName - the source name.
28
  * @returns {MediaType}
28
  * @returns {MediaType}
29
  */
29
  */
30
-export function getMediaTypeFromSourceName(sourceName: SourceName): typeof MediaType;
30
+export function getMediaTypeFromSourceName(sourceName: SourceName): MediaType;
31
 /**
31
 /**
32
  * An object that carries the info about specific media type advertised by
32
  * An object that carries the info about specific media type advertised by
33
  * participant in the signaling channel.
33
  * participant in the signaling channel.
61
      *
61
      *
62
      * @deprecated This method is to be replaced with getPeerSourceInfo.
62
      * @deprecated This method is to be replaced with getPeerSourceInfo.
63
      */
63
      */
64
-    getPeerMediaInfo(owner: string, mediaType: typeof MediaType): PeerMediaInfo | null;
64
+    getPeerMediaInfo(owner: string, mediaType: MediaType): PeerMediaInfo | null;
65
     /**
65
     /**
66
      * Obtains the info about a source for given name and endpoint ID.
66
      * Obtains the info about a source for given name and endpoint ID.
67
      * @param {EndpointId} owner - The owner's endpoint ID.
67
      * @param {EndpointId} owner - The owner's endpoint ID.
106
      */
106
      */
107
     videoType: any | undefined;
107
     videoType: any | undefined;
108
 };
108
 };
109
-import * as MediaType from "../../service/RTC/MediaType";
109
+import { MediaType } from "../../service/RTC/MediaType";
110
 import Listenable from "../../modules/util/Listenable";
110
 import Listenable from "../../modules/util/Listenable";

Loading…
取消
儲存