commit c4f7079ad4863af830f55453e7a8cc6de0290928
author Frank Galligan <fgalligan@google.com> Mon Dec 15 12:00:09 2014 -0800
committer Frank Galligan <fgalligan@google.com> Mon Dec 15 12:20:37 2014 -0800
tree f918085cb7243709f039bff7f749fb40815bea3a
parent 8d558f2ca5867828cbf07ef1dce9ad457be7e818

Revert "Revert "Add support for setting byte alignment.""

This reverts commit 91471d6aad285ff10e7582e485d8adadd1986fe2.

Fixes the compile issues if post_proc is enabled.

Change-Id: Ib40a15ce2c194f9b5adfa65a17ab01ddf60f5a59

test/decode_test_driver.h

diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h
index 232428e..f566c53 100644
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -72,9 +72,7 @@
   }
 
   void Control(int ctrl_id, int arg) {
-    InitOnce();
-    const vpx_codec_err_t res = vpx_codec_control_(&decoder_, ctrl_id, arg);
-    ASSERT_EQ(VPX_CODEC_OK, res) << DecodeError();
+    Control(ctrl_id, arg, VPX_CODEC_OK);
   }
 
   void Control(int ctrl_id, const void *arg) {
@@ -83,6 +81,12 @@
     ASSERT_EQ(VPX_CODEC_OK, res) << DecodeError();
   }
 
+  void Control(int ctrl_id, int arg, vpx_codec_err_t expected_value) {
+    InitOnce();
+    const vpx_codec_err_t res = vpx_codec_control_(&decoder_, ctrl_id, arg);
+    ASSERT_EQ(expected_value, res) << DecodeError();
+  }
+
   const char* DecodeError() {
     const char *detail = vpx_codec_error_detail(&decoder_);
     return detail ? detail : vpx_codec_error(&decoder_);