From cb6ec6165f7dfa84b3b5837c074039a18c9a23a7 Mon Sep 17 00:00:00 2001
From: Dale Curtis <[email protected]>
Date: Tue, 15 Sep 2026 09:31:29 -0700
Subject: [PATCH] Initialize chroma_sampling in HEVCDecoderConfigurationRecord.

chroma_sampling was uninitialized upon default construction and remained
uninitialized if parsed extradata did not include SPS NALUs. This led to
use-of-uninitialized-value errors when GetChromaSampling() was called.

Fixed: 560373976
Change-Id: I88a09018ad45c3854ae42a6d05013dafbf866ace
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8408787
Commit-Queue: Dale Curtis <[email protected]>
Reviewed-by: Eugene Zemtsov <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1698165}
---
diff --git a/media/formats/mp4/hevc.cc b/media/formats/mp4/hevc.cc
index 50b0425..81c5802 100644
--- a/media/formats/mp4/hevc.cc
+++ b/media/formats/mp4/hevc.cc
@@ -51,6 +51,7 @@
       temporalIdNested(0),
       lengthSizeMinusOne(0),
       numOfArrays(0),
+      chroma_sampling(VideoChromaSampling::kUnknown),
       alpha_mode(VideoDecoderConfig::AlphaMode::kIsOpaque) {}
 
 HEVCDecoderConfigurationRecord::HEVCDecoderConfigurationRecord(
diff --git a/media/formats/mp4/hevc_unittest.cc b/media/formats/mp4/hevc_unittest.cc
index fe1dc87..8ab8950a 100644
--- a/media/formats/mp4/hevc_unittest.cc
+++ b/media/formats/mp4/hevc_unittest.cc
@@ -114,4 +114,14 @@
   EXPECT_TRUE(test_data == output);
 }
 
+TEST(HEVCAnalyzeAnnexBTest, HEVCDecoderConfigurationRecordDefaultValues) {
+  HEVCDecoderConfigurationRecord record;
+#if BUILDFLAG(ENABLE_HEVC_PARSER_AND_HW_DECODER)
+  EXPECT_FALSE(record.GetColorSpace().IsSpecified());
+  EXPECT_EQ(record.GetChromaSampling(), VideoChromaSampling::kUnknown);
+  EXPECT_FALSE(record.GetHDRMetadata().IsValid());
+  EXPECT_EQ(record.GetAlphaMode(), VideoDecoderConfig::AlphaMode::kIsOpaque);
+#endif  // BUILDFLAG(ENABLE_HEVC_PARSER_AND_HW_DECODER)
+}
+
 }  // namespace media::mp4

diff --git a/media/formats/mp4/hevc_unittest.cc b/media/formats/mp4/hevc_unittest.cc
index fe1dc87..8ab8950a 100644
--- a/media/formats/mp4/hevc_unittest.cc
+++ b/media/formats/mp4/hevc_unittest.cc
@@ -114,4 +114,14 @@
   EXPECT_TRUE(test_data == output);
 }
 
+TEST(HEVCAnalyzeAnnexBTest, HEVCDecoderConfigurationRecordDefaultValues) {
+  HEVCDecoderConfigurationRecord record;
+#if BUILDFLAG(ENABLE_HEVC_PARSER_AND_HW_DECODER)
+  EXPECT_FALSE(record.GetColorSpace().IsSpecified());
+  EXPECT_EQ(record.GetChromaSampling(), VideoChromaSampling::kUnknown);
+  EXPECT_FALSE(record.GetHDRMetadata().IsValid());
+  EXPECT_EQ(record.GetAlphaMode(), VideoDecoderConfig::AlphaMode::kIsOpaque);
+#endif  // BUILDFLAG(ENABLE_HEVC_PARSER_AND_HW_DECODER)
+}
+
 }  // namespace media::mp4