@sigmaott/base-next 1.4.41 → 1.4.44

package/src/components/Channel/PresetConfigItemPId.vue

@@ -94,7 +94,12 @@ function filterProgramsById(_programs) {
 }
 function getStream(type: string) {
   if (isTranscode.value || isEvent.value) {
-    const newOptions = transcodeInput.value?.programs?.filter(program => program.type === type)?.length > 0 ? transcodeInput.value?.programs?.filter(program => program.type === type) : transcodeInput.value?.programs?.[0]?.filter(program => program.type === type)
+    const programs = Array.isArray(transcodeInput.value?.programs?.[0])
+      ? transcodeInput.value.programs[0]
+      : transcodeInput.value?.programs ?? []
+
+    const newOptions = programs.filter(program => program.type === type)
+
     return filterProgramsById(newOptions)
   }
   else if (isPackage.value) {
@@ -125,21 +130,17 @@ function handleChangeOutputPID(value: string) {
   </DevOnly>
   <div class="flex flex-wrap gap-2">
     <el-form-item label="Input PID" v-bind="inputPIdAttrs" class="w-586px">
-      <el-select
-        v-model="inputPIdValue" clearable :placeholder="t('SSConfig.enter_the_pid_placeholder')" filterable
-        allow-create
-        @change="handleChangeInputPID"
-      >
-        <el-option
-          v-for="(preset, index) in getStream(mediaType)" :key="`${preset.id} + ${index}`"
-          class="w-700px !h-auto" :value="preset.id" :label="preset.id"
-        >
+      <el-select v-model="inputPIdValue" clearable :placeholder="t('SSConfig.enter_the_pid_placeholder')" filterable
+        allow-create @change="handleChangeInputPID">
+        <el-option v-for="(preset, index) in getStream(mediaType)" :key="`${preset.id} + ${index}`"
+          class="w-700px !h-auto" :value="preset.id" :label="preset.id">
           <SharedMediaInfoViewer :media="preset" />
         </el-option>
       </el-select>
     </el-form-item>
     <el-form-item label="Output PID" v-bind="outputPIdAttrs" class="w-586px">
-      <el-input v-model="outputPIdValue" maxlength="50" :placeholder="t('SSConfig.enter_the_pid_placeholder')" @change="handleChangeOutputPID" />
+      <el-input v-model="outputPIdValue" maxlength="50" :placeholder="t('SSConfig.enter_the_pid_placeholder')"
+        @change="handleChangeOutputPID" />
     </el-form-item>
   </div>
 </template>

package/src/components/Channel/ProfileConfigItem.vue

@@ -148,129 +148,130 @@ function activeTabChange(type: string) {
     activeMedia.value = `media-${dataData.value.length - 1}`
 }
 
-const encoderIdValue = ref(inject('encoderIdValue'))
+// const encoderIdValue = ref(inject('encoderIdValue'))
+const encoderTypeValue = ref(inject('encoderTypeValue'))
 function addEmptyPreset(type: 'video' | 'audio' | 'data') {
   const defaultPreset = {
     video: isPackage.value
       ? {
-          name: 'video',
-          type: 'video',
-          videoCodec: 'copy',
-        }
+        name: 'video',
+        type: 'video',
+        videoCodec: 'copy',
+      }
       : isConfigEncoder.value
         ? {
-            type: 'video',
-            name: '',
-            videoCodec: 'h264',
-            audioCodec: undefined,
-            dataCodec: undefined,
-            encoderType: defaultEncoderType.value ? defaultEncoderType.value : (encoderIdValue.value !== -1 && encoderIdValue.value !== null && encoderIdValue.value !== undefined && encoderIdValue.value !== '') ? 'nvenc' : 'open_h264',
-            videoPreset: (encoderIdValue.value !== -1 && encoderIdValue.value !== 'cpu' && encoderIdValue.value !== null && encoderIdValue.value !== undefined && encoderIdValue.value !== '') ? 'llhp' : 'veryfast',
-            option: undefined,
-            description: undefined,
-            videoBitrate: 4000000,
-            minrate: undefined,
-            maxrate: undefined,
-            sampleRate: undefined,
-            fps: 25,
-            width: 1920,
-            height: 1080,
-            pixelFormat: undefined,
-            bframe: undefined,
-            scaleType: undefined,
-            scanType: 'progressive',
-            rateControlMode: 'vbr',
-            rc: undefined,
-            bufsize: undefined,
-            cq: undefined,
-            hdr: undefined,
-            gopMode: 'auto',
-            gopValue: undefined,
-            fixedGOP: true,
-            cbr: false,
-            channel: undefined,
-            videoProfile: undefined,
-            videoLevel: undefined,
-            volume: undefined,
-            streamId: undefined,
-            streamIndex: undefined,
-            aspectRatioMode: 'auto',
-            aspectRatioWidth: 16,
-            aspectRatioHeight: 9,
-          }
-        : {
-            type: 'video',
-            name: '',
-            videoCodec: 'h264',
-            audioCodec: undefined,
-            dataCodec: undefined,
-            encoderType: undefined,
-            videoPreset: undefined,
-            option: undefined,
-            description: undefined,
-            videoBitrate: 4000000,
-            minrate: undefined,
-            maxrate: undefined,
-            sampleRate: undefined,
-            fps: 25,
-            width: 1920,
-            height: 1080,
-            pixelFormat: undefined,
-            bframe: undefined,
-            scaleType: undefined,
-            scanType: 'progressive',
-            rateControlMode: 'vbr',
-            rc: undefined,
-            bufsize: undefined,
-            cq: undefined,
-            hdr: undefined,
-            gopMode: 'auto',
-            gopValue: undefined,
-            fixedGOP: true,
-            cbr: false,
-            channel: undefined,
-            videoProfile: undefined,
-            videoLevel: undefined,
-            volume: undefined,
-            streamId: undefined,
-            streamIndex: undefined,
-            aspectRatioMode: 'auto',
-            aspectRatioWidth: 16,
-            aspectRatioHeight: 9,
-          },
-    audio: isPackage.value
-      ? {
-          name: 'audio',
-          type: 'audio',
-          audioCodec: 'copy',
+          type: 'video',
+          name: '',
+          videoCodec: 'h264',
+          audioCodec: undefined,
+          dataCodec: undefined,
+          encoderType: defaultEncoderType.value ? defaultEncoderType.value : (encoderTypeValue.value === 'SOFTWARE' ? 'open_h264' : encoderTypeValue.value === 'NETINT' ? 'netint' : 'nvenc'),
+          videoPreset: encoderTypeValue.value === 'SOFTWARE' ? 'veryfast' : encoderTypeValue.value === 'NETINT' ? 'medium' : 'llhp',
+          option: undefined,
+          description: undefined,
+          videoBitrate: 4000000,
+          minrate: undefined,
+          maxrate: undefined,
+          sampleRate: undefined,
+          fps: 25,
+          width: 1920,
+          height: 1080,
+          pixelFormat: undefined,
+          bframe: undefined,
+          scaleType: undefined,
+          scanType: 'progressive',
+          rateControlMode: 'vbr',
+          rc: undefined,
+          bufsize: undefined,
+          cq: undefined,
+          hdr: undefined,
+          gopMode: 'auto',
+          gopValue: undefined,
+          fixedGOP: true,
+          cbr: false,
+          channel: undefined,
+          videoProfile: undefined,
+          videoLevel: undefined,
+          volume: undefined,
+          streamId: undefined,
+          streamIndex: undefined,
+          aspectRatioMode: 'auto',
+          aspectRatioWidth: 16,
+          aspectRatioHeight: 9,
         }
-      : {
-          type: 'audio',
-          name: undefined,
-          videoCodec: undefined,
-          audioCodec: 'aac',
+        : {
+          type: 'video',
+          name: '',
+          videoCodec: 'h264',
+          audioCodec: undefined,
           dataCodec: undefined,
-          audioGroupId: undefined,
-          audioDefault: undefined,
+          encoderType: undefined,
+          videoPreset: undefined,
           option: undefined,
           description: undefined,
-          audioBitrate: 32000,
-          sampleRate: 44100,
-          fps: undefined,
-          width: undefined,
-          height: undefined,
+          videoBitrate: 4000000,
+          minrate: undefined,
+          maxrate: undefined,
+          sampleRate: undefined,
+          fps: 25,
+          width: 1920,
+          height: 1080,
           pixelFormat: undefined,
           bframe: undefined,
           scaleType: undefined,
+          scanType: 'progressive',
+          rateControlMode: 'vbr',
+          rc: undefined,
+          bufsize: undefined,
           cq: undefined,
-          interlaced: false,
+          hdr: undefined,
+          gopMode: 'auto',
+          gopValue: undefined,
+          fixedGOP: true,
           cbr: false,
-          channel: 2,
-          audioProfile: undefined,
+          channel: undefined,
+          videoProfile: undefined,
+          videoLevel: undefined,
           volume: undefined,
           streamId: undefined,
           streamIndex: undefined,
+          aspectRatioMode: 'auto',
+          aspectRatioWidth: 16,
+          aspectRatioHeight: 9,
         },
+    audio: isPackage.value
+      ? {
+        name: 'audio',
+        type: 'audio',
+        audioCodec: 'copy',
+      }
+      : {
+        type: 'audio',
+        name: undefined,
+        videoCodec: undefined,
+        audioCodec: 'aac',
+        dataCodec: undefined,
+        audioGroupId: undefined,
+        audioDefault: undefined,
+        option: undefined,
+        description: undefined,
+        audioBitrate: 32000,
+        sampleRate: 44100,
+        fps: undefined,
+        width: undefined,
+        height: undefined,
+        pixelFormat: undefined,
+        bframe: undefined,
+        scaleType: undefined,
+        cq: undefined,
+        interlaced: false,
+        cbr: false,
+        channel: 2,
+        audioProfile: undefined,
+        volume: undefined,
+        streamId: undefined,
+        streamIndex: undefined,
+      },
     data: {
       type: 'data',
       name: '',
@@ -572,16 +573,8 @@ const isDataError = computed(() => {
         <template #label>
           <SSInformationLabel :label="$t('profile.name')" :info="schemaObj.name" />
         </template>
-        <el-input
-          v-model.trim="nameValue"
-          autocomplete="off"
-          :minlength="1"
-          :maxlength="50"
-          show-word-limit
-          clearable
-          :placeholder="$t('base_library.enter_profile_name')"
-          @change="handleChangeName"
-        />
+        <el-input v-model.trim="nameValue" autocomplete="off" :minlength="1" :maxlength="50" show-word-limit clearable
+          :placeholder="$t('base_library.enter_profile_name')" @change="handleChangeName" />
       </el-form-item>
       <slot name="information" />
     </slot>
@@ -660,58 +653,38 @@ const isDataError = computed(() => {
   </slot>
 
   <el-divider content-position="left" class="my-10px flex items-center [&_.el-divider\_\_text.is-left]:translate-y-0">
-    <el-form-item v-bind="{ ...presetsAttrs, error: showErrorArray(presetsAttrs.error) }" class="w-200px !m-0 [&_.el-form-item\_\_content]:block">
+    <el-form-item v-bind="{ ...presetsAttrs, error: showErrorArray(presetsAttrs.error) }"
+      class="w-200px !m-0 [&_.el-form-item\_\_content]:block">
       <!-- {{ $t('library_profile.list_of_media') }} -->
     </el-form-item>
   </el-divider>
-  <el-tabs
-    v-model="activeTab"
-    tab-position="left"
-    class="demo-tabs [&_.el-tabs\_\_content]:p-10px"
-    @tab-change="tabChange"
-  >
+  <el-tabs v-model="activeTab" tab-position="left" class="demo-tabs [&_.el-tabs\_\_content]:p-10px"
+    @tab-change="tabChange">
     <el-tab-pane label="Video">
       <template #label>
         <div :class="isVideoError ? 'text-error' : ''">
           Video ({{ videoData.length }})
         </div>
       </template>
-      <el-tabs
-        v-show="videoData.length > 0"
-        v-model="activeMedia"
-        tab-position="top"
-        type="border-card"
-        closable
-        @tab-remove="(name) => handleDestroyMedia(name, 'video')"
-      >
-        <el-tab-pane
-          v-for="(media, _idx) in videoData"
-          :key="`media-${_idx}`"
-          :label="media.name"
-          :name="`media-${_idx}`"
-          lazy
-          class=""
-        >
+      <el-tabs v-show="videoData.length > 0" v-model="activeMedia" tab-position="top" type="border-card" closable
+        @tab-remove="(name) => handleDestroyMedia(name, 'video')">
+        <el-tab-pane v-for="(media, _idx) in videoData" :key="`media-${_idx}`" :label="media.name"
+          :name="`media-${_idx}`" lazy class="">
           <template #label>
-            <span
-              class="inline-flex items-center text-primary"
-              :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${_idx}`]) || hasError(formErrors?.presets, [`${_idx}`]) ? '!text-error' : ''"
-            >
+            <span class="inline-flex items-center text-primary"
+              :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${_idx}`]) || hasError(formErrors?.presets, [`${_idx}`]) ? '!text-error' : ''">
               <el-icon>
                 <div class="i-ep:video-camera-filled" />
               </el-icon>&nbsp;
-              <span :title="media.name" class="block max-w-75px truncate" :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${_idx}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">{{ media.name }}</span>
+              <span :title="media.name" class="block max-w-75px truncate"
+                :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${_idx}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">{{
+                  media.name }}</span>
             </span>
           </template>
           <slot name="preset" :prop="getProp(`presets.[${findIndexById(media.id)}]`)()" :media-type="media.type" />
-          <SSChannelPresetConfigItem
-            :is-config-encoder="isConfigEncoder"
-            :encoder-options="encoderOptions"
-            :video-codecs="videoCodecs"
-            :prop="getProp(`presets.[${findIndexById(media.id)}]`)()"
-            :is-package="isPackage"
-            :default-media-type="media.type"
-          />
+          <SSChannelPresetConfigItem :is-config-encoder="isConfigEncoder" :encoder-options="encoderOptions"
+            :video-codecs="videoCodecs" :prop="getProp(`presets.[${findIndexById(media.id)}]`)()"
+            :is-package="isPackage" :default-media-type="media.type" />
         </el-tab-pane>
       </el-tabs>
     </el-tab-pane>
@@ -721,41 +694,25 @@ const isDataError = computed(() => {
           Audio ({{ audioData.length }})
         </div>
       </template>
-      <el-tabs
-        v-show="audioData.length > 0"
-        v-model="activeMedia"
-        tab-position="top"
-        type="border-card"
-        closable
-        @tab-remove="(name) => handleDestroyMedia(name, 'audio')"
-      >
-        <el-tab-pane
-          v-for="(media, _idx) in audioData"
-          :key="`media-${_idx}`"
-          :label="media.name"
-          :name="`media-${_idx}`"
-          lazy
-          class=""
-        >
+      <el-tabs v-show="audioData.length > 0" v-model="activeMedia" tab-position="top" type="border-card" closable
+        @tab-remove="(name) => handleDestroyMedia(name, 'audio')">
+        <el-tab-pane v-for="(media, _idx) in audioData" :key="`media-${_idx}`" :label="media.name"
+          :name="`media-${_idx}`" lazy class="">
           <template #label>
-            <span
-              class="inline-flex items-center text-warning"
-              :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''"
-            >
+            <span class="inline-flex items-center text-warning"
+              :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">
               <el-icon>
                 <div class="i-ep:headset" />
               </el-icon>&nbsp;
-              <span :title="media.name" class="block max-w-75px truncate" :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">{{ media.name }}</span>
+              <span :title="media.name" class="block max-w-75px truncate"
+                :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">{{
+                  media.name }}</span>
             </span>
           </template>
           <slot name="preset" :prop="getProp(`presets.[${findIndexById(media.id)}]`)()" :media-type="media.type" />
-          <SSChannelPresetConfigItem
-            :is-config-encoder="isConfigEncoder"
-            :video-codecs="videoCodecs"
-            :prop="getProp(`presets.[${findIndexById(media.id)}]`)()"
-            :is-package="isPackage"
-            :default-media-type="media.type"
-          />
+          <SSChannelPresetConfigItem :is-config-encoder="isConfigEncoder" :video-codecs="videoCodecs"
+            :prop="getProp(`presets.[${findIndexById(media.id)}]`)()" :is-package="isPackage"
+            :default-media-type="media.type" />
         </el-tab-pane>
       </el-tabs>
     </el-tab-pane>
@@ -765,65 +722,33 @@ const isDataError = computed(() => {
           Data ({{ dataData.length }})
         </div>
       </template>
-      <el-tabs
-        v-show="dataData.length > 0"
-        v-model="activeMedia"
-        tab-position="top"
-        type="border-card"
-        closable
-        @tab-remove="(name) => handleDestroyMedia(name, 'data')"
-      >
-        <el-tab-pane
-          v-for="(media, _idx) in dataData"
-          :key="`media-${_idx}`"
-          :label="media.name"
-          :name="`media-${_idx}`"
-          lazy
-          class=""
-        >
+      <el-tabs v-show="dataData.length > 0" v-model="activeMedia" tab-position="top" type="border-card" closable
+        @tab-remove="(name) => handleDestroyMedia(name, 'data')">
+        <el-tab-pane v-for="(media, _idx) in dataData" :key="`media-${_idx}`" :label="media.name"
+          :name="`media-${_idx}`" lazy class="">
           <template #label>
-            <span
-              class="inline-flex items-center"
-              :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''"
-            >
+            <span class="inline-flex items-center"
+              :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">
               <el-icon class="data-icon border">
                 <div class="i-ep:menu" />
               </el-icon>&nbsp;
-              <span :title="media.name" class="block max-w-75px truncate" :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">{{ media.name }}</span>
+              <span :title="media.name" class="block max-w-75px truncate"
+                :class="hasError(formErrors?.profiles?.[idx]?.presets, [`${findIndexById(media.id)}`]) || hasError(formErrors?.presets, [`${findIndexById(media.id)}`]) ? '!text-error' : ''">{{
+                  media.name }}</span>
             </span>
           </template>
           <slot name="preset" :prop="getProp(`presets.[${findIndexById(media.id)}]`)()" :media-type="media.type" />
-          <SSChannelPresetConfigItem
-            :is-config-encoder="isConfigEncoder"
-            :video-codecs="videoCodecs"
-            :prop="getProp(`presets.[${findIndexById(media.id)}]`)()"
-            :is-package="isPackage"
-            :default-media-type="media.type"
-            :scte35
-          />
+          <SSChannelPresetConfigItem :is-config-encoder="isConfigEncoder" :video-codecs="videoCodecs"
+            :prop="getProp(`presets.[${findIndexById(media.id)}]`)()" :is-package="isPackage"
+            :default-media-type="media.type" :scte35 />
         </el-tab-pane>
       </el-tabs>
     </el-tab-pane>
   </el-tabs>
 
-  <el-dialog
-    v-model="isShowMediaSelection"
-    append-to-body
-    width="85%"
-    :title="mediaSelectionTitle"
-  >
-    <slot
-      v-if="isMediaLive"
-      name="mediaselection"
-      :media-type="creatingMedia"
-      :exclusion="['profiles']"
-      :select-item="addMedia"
-    />
-    <MediaSelection
-      v-else
-      :media-type="creatingMedia"
-      :exclusion="['profiles']"
-      @select-item="addMedia"
-    />
+  <el-dialog v-model="isShowMediaSelection" append-to-body width="85%" :title="mediaSelectionTitle">
+    <slot v-if="isMediaLive" name="mediaselection" :media-type="creatingMedia" :exclusion="['profiles']"
+      :select-item="addMedia" />
+    <MediaSelection v-else :media-type="creatingMedia" :exclusion="['profiles']" @select-item="addMedia" />
   </el-dialog>
 </template>