1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
//! `PipelinedPesStream` — the read-side of the freemkv mux
//! highway.
//!
//! Given a [`crate::mux::demux_thread::DemuxThread`] (which has the
//! producer + demux workers already spawned), a set of codec
//! parsers, and the title metadata, this struct implements
//! [`crate::pes::Stream`] by running codec parse on the caller's
//! thread and emitting `PesFrame`s one at a time.
//!
//! The pipeline runs three threads in parallel:
//!
//! ```text
//! Thread A: read + decrypt (PrefetchedSectorSource / BytePrefetcher)
//! Thread B: M2TS demux (DemuxThread)
//! Thread C: codec parse (this struct, on the caller's thread)
//! ```
//!
//! Communication between A→B and B→C is via bounded channels with
//! recycled buffer pools — no allocations or memcpys in the steady-
//! state hot loop.
//!
//! This is the *only* read-side `Stream` impl in tree. Both the ISO
//! file mux and the BD-TS (`m2ts://`) file mux input paths are built by
//! [`crate::mux::resolve`] (`build_iso_pipeline` / the m2ts pipeline
//! builder) and hand back a `PipelinedPesStream`; the differences are
//! in how the producer thread (A) is configured — sector-aligned reads
//! with AACS decrypt for ISO, raw byte reads for M2TS.
//! ([`crate::mux::M2tsStream`] itself is a write-only sink and does not
//! construct this type.)
use super::codec::CodecParser;
use super::demux_thread::{DemuxBatch, DemuxThread};
use super::ts::PesPacket;
use crate::disc::DiscTitle;
use crate::pes::{PesFrame, Stream};
use crossbeam_channel::Receiver;
use std::io;
/// Stream impl that consumes pre-demuxed `PesPacket` batches from a
/// [`DemuxThread`] and runs codec parse on the caller's thread.
pub struct PipelinedPesStream {
title: DiscTitle,
parsers: Vec<(u16, Box<dyn CodecParser>)>,
pid_to_track: Vec<(u16, usize)>,
demux_rx: Receiver<DemuxBatch>,
/// Kept alive so dropping this stream joins the demux + producer
/// workers deterministically. Never poked directly after spawn.
#[allow(dead_code)]
demux_thread: DemuxThread,
pending_frames: std::collections::VecDeque<PesFrame>,
eof: bool,
/// Cached `FREEMKV_SKIP_PARSE` profiling flag. Read once in `new()`
/// — the env var cannot change for the life of the stream, and
/// `std::env::var_os` takes a process-wide lock, so the per-batch /
/// per-poll reads it replaces were needless hot-path overhead.
skip_parse: bool,
/// Cumulative bytes of scrambled AACS units the producer's decrypt step
/// could not decrypt — silent decrypt loss the demux drops without a sync.
/// Shared with the producer thread's [`DecryptingSectorSource`]
/// (`crate::sector::DecryptingSectorSource::decrypt_loss`). Surfaced through
/// [`Stream::lost_bytes`] so the file-backed mux abort gate sees a partial
/// decrypt failure instead of reporting a perfect rip. `None` for pipelines
/// with no AACS decrypt step (e.g. the M2TS byte-stream path).
decrypt_loss: Option<std::sync::Arc<std::sync::atomic::AtomicU64>>,
/// Count of dropped DVD navigation packets (private_stream_2, 0xBF). These
/// are expected on every disc; instead of a per-packet WARN they're tallied
/// and summarised once at EOF.
dropped_nav_packets: u64,
}
impl PipelinedPesStream {
/// Wire up the stream. Caller has already spawned the
/// `DemuxThread` (which in turn owns the producer); we take the
/// receiver end + the join handle bundle so cleanup is bounded
/// on drop.
///
/// `pub(crate)`: the signature takes the internal `DemuxThread` /
/// `DemuxBatch` / `CodecParser` types, so external callers reach this
/// stream via [`super::resolve::input`] / `build_iso_pipeline`
/// instead.
pub(crate) fn new(
demux_thread: DemuxThread,
demux_rx: Receiver<DemuxBatch>,
title: DiscTitle,
parsers: Vec<(u16, Box<dyn CodecParser>)>,
pid_to_track: Vec<(u16, usize)>,
) -> Self {
Self {
title,
parsers,
pid_to_track,
demux_rx,
demux_thread,
pending_frames: std::collections::VecDeque::new(),
eof: false,
skip_parse: std::env::var_os("FREEMKV_SKIP_PARSE").is_some(),
decrypt_loss: None,
dropped_nav_packets: 0,
}
}
/// Attach the producer's decrypt-loss counter so [`Stream::lost_bytes`]
/// reports bytes of scrambled AACS units that could not be decrypted (and
/// were therefore silently dropped downstream). Obtained from the
/// producer's `DecryptingSectorSource::decrypt_loss()` before it is moved
/// into the prefetch thread. The M2TS / no-decrypt pipelines leave this
/// unset.
pub(crate) fn with_decrypt_loss(
mut self,
loss: std::sync::Arc<std::sync::atomic::AtomicU64>,
) -> Self {
self.decrypt_loss = Some(loss);
self
}
/// Pull one batch of `PesPacket`s from the demux thread, run
/// codec parse on each, enqueue resulting `PesFrame`s on
/// `pending_frames`. Returns Ok(true) on success, Ok(false) on
/// EOF (channel closed cleanly), Err on demuxer error.
fn pump_one_batch(&mut self) -> io::Result<bool> {
match self.demux_rx.recv() {
Ok(DemuxBatch::Ts(packets)) => {
self.consume_ts(packets);
Ok(true)
}
Ok(DemuxBatch::Ps(packets)) => {
self.consume_ps(packets);
Ok(true)
}
Ok(DemuxBatch::Err(e)) => Err(e),
// Explicit clean-completion sentinel from the demux worker.
Ok(DemuxBatch::Eof) => Ok(false),
// The channel disconnected WITHOUT the worker first sending
// an `Eof` (or `Err`) sentinel — the worker panicked or was
// dropped mid-stream. Surface this as an error so a parser /
// demux panic is never reported to the caller as a clean
// end-of-stream (which would silently truncate output).
Err(_) => Err(crate::error::Error::DemuxThreadPanicked.into()),
}
}
fn consume_ts(&mut self, packets: Vec<PesPacket>) {
let skip_parse = self.skip_parse;
for pes in packets {
if let Some((_, track)) = self
.pid_to_track
.iter()
.find(|(pid, _)| *pid == pes.pid)
.copied()
{
if skip_parse {
// Profiling escape hatch — bypass codec parser.
self.pending_frames.push_back(PesFrame {
coding: None,
source: None,
track,
pts: pes.pts.map(super::codec::pts_to_ns).unwrap_or(0),
keyframe: false,
data: pes.data,
duration_ns: None,
});
} else if let Some((_, parser)) =
self.parsers.iter_mut().find(|(pid, _)| *pid == pes.pid)
{
for frame in parser.parse(&pes) {
self.pending_frames
.push_back(PesFrame::from_codec_frame(track, frame));
}
}
}
}
}
fn consume_ps(&mut self, packets: Vec<super::ps::PsPacket>) {
for ps in packets {
// Route by the REAL DVD PID (matching the PIDs that
// `scan_dvd_titles` assigns) rather than a synthetic track
// index. The old `(sub_id & 0x1F) + 1` heuristic collided
// subtitle sub-id 0x20+j with audio track j+1, feeding
// VobSub PES into the AC-3 parser.
let Some(pid) = ps.dvd_pid() else {
if ps.is_nav() {
// Expected DVD navigation packet (PCI/DSI) — tally, no WARN.
self.dropped_nav_packets += 1;
} else {
// Unexpected unmappable stream_id — a possibly-dropped real
// stream. Keep the individual WARN: its repetition is signal.
tracing::warn!(
target: "mux",
"dropping unmappable PS packet (stream_id={:#04x}, sub_stream_id={:?})",
ps.stream_id,
ps.sub_stream_id,
);
}
continue;
};
let Some((_, track)) = self.pid_to_track.iter().find(|(p, _)| *p == pid).copied()
else {
tracing::warn!(
target: "mux",
"dropping PS packet for unmapped PID {:#06x} (stream_id={:#04x}, sub_stream_id={:?})",
pid,
ps.stream_id,
ps.sub_stream_id,
);
continue;
};
let pes = PesPacket {
// Carry the PS demuxer's byte-exact source stamp through to the
// codec parser, exactly as the TS path does — provenance must
// survive the PsPacket → PesPacket seam so the frame's `source`
// reaches the mux/index (FVI `src`), never reconstructed.
source: ps.source,
pid,
pts: ps.pts.map(|p| p as i64),
dts: ps.dts.map(|d| d as i64),
data: ps.data,
};
if let Some((_, parser)) = self.parsers.iter_mut().find(|(p, _)| *p == pid) {
for frame in parser.parse(&pes) {
self.pending_frames
.push_back(PesFrame::from_codec_frame(track, frame));
}
}
}
}
}
impl Stream for PipelinedPesStream {
fn read(&mut self) -> io::Result<Option<PesFrame>> {
if let Some(frame) = self.pending_frames.pop_front() {
return Ok(Some(frame));
}
if self.eof {
return Ok(None);
}
loop {
match self.pump_one_batch()? {
true => {
if let Some(frame) = self.pending_frames.pop_front() {
return Ok(Some(frame));
}
// Batch contained no trackable packets — pull again.
}
false => {
self.eof = true;
if self.dropped_nav_packets > 0 {
tracing::debug!(
target: "mux",
"dropped {} DVD navigation packets (private_stream_2/0xBF) — expected, carry no elementary stream",
self.dropped_nav_packets
);
}
// Drain any access unit a parser buffered past the last
// PES (e.g. DTS-HD's final core+extension unit).
let pid_to_track = &self.pid_to_track;
let pending = &mut self.pending_frames;
for (pid, parser) in self.parsers.iter_mut() {
let Some(&(_, track)) = pid_to_track.iter().find(|(p, _)| p == pid) else {
continue;
};
for frame in parser.flush() {
pending.push_back(PesFrame::from_codec_frame(track, frame));
}
}
return Ok(self.pending_frames.pop_front());
}
}
}
}
fn write(&mut self, _: &PesFrame) -> io::Result<()> {
Err(crate::error::Error::StreamReadOnly.into())
}
fn finish(&mut self) -> io::Result<()> {
Ok(())
}
fn info(&self) -> &DiscTitle {
&self.title
}
fn headers_ready(&self) -> bool {
// Match the previous DiscStream semantics: video tracks need
// codec_private before the consumer can write the container
// header. FREEMKV_SKIP_PARSE forces ready (no parser ever
// populates codec_private in that mode).
if self.skip_parse {
return true;
}
for (idx, s) in self.title.streams.iter().enumerate() {
if let crate::disc::Stream::Video(v) = s {
if !v.secondary && self.codec_private(idx).is_none() {
return false;
}
}
}
true
}
fn codec_private(&self, track: usize) -> Option<Vec<u8>> {
let pid = self
.pid_to_track
.iter()
.find(|(_, idx)| *idx == track)
.map(|(p, _)| *p)?;
self.parsers
.iter()
.find(|(p, _)| *p == pid)
.and_then(|(_, parser)| parser.codec_private())
}
fn lost_bytes(&self) -> u64 {
// The file-backed highway has no read-error zero-fill term (resolve
// tracks read loss separately), but the producer's decrypt step can
// pass scrambled units through undecrypted — silent loss the demux
// drops. Surface that so the mux abort gate sees a partial AACS/CSS
// decrypt failure rather than reporting a perfect rip.
self.decrypt_loss
.as_ref()
.map(|c| c.load(std::sync::atomic::Ordering::Relaxed))
.unwrap_or(0)
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::disc::{
AudioChannels, AudioStream, Codec, ColorSpace, DiscTitle, FrameRate, HdrFormat,
LabelPurpose, Resolution, SampleRate, VideoStream,
};
use crate::mux::demux_thread::{DemuxBatch, DemuxThread};
use crate::mux::ps::PsPacket;
use crate::mux::ts::PesPacket;
use crossbeam_channel::{Sender, bounded};
/// Build a real, cleanly-exiting `DemuxThread` whose own receiver we
/// discard. The worker exits immediately (its prefetch sender is dropped)
/// and joins on drop — it exists only to satisfy `new()`'s ownership of a
/// `DemuxThread`. The caller controls the SEPARATE `demux_rx` we hand to
/// `PipelinedPesStream::new`, so we can inject any `DemuxBatch` sequence
/// (or a bare disconnect) independent of the dummy worker.
fn dummy_demux_thread() -> DemuxThread {
let (_pf_tx, pf_rx) = bounded::<std::io::Result<Vec<u8>>>(1);
let (rec_tx, _rec_rx) = bounded::<Vec<u8>>(2);
// No TS/PS demuxer; the worker just drains (nothing) and exits Eof.
let (dt, _own_rx) =
DemuxThread::spawn_zero_copy(pf_rx, rec_tx, (), None, None, None).expect("spawn");
dt
}
/// Assemble a `PipelinedPesStream` over a caller-controlled demux channel.
/// Returns the stream plus the `Sender` so the test drives batches/EOF.
fn make_stream(
title: DiscTitle,
parsers: Vec<(u16, Box<dyn CodecParser>)>,
pid_to_track: Vec<(u16, usize)>,
) -> (PipelinedPesStream, Sender<DemuxBatch>) {
let (tx, rx) = bounded::<DemuxBatch>(8);
let stream =
PipelinedPesStream::new(dummy_demux_thread(), rx, title, parsers, pid_to_track);
(stream, tx)
}
/// A parser that emits exactly `n` frames per PES, with a fixed
/// codec_private. Lets tests assert routing/flush without depending on a
/// real codec's byte parsing.
struct CountingParser {
per_pes: usize,
flush_n: usize,
cp: Option<Vec<u8>>,
}
impl CodecParser for CountingParser {
fn parse(&mut self, pes: &PesPacket) -> Vec<super::super::codec::Frame> {
(0..self.per_pes)
.map(|i| super::super::codec::Frame {
coding: None,
source: None,
pts_ns: pes.pts.unwrap_or(0) + i as i64,
keyframe: i == 0,
data: pes.data.clone(),
duration_ns: None,
})
.collect()
}
fn flush(&mut self) -> Vec<super::super::codec::Frame> {
(0..self.flush_n)
.map(|_| super::super::codec::Frame {
coding: None,
source: None,
pts_ns: 0,
keyframe: false,
data: vec![0xEE],
duration_ns: None,
})
.collect()
}
fn codec_private(&self) -> Option<Vec<u8>> {
self.cp.clone()
}
}
fn ts_pes(pid: u16, data: Vec<u8>) -> PesPacket {
PesPacket {
source: None,
pid,
pts: Some(90_000),
dts: None,
data,
}
}
/// CLEAN EOF: the demux worker sends the explicit `Eof` sentinel. The
/// consumer must return Ok(None) — a normal end-of-stream — and stay
/// Ok(None) on subsequent reads. (DemuxBatch::Eof doc: "explicit
/// clean-completion sentinel".)
#[test]
fn eof_sentinel_yields_clean_none() {
let (mut stream, tx) = make_stream(DiscTitle::empty(), vec![], vec![]);
tx.send(DemuxBatch::Eof).unwrap();
assert!(stream.read().unwrap().is_none(), "Eof → Ok(None)");
// The eof flag latches: a further read is still Ok(None), not an error.
assert!(stream.read().unwrap().is_none());
}
/// PANIC / BARE DISCONNECT: the channel closes WITHOUT an Eof (or Err)
/// sentinel — exactly what happens when the demux worker panics and drops
/// its sender. The consumer MUST surface DemuxThreadPanicked, never a
/// clean Ok(None) (which would silently truncate the output). This is the
/// truncation guard the module docstring promises.
#[test]
fn bare_disconnect_is_error_not_silent_eof() {
let (mut stream, tx) = make_stream(DiscTitle::empty(), vec![], vec![]);
drop(tx); // sender gone, no Eof sent → RecvError on the consumer side
let err = stream.read().expect_err("bare disconnect must be an error");
// E_DEMUX_THREAD_PANICKED (9013) maps to ErrorKind::Other.
assert_eq!(err.kind(), std::io::ErrorKind::Other);
let e = crate::error::Error::DemuxThreadPanicked;
assert!(
err.to_string().contains(&e.code().to_string()),
"error must carry the DemuxThreadPanicked code, got: {err}"
);
}
/// A `DemuxBatch::Err` from the worker (underlying reader error) is
/// terminal and must propagate to the caller verbatim, not be masked as
/// EOF.
#[test]
fn demux_err_propagates() {
let (mut stream, tx) = make_stream(DiscTitle::empty(), vec![], vec![]);
tx.send(DemuxBatch::Err(std::io::Error::from(
std::io::ErrorKind::PermissionDenied,
)))
.unwrap();
let err = stream.read().expect_err("Err batch must propagate");
assert_eq!(err.kind(), std::io::ErrorKind::PermissionDenied);
}
/// consume_ts must route a PES to the track mapped to its PID and emit
/// the parser's frames in order. A PES whose PID is NOT in pid_to_track
/// must be dropped (no frame), never mis-attributed to another track.
#[test]
fn ts_routing_maps_pid_to_track_and_drops_untracked() {
let title = DiscTitle::empty();
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0x1100,
Box::new(CountingParser {
per_pes: 2,
flush_n: 0,
cp: None,
}),
)];
let pid_to_track = vec![(0x1100u16, 3usize)];
let (mut stream, tx) = make_stream(title, parsers, pid_to_track);
// One tracked PES (PID 0x1100) and one untracked (PID 0x2222).
tx.send(DemuxBatch::Ts(vec![
ts_pes(0x1100, vec![0xAA, 0xBB]),
ts_pes(0x2222, vec![0xCC]),
]))
.unwrap();
tx.send(DemuxBatch::Eof).unwrap();
// Tracked PES → 2 frames on track 3, in order; untracked → nothing.
let f0 = stream.read().unwrap().expect("frame 0");
assert_eq!(f0.track, 3, "routed to the PID's mapped track");
assert_eq!(f0.data, vec![0xAA, 0xBB]);
let f1 = stream.read().unwrap().expect("frame 1");
assert_eq!(f1.track, 3);
// Only the two frames from the tracked PES exist, then clean EOF.
assert!(
stream.read().unwrap().is_none(),
"untracked PES dropped, EOF"
);
}
/// At EOF the consumer must call `flush()` on every parser and emit the
/// buffered tail frames — a parser that holds the final access unit (e.g.
/// DTS-HD) must NOT have it dropped. Without the flush the last frame is
/// silently truncated.
#[test]
fn flush_tail_emitted_at_eof() {
let title = DiscTitle::empty();
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0x1100,
Box::new(CountingParser {
per_pes: 0, // parse emits nothing; everything comes from flush
flush_n: 1,
cp: None,
}),
)];
let pid_to_track = vec![(0x1100u16, 0usize)];
let (mut stream, tx) = make_stream(title, parsers, pid_to_track);
tx.send(DemuxBatch::Ts(vec![ts_pes(0x1100, vec![0x01])]))
.unwrap();
tx.send(DemuxBatch::Eof).unwrap();
// No frames from parse; the single flush() frame must surface at EOF.
let tail = stream.read().unwrap().expect("flush tail frame at EOF");
assert_eq!(tail.track, 0);
assert_eq!(tail.data, vec![0xEE], "flush() tail, not dropped");
assert!(stream.read().unwrap().is_none());
}
/// A flush parser whose PID is not in pid_to_track must be skipped at EOF
/// (the `continue` guard) — no panic, no frame attributed to a phantom
/// track.
#[test]
fn flush_skips_parser_with_unmapped_pid() {
let title = DiscTitle::empty();
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0x9999, // PID present as a parser but absent from pid_to_track
Box::new(CountingParser {
per_pes: 0,
flush_n: 5,
cp: None,
}),
)];
let pid_to_track = vec![]; // nothing mapped
let (mut stream, tx) = make_stream(title, parsers, pid_to_track);
tx.send(DemuxBatch::Eof).unwrap();
// The unmapped parser's 5 flush frames must be discarded, not emitted.
assert!(
stream.read().unwrap().is_none(),
"flush frames for an unmapped PID are skipped"
);
}
/// consume_ps must route by the REAL DVD PID (via PsPacket::dvd_pid).
/// An audio private-stream-1 packet (stream_id 0xBD, sub-id 0x80 → PID
/// 0xBD80) routes to the track mapped to 0xBD80. A packet with an
/// unmappable (stream_id, sub_id) is dropped, never mis-routed.
#[test]
fn ps_routing_uses_dvd_pid_and_drops_unmappable() {
let title = DiscTitle::empty();
// PID for AC-3 sub-id 0x80 is 0xBD00 | 0x80 = 0xBD80.
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0xBD80,
Box::new(CountingParser {
per_pes: 1,
flush_n: 0,
cp: None,
}),
)];
let pid_to_track = vec![(0xBD80u16, 1usize)];
let (mut stream, tx) = make_stream(title, parsers, pid_to_track);
let mappable = PsPacket {
source: None,
stream_id: 0xBD,
sub_stream_id: Some(0x80),
pts: Some(90_000),
dts: None,
data: vec![0x12, 0x34],
};
// stream_id 0xC0 (MPEG audio) has no DVD PID mapping → dropped.
let unmappable = PsPacket {
source: None,
stream_id: 0xC0,
sub_stream_id: None,
pts: None,
dts: None,
data: vec![0xFF],
};
tx.send(DemuxBatch::Ps(vec![mappable, unmappable])).unwrap();
tx.send(DemuxBatch::Eof).unwrap();
let f = stream.read().unwrap().expect("one routed PS frame");
assert_eq!(f.track, 1, "routed by dvd_pid to track 1");
assert_eq!(f.data, vec![0x12, 0x34]);
assert!(stream.read().unwrap().is_none(), "unmappable PS dropped");
}
/// A batch with no trackable packets must NOT terminate the stream early:
/// pump_one_batch loops to the next batch. Here an empty-but-untracked
/// batch is followed by a real frame batch — the consumer must skip the
/// first and deliver the second (not return Ok(None) prematurely).
#[test]
fn empty_batch_does_not_end_stream_early() {
let title = DiscTitle::empty();
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0x1100,
Box::new(CountingParser {
per_pes: 1,
flush_n: 0,
cp: None,
}),
)];
let pid_to_track = vec![(0x1100u16, 0usize)];
let (mut stream, tx) = make_stream(title, parsers, pid_to_track);
// First batch: only an untracked PID → yields zero frames.
tx.send(DemuxBatch::Ts(vec![ts_pes(0x4444, vec![0x00])]))
.unwrap();
// Second batch: tracked PID → one frame.
tx.send(DemuxBatch::Ts(vec![ts_pes(0x1100, vec![0x55])]))
.unwrap();
tx.send(DemuxBatch::Eof).unwrap();
let f = stream.read().unwrap().expect("frame from the second batch");
assert_eq!(f.data, vec![0x55], "did not stop on the empty first batch");
}
/// write() on the read-only pipeline must return StreamReadOnly
/// (E9000 → Unsupported) — the highway is input-only.
#[test]
fn write_is_read_only_error() {
let (mut stream, _tx) = make_stream(DiscTitle::empty(), vec![], vec![]);
let frame = PesFrame {
coding: None,
source: None,
track: 0,
pts: 0,
keyframe: false,
data: vec![1],
duration_ns: None,
};
let err = stream.write(&frame).expect_err("write must error");
assert_eq!(err.kind(), std::io::ErrorKind::Unsupported);
}
fn video_title(secondary: bool) -> DiscTitle {
let mut t = DiscTitle::empty();
t.streams.push(crate::disc::Stream::Video(VideoStream {
pid: 0x1011,
codec: Codec::Hevc,
resolution: Resolution::R2160p,
frame_rate: FrameRate::F23_976,
hdr: HdrFormat::Hdr10,
color_space: ColorSpace::Bt2020,
display_aspect: None,
secondary,
label: String::new(),
measured_cicp: None,
}));
t
}
/// headers_ready() is false for a PRIMARY video track until its parser
/// produces codec_private — MKV can't write the container header without
/// init data, so the consumer must keep buffering.
#[test]
fn headers_not_ready_when_primary_video_lacks_codec_private() {
let title = video_title(false);
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0x1011,
Box::new(CountingParser {
per_pes: 0,
flush_n: 0,
cp: None, // no codec_private yet
}),
)];
let pid_to_track = vec![(0x1011u16, 0usize)];
let (stream, _tx) = make_stream(title, parsers, pid_to_track);
assert!(
!stream.headers_ready(),
"primary video w/o codec_private not ready"
);
}
/// headers_ready() flips true once the primary video parser exposes
/// codec_private.
#[test]
fn headers_ready_when_primary_video_has_codec_private() {
let title = video_title(false);
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0x1011,
Box::new(CountingParser {
per_pes: 0,
flush_n: 0,
cp: Some(vec![0x01, 0x02, 0x03]),
}),
)];
let pid_to_track = vec![(0x1011u16, 0usize)];
let (stream, _tx) = make_stream(title, parsers, pid_to_track);
assert!(stream.headers_ready(), "codec_private present → ready");
// codec_private(track) resolves track→PID→parser and returns the data.
assert_eq!(
stream.codec_private(0).as_deref(),
Some(&[0x01, 0x02, 0x03][..])
);
}
/// A SECONDARY video track without codec_private must NOT block
/// headers_ready() — the `!v.secondary` guard means PiP/secondary video
/// is exempt from the init-data gate.
#[test]
fn headers_ready_ignores_secondary_video_without_codec_private() {
let title = video_title(true); // secondary = true
let parsers: Vec<(u16, Box<dyn CodecParser>)> = vec![(
0x1011,
Box::new(CountingParser {
per_pes: 0,
flush_n: 0,
cp: None,
}),
)];
let pid_to_track = vec![(0x1011u16, 0usize)];
let (stream, _tx) = make_stream(title, parsers, pid_to_track);
assert!(
stream.headers_ready(),
"secondary video is exempt from the codec_private gate"
);
}
/// codec_private(track) returns None for a track index not present in
/// pid_to_track — no panic, no wrong-track data.
#[test]
fn codec_private_none_for_unmapped_track() {
let (stream, _tx) = make_stream(DiscTitle::empty(), vec![], vec![]);
assert_eq!(stream.codec_private(7), None);
}
/// An audio-only title (no video streams) is always headers_ready — the
/// codec_private gate only applies to primary video.
#[test]
fn headers_ready_true_for_audio_only_title() {
let mut title = DiscTitle::empty();
title.streams.push(crate::disc::Stream::Audio(AudioStream {
pid: 0x1100,
codec: Codec::Ac3,
channels: AudioChannels::Surround51,
language: "eng".into(),
sample_rate: SampleRate::S48,
secondary: false,
purpose: LabelPurpose::Normal,
label: String::new(),
}));
let (stream, _tx) = make_stream(title, vec![], vec![]);
assert!(stream.headers_ready(), "no video → always ready");
}
/// finish() on the read-only pipeline is a no-op that returns Ok — the
/// consumer drives termination via read() returning None.
#[test]
fn finish_is_ok_noop() {
let (mut stream, _tx) = make_stream(DiscTitle::empty(), vec![], vec![]);
assert!(stream.finish().is_ok());
}
// --- DVD highway: keyframe flag must survive the PS → parser → frame path ---
/// Build a minimal MPEG-2 720x480/29.97 sequence header.
fn m2_seq_header() -> Vec<u8> {
let (w, h, aspect, fr): (u16, u16, u8, u8) = (720, 480, 2, 4);
let mut hdr = vec![0x00, 0x00, 0x01, 0xB3u8];
hdr.push((w >> 4) as u8);
hdr.push((((w & 0x0F) as u8) << 4) | (((h >> 8) & 0x0F) as u8));
hdr.push((h & 0xFF) as u8);
hdr.push((aspect << 4) | (fr & 0x0F));
hdr.extend_from_slice(&[0xFF, 0xFF, 0xFF, 0x00]);
hdr
}
fn m2_gop() -> Vec<u8> {
vec![0x00, 0x00, 0x01, 0xB8u8, 0x00, 0x00, 0x00, 0x00]
}
/// Frame-picture AU: picture header (coding_type, temporal_reference) +
/// coding extension (frame picture, 2 fields) + slice.
fn m2_pic(coding_type: u8, tr: u16) -> Vec<u8> {
let b4 = ((tr >> 2) & 0xFF) as u8;
let b5 = (((tr & 0x03) as u8) << 6) | ((coding_type & 0x07) << 3);
let mut au = vec![0x00, 0x00, 0x01, 0x00u8, b4, b5, 0x00, 0x00];
au.extend_from_slice(&[0x00, 0x00, 0x01, 0xB5u8, 0x80, 0x00, 0x03, 0x00, 0x80]);
au.extend_from_slice(&[0xAA; 32]);
au
}
/// DVD seek-index regression at the HIGHWAY level. The real CLI mux runs
/// `PsDemuxer → PipelinedPesStream (codec parse) → frame out`, NOT the
/// codec parser straight into the muxer. The keyframe flag and per-frame
/// duration the `Mpeg2Parser` sets on each `Frame` must survive that path
/// (`from_codec_frame`) so the muxer's cluster/cue logic — which opens a
/// cluster + pushes a cue on `keyframe && track 0` — actually fires. If the
/// highway dropped the keyframe flag, every video I-frame would arrive as a
/// non-keyframe and the DVD MKV would get thousands of clusters with ZERO
/// cues (chapter-seek only, no scrub).
#[test]
fn dvd_highway_preserves_video_keyframe_and_duration() {
use crate::mux::codec::mpeg2::Mpeg2Parser;
let mut title = DiscTitle::empty();
title.streams.push(crate::disc::Stream::Video(VideoStream {
pid: crate::mux::ps::DVD_VIDEO_PID,
codec: Codec::Mpeg2,
resolution: Resolution::R480i,
frame_rate: FrameRate::F29_97,
hdr: HdrFormat::Sdr,
color_space: ColorSpace::Bt709,
display_aspect: Some((4, 3)),
secondary: false,
label: String::new(),
measured_cicp: None,
}));
let parsers: Vec<(u16, Box<dyn CodecParser>)> =
vec![(crate::mux::ps::DVD_VIDEO_PID, Box::new(Mpeg2Parser::new()))];
let pid_to_track = vec![(crate::mux::ps::DVD_VIDEO_PID, 0usize)];
let (mut stream, tx) = make_stream(title, parsers, pid_to_track);
// 6 GOPs × 12 frames, each GOP one PS batch with one PTS-stamped video
// PES (stream_id 0xE0 → DVD_VIDEO_PID). Decode order I + P/B.
let field_ns = 1_000_000_000i64 * 1001 / 30000 / 2;
let frame_ns = 2 * field_ns;
let gop_len = 12u16;
for g in 0..6i64 {
let mut es = m2_seq_header();
es.extend_from_slice(&m2_gop());
es.extend_from_slice(&m2_pic(1, 0)); // I-frame, keyframe
for tr in 1..gop_len {
let ct = if tr % 3 == 0 { 2 } else { 3 };
es.extend_from_slice(&m2_pic(ct, tr));
}
let gop_pts = (g * gop_len as i64 * frame_ns * 90_000 / 1_000_000_000) as u64;
tx.send(DemuxBatch::Ps(vec![PsPacket {
source: None,
stream_id: 0xE0,
sub_stream_id: None,
pts: Some(gop_pts),
dts: None,
data: es,
}]))
.unwrap();
}
tx.send(DemuxBatch::Eof).unwrap();
// Drain every frame THROUGH the highway's read().
let mut frames = Vec::new();
while let Some(f) = stream.read().unwrap() {
frames.push(f);
}
assert!(!frames.is_empty(), "highway produced no frames");
let keyframes = frames.iter().filter(|f| f.keyframe).count();
let dur_some = frames.iter().filter(|f| f.duration_ns.is_some()).count();
assert_eq!(
keyframes, 6,
"the 6 GOP-opening I-frames must arrive as keyframes THROUGH the \
highway (one per GOP); got {keyframes} — if 0, the keyframe flag \
is being lost in the pipelined path and the DVD seek index dies"
);
assert_eq!(
dur_some,
frames.len(),
"every DVD VFR frame must carry its duration through the highway \
(BlockGroup path)"
);
assert!(
frames.iter().all(|f| f.track == 0),
"video routed to track 0 (cluster/cue open requires track 0)"
);
}
}