commit 5f9433e1053ec56b72ac6760a33d4270b8cca562
author James Zern <jzern@google.com> Wed Jul 27 14:43:50 2022 -0700
committer James Zern <jzern@google.com> Thu Jul 28 01:43:53 2022 +0000
tree be61e4bc6d3f8693080e018eaf1c6ae769f9b8e0
parent 4a8de4215225b6ee2840e21231d42f063795ca5a

encode_test_driver: normalize frame_flags type

use aom_enc_frame_flags_t; this avoids int -> unsigned conversion
warnings; reported w/clang -fsanitize=integer:

test/error_resilience_test.cc:83:9: runtime error: implicit conversion
from type 'int' of value -2071986177 (32-bit, signed) to type 'unsigned
long' changed the value to 18446744071637565439 (64-bit, unsigned)

Bug: b/229626362
Change-Id: I0fc1dbe44a258f397cf1a05347d8cb86ee70b1b8

test/encode_test_driver.cc

diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index e212e3c..b5c506c 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -39,7 +39,8 @@
   }
 }
 
-void Encoder::EncodeFrame(VideoSource *video, const unsigned long frame_flags) {
+void Encoder::EncodeFrame(VideoSource *video,
+                          const aom_enc_frame_flags_t frame_flags) {
   if (video->img())
     EncodeFrameInternal(*video, frame_flags);
   else
@@ -56,7 +57,7 @@
 }
 
 void Encoder::EncodeFrameInternal(const VideoSource &video,
-                                  const unsigned long frame_flags) {
+                                  const aom_enc_frame_flags_t frame_flags) {
   aom_codec_err_t res;
   const aom_image_t *img = video.img();
 

test/encode_test_driver.h

diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index fb18ecb..80be8ed 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -99,7 +99,7 @@
   }
   // This is a thin wrapper around aom_codec_encode(), so refer to
   // aom_encoder.h for its semantics.
-  void EncodeFrame(VideoSource *video, const unsigned long frame_flags);
+  void EncodeFrame(VideoSource *video, aom_enc_frame_flags_t frame_flags);
 
   // Convenience wrapper for EncodeFrame()
   void EncodeFrame(VideoSource *video) { EncodeFrame(video, 0); }
@@ -172,7 +172,7 @@
 
   // Encode an image
   void EncodeFrameInternal(const VideoSource &video,
-                           const unsigned long frame_flags);
+                           aom_enc_frame_flags_t frame_flags);
 
   // Flush the encoder on EOS
   void Flush();
@@ -277,7 +277,7 @@
   unsigned int passes_;
   TwopassStatsStore stats_;
   aom_codec_flags_t init_flags_;
-  unsigned long frame_flags_;
+  aom_enc_frame_flags_t frame_flags_;
   TestMode mode_;
 };