From bf7edb9a2d9e52247bd20ceadd1a4ffefe7c9663 Mon Sep 17 00:00:00 2001
From: "Pohsiang (John) Hsu" <pohhsu@microsoft.com>
Date: Mon, 9 Dec 2024 17:16:27 -0800
Subject: [PATCH] d3d12: fix start code prevention in write_sei_nalu()

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed by: Pohsiang (John) Hsu <pohhsu@microsoft.com>

Reviewed-by: Jesse Natalie <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33312>
---
 .../drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp
index 7a569bd0ed6..64de80b4301 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp
@@ -555,6 +555,8 @@ d3d12_video_nalu_writer_h264::write_sei_nalu(H264_SEI_MESSAGE               sei_
       assert(false);
    }
 
+   sei_payload_bitstream.set_start_code_prevention(true);
+
    switch (sei_message.payload_type)
    {
       case H264_SEI_SCALABILITY_INFO:
@@ -618,8 +620,6 @@ d3d12_video_nalu_writer_h264::write_sei_nalu(H264_SEI_MESSAGE               sei_
       assert(false);
    }
 
-   rbsp.set_start_code_prevention(true);
-
    //
    // Write payload_type to bitstream
    //
@@ -720,4 +720,4 @@ d3d12_video_nalu_writer_h264::write_slice_svc_prefix(const H264_SLICE_PREFIX_SVC
    std::copy_n(&naluBytes[0], naluByteSize, &headerBitstream.data()[startDstIndex]);
 
    writtenBytes = naluByteSize;
-}
\ No newline at end of file
+}