From: Marco <marpan@chromium.org>
Date: Thu, 11 Jun 2015 01:26:04 +0000 (-0700)
Subject: Remove duplicate calls for set_frame_size in 1 pass mode.
X-Git-Tag: v1.5.0~559
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8914ab696dbc30db6227596b063614d0689615ee;p=platform%2Fupstream%2Flibvpx.git

Remove duplicate calls for set_frame_size in 1 pass mode.

set_frame_size() is being called twice, once before entering
encode_encode_frame_to_data_rate(), and once again in that function.
No need to call it twice for one-pass mode.

Change-Id: I5fabaf0a90482d4f42cd89ef7ae1402c31aec600
---

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index ba38d64..ecd60d7 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -4165,7 +4165,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
           (is_two_pass_svc(cpi) &&
               cpi->svc.encode_empty_frame_state != ENCODING))) {
     vp9_rc_get_second_pass_params(cpi);
-  } else {
+  } else if (oxcf->pass == 1) {
     set_frame_size(cpi);
   }