shithub: libvpx

Download patch

ref: 400973c3610e9cd423a475b3a8ad5b4fd110a942
parent: 6b47f8457875e04ff73d83cc414a39295bbf8989
parent: 219a006b9c0d7cc994167d339ac96825cc4eff74
author: Dmitry Kovalev <dkovalev@google.com>
date: Fri Apr 18 06:38:20 EDT 2014 

Merge "Adding get_pass() function."


--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -676,6 +676,23 @@
     cpi->fixed_divide[i] = 0x80000 / i;
 }
 
+static int get_pass(MODE mode) {
+  switch (mode) {
+    case REALTIME:
+    case ONE_PASS_GOOD:
+    case ONE_PASS_BEST:
+      return 0;
+
+    case TWO_PASS_FIRST:
+      return 1;
+
+    case TWO_PASS_SECOND_GOOD:
+    case TWO_PASS_SECOND_BEST:
+      return 2;
+  }
+  return -1;
+}
+
 void vp9_change_config(struct VP9_COMP *cpi, const VP9_CONFIG *oxcf) {
   VP9_COMMON *const cm = &cpi->common;
   RATE_CONTROL *const rc = &cpi->rc;
@@ -690,34 +707,9 @@
     assert(cm->bit_depth > BITS_8);
 
   cpi->oxcf = *oxcf;
-
-  switch (cpi->oxcf.mode) {
-      // Real time and one pass deprecated in test code base
-    case ONE_PASS_GOOD:
-      cpi->pass = 0;
-      break;
-
-    case ONE_PASS_BEST:
-      cpi->pass = 0;
-      break;
-
-    case TWO_PASS_FIRST:
-      cpi->pass = 1;
-      break;
-
-    case TWO_PASS_SECOND_GOOD:
-      cpi->pass = 2;
-      break;
-
-    case TWO_PASS_SECOND_BEST:
-      cpi->pass = 2;
-      break;
-
-    case REALTIME:
-      cpi->pass = 0;
-      cpi->oxcf.play_alternate = 0;
-      break;
-  }
+  cpi->pass = get_pass(cpi->oxcf.mode);
+  if (cpi->oxcf.mode == REALTIME)
+    cpi->oxcf.play_alternate = 0;
 
   cpi->oxcf.lossless = oxcf->lossless;
   if (cpi->oxcf.lossless) {
-- 
⑨