1010 * master-display / max-cll and ship as SDR BT.2020 again.
1111 */
1212
13+ import { validJpeg } from "./__fixtures__/jpeg.js" ;
14+
1315import { EventEmitter } from "events" ;
1416import { mkdtempSync } from "fs" ;
1517import { tmpdir } from "os" ;
@@ -711,6 +713,41 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
711713 expect ( threw ) . toBe ( false ) ;
712714 } ) ;
713715
716+ it ( "rejects a malformed JPEG before writing it and reports its input frame index" , async ( ) => {
717+ const { spawn, calls } = createSpawnSpy ( ) ;
718+ vi . resetModules ( ) ;
719+ vi . doMock ( "child_process" , ( ) => ( { spawn } ) ) ;
720+ const { spawnStreamingEncoder } = await import ( "./streamingEncoder.js" ) ;
721+ const dir = mkdtempSync ( join ( tmpdir ( ) , "se-jpeg-" ) ) ;
722+ const encoder = await spawnStreamingEncoder ( join ( dir , "out.mp4" ) , baseOptions ) ;
723+ const proc = calls [ 0 ] ! . proc ;
724+ const write = vi . spyOn ( proc . stdin , "write" ) ;
725+ expect ( await encoder . writeFrame ( validJpeg ) ) . toBe ( true ) ;
726+ const malformed = Buffer . from ( validJpeg ) ;
727+ malformed [ malformed . indexOf ( Buffer . from ( [ 0xff , 0xdb ] ) ) + 4 ] = 0x20 ;
728+ await expect ( encoder . writeFrame ( malformed ) ) . rejects . toThrow (
729+ "Invalid JPEG input at frame 1: invalid JPEG DQT precision 2" ,
730+ ) ;
731+ expect ( write ) . toHaveBeenCalledTimes ( 1 ) ;
732+ process . nextTick ( ( ) => proc . emit ( "close" , 0 ) ) ;
733+ await encoder . close ( ) ;
734+ } ) ;
735+
736+ it . each ( [
737+ { ...baseOptions , imageFormat : "png" as const } ,
738+ { ...baseOptions , rawInputFormat : "rgb48le" as const } ,
739+ ] ) ( "does not apply JPEG validation to PNG or raw frames" , async ( options ) => {
740+ const { spawn, calls } = createSpawnSpy ( ) ;
741+ vi . resetModules ( ) ;
742+ vi . doMock ( "child_process" , ( ) => ( { spawn } ) ) ;
743+ const { spawnStreamingEncoder } = await import ( "./streamingEncoder.js" ) ;
744+ const dir = mkdtempSync ( join ( tmpdir ( ) , "se-non-jpeg-" ) ) ;
745+ const encoder = await spawnStreamingEncoder ( join ( dir , "out.mp4" ) , options ) ;
746+ expect ( await encoder . writeFrame ( Buffer . from ( [ 0 ] ) ) ) . toBe ( true ) ;
747+ process . nextTick ( ( ) => calls [ 0 ] ! . proc . emit ( "close" , 0 ) ) ;
748+ await encoder . close ( ) ;
749+ } ) ;
750+
714751 it ( "writeFrame returns false after ffmpeg has exited" , async ( ) => {
715752 const { spawn, calls } = createSpawnSpy ( ) ;
716753 vi . resetModules ( ) ;
@@ -720,7 +757,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
720757 const dir = mkdtempSync ( join ( tmpdir ( ) , "se-writefail-" ) ) ;
721758 const encoder = await spawnStreamingEncoder ( join ( dir , "out.mp4" ) , baseOptions ) ;
722759
723- expect ( await encoder . writeFrame ( Buffer . from ( [ 0 ] ) ) ) . toBe ( true ) ;
760+ expect ( await encoder . writeFrame ( validJpeg ) ) . toBe ( true ) ;
724761
725762 const proc = calls [ 0 ] ! . proc ;
726763 await new Promise < void > ( ( resolve ) => {
@@ -730,7 +767,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
730767 } ) ;
731768 } ) ;
732769
733- expect ( await encoder . writeFrame ( Buffer . from ( [ 0 ] ) ) ) . toBe ( false ) ;
770+ expect ( await encoder . writeFrame ( validJpeg ) ) . toBe ( false ) ;
734771 } ) ;
735772
736773 it ( "waits for child close when stdin dies first so the interruption reason is observable" , async ( ) => {
@@ -744,7 +781,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
744781 const proc = calls [ 0 ] ! . proc ;
745782 proc . stdin . destroyed = true ;
746783
747- const writePromise = encoder . writeFrame ( Buffer . from ( [ 0 ] ) ) ;
784+ const writePromise = encoder . writeFrame ( validJpeg ) ;
748785 await expect ( resolveWithin ( writePromise , 10 ) ) . resolves . toBe ( "timeout" ) ;
749786
750787 proc . stderr . emit ( "data" , Buffer . from ( "Exiting normally, received signal 15.\n" ) ) ;
@@ -766,7 +803,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
766803 const proc = calls [ 0 ] ! . proc ;
767804 proc . stdin . write = ( _chunk : Buffer ) : boolean => false ;
768805
769- const writeResult = encoder . writeFrame ( Buffer . from ( [ 1 ] ) ) as unknown ;
806+ const writeResult = encoder . writeFrame ( validJpeg ) as unknown ;
770807 expect ( writeResult ) . toBeInstanceOf ( Promise ) ;
771808
772809 const writePromise = writeResult as Promise < boolean > ;
@@ -804,7 +841,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
804841 proc . stdin . write = ( _chunk : Buffer ) : boolean => false ;
805842
806843 for ( let i = 0 ; i < 12 ; i ++ ) {
807- const writePromise = encoder . writeFrame ( Buffer . from ( [ i ] ) ) ;
844+ const writePromise = encoder . writeFrame ( validJpeg ) ;
808845
809846 await Promise . resolve ( ) ;
810847 expect ( proc . stdin . listenerCount ( "drain" ) ) . toBe ( baselineDrainListeners + 1 ) ;
@@ -833,7 +870,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
833870 const proc = calls [ 0 ] ! . proc ;
834871 proc . stdin . write = ( _chunk : Buffer ) : boolean => false ;
835872
836- const writeResult = encoder . writeFrame ( Buffer . from ( [ 1 ] ) ) as unknown ;
873+ const writeResult = encoder . writeFrame ( validJpeg ) as unknown ;
837874 expect ( writeResult ) . toBeInstanceOf ( Promise ) ;
838875
839876 const writePromise = writeResult as Promise < boolean > ;
@@ -872,7 +909,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
872909 return false ;
873910 } ;
874911
875- const writePromise = encoder . writeFrame ( Buffer . from ( [ 1 ] ) ) ;
912+ const writePromise = encoder . writeFrame ( validJpeg ) ;
876913
877914 await expect ( resolveWithin ( writePromise ) ) . resolves . toBe ( false ) ;
878915 expect ( encoder . getExitStatus ( ) ) . toBe ( "error" ) ;
@@ -927,7 +964,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
927964 // progressing" capture the encoder must still be alive. The old total-
928965 // render timeout would have fired SIGTERM at ~1000ms.
929966 for ( let i = 0 ; i < 9 ; i ++ ) {
930- await encoder . writeFrame ( Buffer . from ( [ i ] ) ) ;
967+ await encoder . writeFrame ( validJpeg ) ;
931968 vi . advanceTimersByTime ( 900 ) ;
932969 }
933970 expect ( proc . kill ) . not . toHaveBeenCalled ( ) ;
@@ -964,7 +1001,7 @@ describe("spawnStreamingEncoder lifecycle and cleanup", () => {
9641001 // A buffered write should remain pending and must NOT reset the timer.
9651002 // The 1000ms timer (last reset on spawn) therefore elapses while the
9661003 // caller is correctly back-pressured on the first frame.
967- const writePromise = encoder . writeFrame ( Buffer . from ( [ 0 ] ) ) ;
1004+ const writePromise = encoder . writeFrame ( validJpeg ) ;
9681005 await Promise . resolve ( ) ;
9691006
9701007 vi . advanceTimersByTime ( 1100 ) ;
0 commit comments