summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/encode_test_driver.cc5
-rw-r--r--test/encode_test_driver.h6
2 files changed, 6 insertions, 5 deletions
diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index 9ca15ae4d..d3feeee34 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -52,7 +52,8 @@ void Encoder::InitEncoder(VideoSource *video) {
}
}
-void Encoder::EncodeFrame(VideoSource *video, const unsigned long frame_flags) {
+void Encoder::EncodeFrame(VideoSource *video,
+ const vpx_enc_frame_flags_t frame_flags) {
if (video->img()) {
EncodeFrameInternal(*video, frame_flags);
} else {
@@ -70,7 +71,7 @@ void Encoder::EncodeFrame(VideoSource *video, const unsigned long frame_flags) {
}
void Encoder::EncodeFrameInternal(const VideoSource &video,
- const unsigned long frame_flags) {
+ const vpx_enc_frame_flags_t frame_flags) {
vpx_codec_err_t res;
const vpx_image_t *img = video.img();
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index f6bb841d8..b57df8529 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -103,7 +103,7 @@ class Encoder {
}
// This is a thin wrapper around vpx_codec_encode(), so refer to
// vpx_encoder.h for its semantics.
- void EncodeFrame(VideoSource *video, const unsigned long frame_flags);
+ void EncodeFrame(VideoSource *video, vpx_enc_frame_flags_t frame_flags);
// Convenience wrapper for EncodeFrame()
void EncodeFrame(VideoSource *video) { EncodeFrame(video, 0); }
@@ -184,7 +184,7 @@ class Encoder {
// Encode an image
void EncodeFrameInternal(const VideoSource &video,
- const unsigned long frame_flags);
+ vpx_enc_frame_flags_t frame_flags);
// Flush the encoder on EOS
void Flush();
@@ -289,7 +289,7 @@ class EncoderTest {
unsigned long deadline_;
TwopassStatsStore stats_;
unsigned long init_flags_;
- unsigned long frame_flags_;
+ vpx_enc_frame_flags_t frame_flags_;
};
} // namespace libvpx_test