Refactoring of media::HDRMetadata struct

chromecast/public/media/decoder_config.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_
 #define CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 247 matching lines @@
   float luminance_max = 0;
   float luminance_min = 0;
 
   MasteringMetadata();
   MasteringMetadata(const MasteringMetadata& rhs);
 };
 
 // HDR metadata common for HDR10 and WebM/VP9-based HDR formats.
 struct HDRMetadata {
   MasteringMetadata mastering_metadata;
-  unsigned max_cll = 0;
-  unsigned max_fall = 0;
+  unsigned max_content_light_level = 0;
+  unsigned max_frame_average_light_level = 0;
 
   HDRMetadata();
   HDRMetadata(const HDRMetadata& rhs);
 };
 
 inline MasteringMetadata::MasteringMetadata() {}
 inline MasteringMetadata::MasteringMetadata(const MasteringMetadata& rhs) =
     default;
 
 inline HDRMetadata::HDRMetadata() {}
@@ skipping 107 matching lines @@
 inline bool IsValidConfig(const VideoConfig& config) {
   return config.codec >= kVideoCodecMin &&
       config.codec <= kVideoCodecMax &&
       config.codec != kVideoCodecUnknown;
 }
 
 }  // namespace media
 }  // namespace chromecast
 
 #endif  // CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_