simulcast_rid_auto を削除する

Author: voluntas

instructions.json

@@ -17,9 +17,6 @@
   "simulcastRequestRid": {
     "description": "サイマルキャストで配信されている映像を受信する rid を指定します。"
   },
-  "simulcastRidAuto": {
-    "description": "サイマルキャストで配信されている映像を受信する際に、帯域幅に応じて自動的に rid を切り替えるかどうかを指定します。"
-  },
   "spotlight": {
     "description": "スポットライトを使用するかどうかを指定します。"
   },

src/app/actions.ts

@@ -118,9 +118,6 @@ export const setInitialParameter = async (): Promise<void> => {
   if (qsParams.simulcastRequestRid !== undefined) {
     store.setSimulcastRequestRid(qsParams.simulcastRequestRid)
   }
-  if (qsParams.simulcastRidAuto !== undefined) {
-    store.setSimulcastRidAuto(qsParams.simulcastRidAuto)
-  }
   if (qsParams.spotlight !== undefined) {
     store.setSpotlight(qsParams.spotlight)
   }
@@ -383,7 +380,6 @@ export const copyURL = (): void => {
     simulcast: state.simulcast !== '' ? state.simulcast : undefined,
     simulcastRid: state.simulcastRid !== '' ? state.simulcastRid : undefined,
     simulcastRequestRid: state.simulcastRequestRid !== '' ? state.simulcastRequestRid : undefined,
-    simulcastRidAuto: state.simulcastRidAuto !== '' ? state.simulcastRidAuto : undefined,
     spotlight: state.spotlight !== '' ? state.spotlight : undefined,
     spotlightNumber: state.spotlightNumber !== '' ? state.spotlightNumber : undefined,
     spotlightFocusRid: state.spotlightFocusRid !== '' ? state.spotlightFocusRid : undefined,
@@ -928,7 +924,6 @@ function pickConnectionOptionsState(state: SoraDevtoolsState): ConnectionOptions
     simulcast: state.simulcast,
     simulcastRid: state.simulcastRid,
     simulcastRequestRid: state.simulcastRequestRid,
-    simulcastRidAuto: state.simulcastRidAuto,
     spotlight: state.spotlight,
     spotlightFocusRid: state.spotlightFocusRid,
     spotlightNumber: state.spotlightNumber,
@@ -1761,7 +1756,6 @@ export const {
   setSimulcast,
   setSimulcastRid,
   setSimulcastRequestRid,
-  setSimulcastRidAuto,
   setSora,
   setSoraReconnecting,
   setSoraErrorAlertMessage,

src/app/store.ts

@@ -83,7 +83,6 @@ interface SoraDevtoolsActions {
   setForwardingFilter: (forwardingFilter: string) => void
   setSimulcastRid: (simulcastRid: SoraDevtoolsState['simulcastRid']) => void
   setSimulcastRequestRid: (simulcastRequestRid: SoraDevtoolsState['simulcastRequestRid']) => void
-  setSimulcastRidAuto: (simulcastRidAuto: SoraDevtoolsState['simulcastRidAuto']) => void
   setSpotlightNumber: (spotlightNumber: SoraDevtoolsState['spotlightNumber']) => void
   setSpotlightFocusRid: (spotlightFocusRid: SoraDevtoolsState['spotlightFocusRid']) => void
   setSpotlightUnfocusRid: (spotlightUnfocusRid: SoraDevtoolsState['spotlightUnfocusRid']) => void
@@ -251,7 +250,6 @@ const initialState: SoraDevtoolsState = {
   forwardingFilter: '',
   simulcastRid: '',
   simulcastRequestRid: '',
-  simulcastRidAuto: '',
   spotlightNumber: '',
   spotlightFocusRid: '',
   spotlightUnfocusRid: '',
@@ -525,10 +523,6 @@ export const useSoraDevtoolsStore = create<SoraDevtoolsState & SoraDevtoolsActio
         set((state) => {
           state.simulcastRequestRid = simulcastRequestRid
         }),
-      setSimulcastRidAuto: (simulcastRidAuto) =>
-        set((state) => {
-          state.simulcastRidAuto = simulcastRidAuto
-        }),
       setSpotlightNumber: (spotlightNumber) =>
         set((state) => {
           state.spotlightNumber = spotlightNumber

src/components/DebugPane/index.tsx

@@ -75,7 +75,7 @@ export const DebugPane: React.FC = () => {
           <SendDataChannelMessagingMessage />
           <DataChannelMessagingMessages />
         </Tab>
-{/*
+        {/*
         <Tab eventKey="api" title="API">
           <Api />
         </Tab>

src/components/DevtoolsPane/SimulcastRidAutoForm.tsx

@@ -53,7 +53,6 @@ import { SignalingNotifyMetadataForm } from './SignalingNotifyMetadataForm.tsx'
 import { SignalingUrlCandidatesForm } from './SignalingUrlCandidatesForm.tsx'
 import { SimulcastForm } from './SimulcastForm.tsx'
 import { SimulcastRequestRidForm } from './SimulcastRequestRidForm.tsx'
-import { SimulcastRidAutoForm } from './SimulcastRidAutoForm.tsx'
 import { SimulcastRidForm } from './SimulcastRidForm.tsx'
 import { SpotlightFocusRidForm } from './SpotlightFocusRidForm.tsx'
 import { SpotlightForm } from './SpotlightForm.tsx'
@@ -143,9 +142,6 @@ const RowSimulcastOptions: React.FC = () => {
       <Col>
         <SimulcastRequestRidForm />
       </Col>
-      <Col>
-        <SimulcastRidAutoForm />
-      </Col>
       <Col>
         <SimulcastRidForm />
       </Col>

src/components/DevtoolsPane/index.tsx

@@ -67,7 +67,6 @@ function createDownloadReport(): DownloadReport {
     simulcast: state.simulcast,
     simulcastRid: state.simulcastRid,
     simulcastRequestRid: state.simulcastRequestRid,
-    simulcastRidAuto: state.simulcastRidAuto,
     spotlight: state.spotlight,
     spotlightFocusRid: state.spotlightFocusRid,
     spotlightNumber: state.spotlightNumber,

src/components/Header/DownloadReportButton.tsx

@@ -63,8 +63,6 @@ export const SIMULCAST_RID = ['', 'r0', 'r1', 'r2'] as const
 
 export const SIMULCAST_REQUEST_RID = ['', 'none', 'r0', 'r1', 'r2'] as const
 
-export const SIMULCAST_RID_AUTO = ['', 'true', 'false'] as const
-
 export const DATA_CHANNEL_SIGNALING = ['', 'true', 'false'] as const
 
 export const IGNORE_DISCONNECT_WEBSOCKET = ['', 'true', 'false'] as const

src/constants.ts

@@ -29,7 +29,6 @@ import type {
   SIMULCAST,
   SIMULCAST_RID,
   SIMULCAST_REQUEST_RID,
-  SIMULCAST_RID_AUTO,
   SPOTLIGHT,
   SPOTLIGHT_FOCUS_RIDS,
   SPOTLIGHT_NUMBERS,
@@ -129,7 +128,6 @@ export type SoraDevtoolsState = {
   simulcast: (typeof SIMULCAST)[number]
   simulcastRid: (typeof SIMULCAST_RID)[number]
   simulcastRequestRid: (typeof SIMULCAST_REQUEST_RID)[number]
-  simulcastRidAuto: (typeof SIMULCAST_RID_AUTO)[number]
   spotlight: (typeof SPOTLIGHT)[number]
   focusedSpotlightConnectionIds: {
     [key: string]: boolean
@@ -394,7 +392,6 @@ export type ConnectionOptionsState = Pick<
   | 'simulcast'
   | 'simulcastRid'
   | 'simulcastRequestRid'
-  | 'simulcastRidAuto'
   | 'spotlight'
   | 'spotlightFocusRid'
   | 'spotlightNumber'

src/types.ts

@@ -19,7 +19,6 @@ import {
   SIMULCAST,
   SIMULCAST_RID,
   SIMULCAST_REQUEST_RID,
-  SIMULCAST_RID_AUTO,
   SPOTLIGHT,
   SPOTLIGHT_FOCUS_RIDS,
   SPOTLIGHT_NUMBERS,
@@ -170,11 +169,6 @@ export function parseQueryString(searchParams: URLSearchParams): Partial<QuerySt
       'simulcastRequestRid',
       SIMULCAST_REQUEST_RID,
     ),
-    simulcastRidAuto: parseSpecifiedStringParameter(
-      searchParams,
-      'simulcastRidAuto',
-      SIMULCAST_RID_AUTO,
-    ),
     spotlight: parseSpecifiedStringParameter(searchParams, 'spotlight', SPOTLIGHT),
     spotlightNumber: parseSpecifiedStringParameter(
       searchParams,
@@ -815,10 +809,6 @@ export function createConnectOptions(
       if (connectionOptionsState.simulcastRequestRid) {
         connectionOptions.simulcastRequestRid = connectionOptionsState.simulcastRequestRid
       }
-      const parsedSimulcastRidAuto = parseBooleanString(connectionOptionsState.simulcastRidAuto)
-      if (parsedSimulcastRidAuto !== undefined) {
-        connectionOptions.simulcastRidAuto = parsedSimulcastRidAuto
-      }
     }
   }
   // signalingNotifyMetadata