Replacing SVC oxcf->mode check with oxcf->pass check.
authorDmitry Kovalev <dkovalev@google.com>
Mon, 18 Aug 2014 21:11:59 +0000 (14:11 -0700)
committerDmitry Kovalev <dkovalev@google.com>
Mon, 18 Aug 2014 21:11:59 +0000 (14:11 -0700)
oxcf->pass is used in all other places in similar contexts.

Change-Id: I9de3a5f24311838d5a6dc3dd470d258cb189ff59

vp9/encoder/vp9_encoder.c

index 58059f8..60f20c1 100644 (file)
@@ -525,10 +525,8 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) {
   // Temporal scalability.
   cpi->svc.number_temporal_layers = oxcf->ts_number_layers;
 
-  if ((cpi->svc.number_temporal_layers > 1 &&
-      cpi->oxcf.rc_mode == VPX_CBR) ||
-      (cpi->svc.number_spatial_layers > 1 &&
-      cpi->oxcf.mode == TWO_PASS_SECOND_BEST)) {
+  if ((cpi->svc.number_temporal_layers > 1 && cpi->oxcf.rc_mode == VPX_CBR) ||
+      (cpi->svc.number_spatial_layers > 1 && cpi->oxcf.pass == 2)) {
     vp9_init_layer_context(cpi);
   }