diff --git a/v2/src/react-example/src/actions/compositeSettingsActions.js b/v2/src/react-example/src/actions/compositeSettingsActions.js index 366aa76..2120b3e 100644 --- a/v2/src/react-example/src/actions/compositeSettingsActions.js +++ b/v2/src/react-example/src/actions/compositeSettingsActions.js @@ -8,7 +8,6 @@ export const SET_COMPOSITE_AUDIO_CODEC='SET_COMPOSITE_AUDIO_CODEC'; export const SET_COMPOSITE_AUDIO_TRACK='SET_COMPOSITE_AUDIO_TRACK'; export const SET_COMPOSITE_AUDIO_TRACK_DEVICEID='SET_COMPOSITE_AUDIO_TRACK_DEVICEID'; export const SET_COMPOSITE_VIDEO_BITRATE='SET_COMPOSITE_VIDEO_BITRATE'; -export const SET_COMPOSITE_VIDEO_CODEC='SET_COMPOSITE_VIDEO_CODEC'; export const SET_COMPOSITE_VIDEO_FRAME_SIZE_AND_RATE='SET_COMPOSITE_VIDEO_FRAME_SIZE_AND_RATE'; export const SET_COMPOSITE_VIDEO_TRACK='SET_COMPOSITE_VIDEO_TRACK'; export const SET_COMPOSITE_VIDEO_TRACK1_DEVICEID='SET_COMPOSITE_VIDEO_TRACK1_DEVICEID'; diff --git a/v2/src/react-example/src/actions/publishSettingsActions.js b/v2/src/react-example/src/actions/publishSettingsActions.js index 6346cc0..12361bf 100644 --- a/v2/src/react-example/src/actions/publishSettingsActions.js +++ b/v2/src/react-example/src/actions/publishSettingsActions.js @@ -6,12 +6,8 @@ export const SET_PUBLISH_TURN_PASSWORD = 'SET_PUBLISH_TURN_PASSWORD'; export const SET_PUBLISH_APPLICATION_NAME='SET_PUBLISH_APPLICATION_NAME'; export const SET_PUBLISH_STREAM_NAME='SET_PUBLISH_STREAM_NAME'; export const SET_PUBLISH_STREAM_INFO='SET_PUBLISH_STREAM_INFO'; -export const SET_PUBLISH_AUDIO_BITRATE='SET_PUBLISH_AUDIO_BITRATE'; -export const SET_PUBLISH_AUDIO_CODEC='SET_PUBLISH_AUDIO_CODEC'; export const SET_PUBLISH_AUDIO_TRACK='SET_PUBLISH_AUDIO_TRACK'; export const SET_PUBLISH_AUDIO_TRACK_DEVICEID='SET_PUBLISH_AUDIO_TRACK_DEVICEID'; -export const SET_PUBLISH_VIDEO_BITRATE='SET_PUBLISH_VIDEO_BITRATE'; -export const SET_PUBLISH_VIDEO_CODEC='SET_PUBLISH_VIDEO_CODEC'; export const SET_PUBLISH_VIDEO_FRAME_SIZE_AND_RATE='SET_PUBLISH_VIDEO_FRAME_SIZE_AND_RATE'; export const SET_PUBLISH_VIDEO_TRACK='SET_PUBLISH_VIDEO_TRACK'; export const SET_PUBLISH_VIDEO_TRACK1_DEVICEID='SET_PUBLISH_VIDEO_TRACK1_DEVICEID'; diff --git a/v2/src/react-example/src/components/composite/CompositePublishSettingsForm.js b/v2/src/react-example/src/components/composite/CompositePublishSettingsForm.js index 648aed1..f5d7a77 100644 --- a/v2/src/react-example/src/components/composite/CompositePublishSettingsForm.js +++ b/v2/src/react-example/src/components/composite/CompositePublishSettingsForm.js @@ -3,7 +3,6 @@ import { useSelector, useDispatch } from 'react-redux'; import QueryString from 'query-string'; import * as compositeSettingsActions from '../../actions/compositeSettingsActions'; -import * as PublishOptions from '../../constants/PublishOptions'; import { compositePublishUrlParameters, compositePublishUrlParametersPrefix } from '../../constants/CompositeOptions'; import { getCookieValues, setCookieValues } from '../../utils/CookieUtils'; import CookieName from '../../constants/CookieName'; @@ -43,9 +42,6 @@ const CompositePublishSettingsForm = () => { case (compositePublishUrlParametersPrefix+'videoBitrate'): dispatch({type:compositeSettingsActions.SET_COMPOSITE_VIDEO_BITRATE,videoBitrate:savedValues[param]}); break; - case (compositePublishUrlParametersPrefix+'videoCodec'): - dispatch({type:compositeSettingsActions.SET_COMPOSITE_VIDEO_CODEC,videoCodec:savedValues[param]}); - break; default: } } @@ -163,23 +159,6 @@ const CompositePublishSettingsForm = () => { -
-
- -
- -
-
-
); diff --git a/v2/src/react-example/src/components/publish/PublishSettingsForm.js b/v2/src/react-example/src/components/publish/PublishSettingsForm.js index d10c9b0..74631ad 100644 --- a/v2/src/react-example/src/components/publish/PublishSettingsForm.js +++ b/v2/src/react-example/src/components/publish/PublishSettingsForm.js @@ -350,81 +350,6 @@ const PublishSettingsForm = () => { -
-
-
- -
- dispatch({type:PublishSettingsActions.SET_PUBLISH_AUDIO_BITRATE,audioBitrate:e.target.value})} - /> -
- Kbps -
-
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- dispatch({type:PublishSettingsActions.SET_PUBLISH_VIDEO_BITRATE,videoBitrate:e.target.value})} - /> -
- Kbps -
-
-
-
-
-
- -
- -
-
-
-
diff --git a/v2/src/react-example/src/constants/CompositeOptions.js b/v2/src/react-example/src/constants/CompositeOptions.js index 13b9968..658740c 100644 --- a/v2/src/react-example/src/constants/CompositeOptions.js +++ b/v2/src/react-example/src/constants/CompositeOptions.js @@ -7,5 +7,4 @@ export const compositePublishUrlParameters = [ "audioBitrate", "audioCodec", "videoBitrate", - "videoCodec" ] \ No newline at end of file diff --git a/v2/src/react-example/src/constants/PublishOptions.js b/v2/src/react-example/src/constants/PublishOptions.js index 3186bf8..6789e42 100644 --- a/v2/src/react-example/src/constants/PublishOptions.js +++ b/v2/src/react-example/src/constants/PublishOptions.js @@ -1,9 +1,3 @@ -export const videoCodecs = [ - { value:"VP8", name:"VP8" }, - { value:"VP9", name:"VP9" }, - { value:"42e01f", name:"H.264" } -]; - export const videoFrameSizes = [ { value:"default", name:"Default" }, { value:"1920x1080", name:"1920x1080" }, @@ -46,10 +40,6 @@ export const publishUrlParameters = [ "signalingURL", "applicationName", "streamName", - "audioBitrate", - "audioCodec", - "videoBitrate", - "videoCodec", "videoFrameRate", "videoFrameSize" ] \ No newline at end of file diff --git a/v2/src/react-example/src/reducers/compositeSettingsReducer.js b/v2/src/react-example/src/reducers/compositeSettingsReducer.js index 06881c4..5b332a0 100644 --- a/v2/src/react-example/src/reducers/compositeSettingsReducer.js +++ b/v2/src/react-example/src/reducers/compositeSettingsReducer.js @@ -14,7 +14,6 @@ const initialState = { videoTrack: undefined, videoTrack1DeviceId: '', videoTrack2DeviceId: '', - videoCodec: 'VP8', videoFrameRate: '30', videoFrameSize: 'default', userData: undefined, @@ -46,8 +45,6 @@ const compositeReducer = (state = initialState, action) => { return { ...state, audioTrackDeviceId:action.audioTrackDeviceId }; case compositeSettingsActions.SET_COMPOSITE_VIDEO_BITRATE: return { ...state, videoBitrate:action.videoBitrate }; - case compositeSettingsActions.SET_COMPOSITE_VIDEO_CODEC: - return { ...state, videoCodec:action.videoCodec }; case compositeSettingsActions.SET_COMPOSITE_VIDEO_FRAME_SIZE_AND_RATE: let frameState = { ...state }; if (action.videoFrameSize != null) frameState.videoFrameSize = action.videoFrameSize; diff --git a/v2/src/react-example/src/reducers/publishSettingsReducer.js b/v2/src/react-example/src/reducers/publishSettingsReducer.js index 35389f1..2c34c91 100644 --- a/v2/src/react-example/src/reducers/publishSettingsReducer.js +++ b/v2/src/react-example/src/reducers/publishSettingsReducer.js @@ -9,15 +9,11 @@ const initialState = { applicationName: '', streamName: '', streamInfo: undefined, - audioBitrate: '64', - audioCodec: 'opus', audioTrack: {}, audioTrackDeviceId: '', - videoBitrate: '3500', videoTrack: {}, videoTrack1DeviceId: '', videoTrack2DeviceId: '', - videoCodec: 'VP8', videoFrameRate: '30', videoFrameSize: 'default', userData: undefined, @@ -46,18 +42,10 @@ const publishSettingsReducer = (state = initialState, action) => { return { ...state, streamName:action.streamName }; case PublishSettingsActions.SET_PUBLISH_STREAM_INFO: return { ...state, streamInfo:action.streamInfo }; - case PublishSettingsActions.SET_PUBLISH_AUDIO_BITRATE: - return { ...state, audioBitrate:action.audioBitrate }; - case PublishSettingsActions.SET_PUBLISH_AUDIO_CODEC: - return { ...state, audioCodec:action.audioCodec }; case PublishSettingsActions.SET_PUBLISH_AUDIO_TRACK: return { ...state, audioTrack:action.audioTrack }; case PublishSettingsActions.SET_PUBLISH_AUDIO_TRACK_DEVICEID: return { ...state, audioTrackDeviceId:action.audioTrackDeviceId }; - case PublishSettingsActions.SET_PUBLISH_VIDEO_BITRATE: - return { ...state, videoBitrate:action.videoBitrate }; - case PublishSettingsActions.SET_PUBLISH_VIDEO_CODEC: - return { ...state, videoCodec:action.videoCodec }; case PublishSettingsActions.SET_PUBLISH_VIDEO_FRAME_SIZE_AND_RATE: let frameState = { ...state }; if (action.videoFrameSize != null) frameState.videoFrameSize = action.videoFrameSize;