docs: обновить readme под новые опции

2026-01-20 14:52:59 +03:00
parent 970b58c2a4
commit b7e264d56f
7 changed files with 81 additions and 126 deletions
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -14,15 +14,14 @@ import { convertToDash, checkFFmpeg, checkMP4Box, getVideoMetadata, detectHardwa
 import cliProgress from 'cli-progress';
 import { statSync } from 'node:fs';
 import { basename, extname } from 'node:path';
-import type { CodecChoice, StreamingFormatChoice, QualitySettings, HardwareAccelerationOption, HardwareAccelerator } from './types';
+import type { QualitySettings, HardwareAccelerationOption, HardwareAccelerator, CodecType } from './types';
 import { selectProfiles, createProfilesFromStrings } from './config/profiles';

 // Parse arguments
 const args = process.argv.slice(2);
 let customProfiles: string[] | undefined;
 let posterTimecode: string | undefined;
-let codecChoice: CodecChoice = 'auto'; // h264 + AV1 if HW
-let formatChoice: StreamingFormatChoice = 'auto'; // DASH + HLS
+let codecChoice: Array<CodecType> | undefined; // default h264
 const positionalArgs: string[] = [];

 // Quality settings
@@ -57,22 +56,16 @@ for (let i = 0; i < args.length; i++) {
    posterTimecode = args[i + 1];
    i++; // Skip next arg
  } else if (args[i] === '-c' || args[i] === '--codec') {
-    const codec = args[i + 1];
-    if (codec === 'av1' || codec === 'h264') {
-      codecChoice = codec;
-    } else {
-      console.error(`❌ Invalid codec: ${codec}. Valid options: av1, h264`);
-      process.exit(1);
-    }
-    i++; // Skip next arg
-  } else if (args[i] === '-f' || args[i] === '--format') {
-    const format = args[i + 1];
-    if (format === 'dash' || format === 'hls') {
-      formatChoice = format;
-    } else {
-      console.error(`❌ Invalid format: ${format}. Valid options: dash, hls`);
-      process.exit(1);
+    const codecArg = args[i + 1];
+    const parts = codecArg.split(/[,\s]+/).map(p => p.trim()).filter(Boolean);
+    const allowed = new Set(['h264', 'av1']);
+    for (const p of parts) {
+      if (!allowed.has(p)) {
+        console.error(`❌ Invalid codec: ${p}. Valid options: av1, h264`);
+        process.exit(1);
+      }
    }
+    codecChoice = Array.from(new Set(parts)) as Array<'h264' | 'av1'>;
    i++; // Skip next arg
  } else if (args[i] === '--h264-cq') {
    h264CQ = parseInt(args[i + 1]);
@@ -255,29 +248,24 @@ if (!hasMP4Box) {
 }

 // Resolve codec selection
-let includeH264 = codecChoice === 'h264' || codecChoice === 'auto';
-let includeAv1 = codecChoice === 'av1' || codecChoice === 'auto';
+const codecsRequested = codecChoice && codecChoice.length > 0 ? codecChoice : ['h264'];
+let includeH264 = codecsRequested.includes('h264');
+let includeAv1 = codecsRequested.includes('av1');

-if (includeAv1 && !hasAv1Hardware && codecChoice === 'auto') {
-  includeAv1 = false;
+if (!includeH264) {
+  console.warn('⚠️  H.264 is mandatory for compatibility. Adding H.264.');
+  includeH264 = true;
 }

-if (codecChoice === 'av1' && !hasAv1Hardware) {
-  console.error(`⚠️  Warning: AV1 encoding requested but no hardware AV1 encoder found.`);
+if (includeAv1 && !hasAv1Hardware) {
+  console.error(`⚠️  AV1 requested but no hardware AV1 encoder found.`);
  console.error(`   CPU-based AV1 encoding (libsvtav1) will be VERY slow.`);
  console.error(`   Consider using --codec h264 for faster encoding.\n`);
 }

-// Resolve formats
-const wantDash = formatChoice === 'dash' || formatChoice === 'auto';
-const wantHls = formatChoice === 'hls' || formatChoice === 'auto';
-
-// Validate HLS requires H.264
-if (wantHls && !includeH264) {
-  console.error(`❌ Error: HLS format requires H.264 codec for Safari/iOS compatibility.`);
-  console.error(`   Please use --codec h264 or omit --codec to keep H.264.\n`);
-  process.exit(1);
-}
+// Formats are always both
+const wantDash = true;
+const wantHls = true;

 // Get video metadata and file size
 console.log('📊 Analyzing video...\n');
@@ -343,7 +331,7 @@ const codecListDisplay = [
  includeH264 ? 'h264' : null,
  includeAv1 ? 'av1' : null
 ].filter(Boolean).join(', ');
-const codecNote = (!includeAv1 && codecChoice === 'auto' && !hasAv1Hardware) ? ' (AV1 disabled: no HW)' : '';
+const codecNote = (!includeAv1 && codecsRequested.includes('av1')) ? ' (AV1 disabled: no HW)' : '';
 const bestAccelName = (bestAccel && bestAccel.toUpperCase()) || 'CPU';
 const bestDecoderName = (bestDecoder && bestDecoder.toUpperCase()) || 'CPU';
 const plannedAccel = accelerator ? accelerator.toUpperCase() : bestAccelName;
@@ -407,8 +395,10 @@ try {
    outputDir,
    customProfiles,
    posterTimecode,
-    codec: codecChoice,
-    format: formatChoice,
+    codec: [
+      ...(includeH264 ? ['h264'] as const : []),
+      ...(includeAv1 ? ['av1'] as const : [])
+    ],
    segmentDuration: 2,
    hardwareAccelerator: accelerator,
    hardwareDecoder: decoder,
--- a/src/core/converter.ts
+++ b/src/core/converter.ts
@@ -8,9 +8,7 @@ import type {
  ThumbnailConfig,
  ConversionProgress,
  CodecType,
-  CodecChoice,
  StreamingFormat,
-  StreamingFormatChoice,
  HardwareAccelerationOption,
  HardwareAccelerator,
  HardwareEncoderInfo,
@@ -43,8 +41,8 @@ export async function convertToDash(
    segmentDuration = 2,
    profiles: userProfiles,
    customProfiles,
-    codec = 'auto',
-    format = 'auto',
+    codec = ['h264'],
+    formats = ['dash', 'hls'],
    hardwareDecoder,
    hardwareAccelerator,
    quality,
@@ -76,8 +74,8 @@ DASH Conversion Log
 Started: ${new Date().toISOString()}
 Input: ${input}
 Output: ${videoOutputDir}
-Codec: ${codec}
-Format: ${format}
+Codec: ${Array.isArray(codec) ? codec.join(',') : codec}
+Formats: ${formats?.join(',') || 'dash,hls'}
 ===========================================\n`;
  await writeFile(logFile, header, 'utf-8');

@@ -90,7 +88,7 @@ Format: ${format}
      userProfiles,
      customProfiles,
      codec,
-      format,
+      formats,
      hardwareAccelerator,
      hardwareDecoder,
      quality,
@@ -129,8 +127,8 @@ async function convertToDashInternal(
  segmentDuration: number,
  userProfiles: VideoProfile[] | undefined,
  customProfiles: string[] | undefined,
-  codec: CodecChoice,
-  format: StreamingFormatChoice,
+  codec: CodecType | CodecType[],
+  formats: StreamingFormat[] | undefined,
  hardwareAccelerator: HardwareAccelerationOption | undefined,
  hardwareDecoder: HardwareAccelerationOption | undefined,
  quality: DashConvertOptions['quality'],
@@ -175,12 +173,9 @@ async function convertToDashInternal(

  const av1HardwareAvailable = hardwareEncoders.some(info => info.av1Encoder);

-  let wantH264 = codec === 'h264' || codec === 'auto';
-  let wantAv1 = codec === 'av1' || codec === 'auto';
-
-  if (codec === 'auto' && !av1HardwareAvailable) {
-    wantAv1 = false;
-  }
+  const codecList = Array.isArray(codec) ? codec : [codec];
+  const wantH264 = codecList.includes('h264');
+  const wantAv1 = codecList.includes('av1');

  const { selected, h264Encoder, av1Encoder, warnings: accelWarnings } = selectHardwareEncoders(
    hardwareEncoders,
@@ -200,7 +195,7 @@ async function convertToDashInternal(
    hardwareDecoder || 'auto'
  );

-  if (codec === 'av1' && !av1HardwareAvailable) {
+  if (wantAv1 && !av1HardwareAvailable) {
    console.warn('⚠️  AV1 hardware encoder not detected. AV1 will use CPU encoder (slow).');
  }

@@ -209,10 +204,7 @@ async function convertToDashInternal(
  if (wantAv1) codecsSelected.push('av1');
  if (codecsSelected.length === 0) codecsSelected.push('h264');

-  const formatsSelected: StreamingFormat[] = [];
-  if (format === 'dash' || format === 'auto') formatsSelected.push('dash');
-  if (format === 'hls' || format === 'auto') formatsSelected.push('hls');
-  if (formatsSelected.length === 0) formatsSelected.push('dash');
+  const formatsSelected: StreamingFormat[] = formats && formats.length > 0 ? Array.from(new Set(formats)) : ['dash', 'hls'];

  // Select profiles
  let profiles: VideoProfile[];
--- a/src/index.ts
+++ b/src/index.ts
@@ -11,9 +11,7 @@ export type {
  VideoMetadata,
  VideoOptimizations,
  CodecType,
-  CodecChoice,
  StreamingFormat,
-  StreamingFormatChoice,
  HardwareAccelerator,
  HardwareAccelerationOption,
  HardwareEncoderInfo,
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -8,16 +8,6 @@ export type CodecType = 'av1' | 'h264';
 */
 export type StreamingFormat = 'dash' | 'hls';

-/**
- * Пользовательский выбор кодека (auto = h264 + av1 при наличии HW)
- */
-export type CodecChoice = CodecType | 'auto';
-
-/**
- * Пользовательский выбор форматов (auto = dash + hls)
- */
-export type StreamingFormatChoice = StreamingFormat | 'auto';
-
 /**
 * Тип аппаратного ускорителя
 */
@@ -85,11 +75,11 @@ export interface DashConvertOptions {
  /** Custom resolution profiles as strings (e.g., ['360p', '480p', '720p@60']) */
  customProfiles?: string[];
  
-  /** Video codec selection: h264, av1, or auto (default: auto = h264 + AV1 if HW) */
-  codec?: CodecChoice;
+  /** Video codec selection: one or multiple (default: ['h264']) */
+  codec?: CodecType | CodecType[];
  
-  /** Streaming formats: dash, hls, or auto (default: auto = оба) */
-  format?: StreamingFormatChoice;
+  /** Streaming formats: list (default: ['dash','hls']) */
+  formats?: StreamingFormat[];

  /** Предпочитаемый аппаратный ускоритель (auto по умолчанию) */
  hardwareAccelerator?: HardwareAccelerationOption;