The kernel copy follows the new kernel: the OAMD parser and the speaker controls accept warp modes 2 and 3, and the renderer pans the 5.1-family and 4.0 layouts in an expanded surround layout before folding the rear pair into the target. Trim selection, balance and automatic compensation stay with the final target layout, and the folded result feeds the existing ramp and mix. Builds Release-Static|x64 and |Win32. layout_table_test and channel_swap_test still pass; the render harness now renders a warp-3 stream instead of reporting the unimplemented mode.