commit 52301a2d408dffbeac6d621cfe79ea54b99aab13
author Luc Trudeau <luc@trud.ca> Wed Nov 29 11:02:55 2017 -0500
committer Luc Trudeau <luc@trud.ca> Wed Nov 29 19:50:43 2017 +0000
tree 260771a89a043fb7bd8c4d28831a3787d231e5f3
parent fc851cbb2e2e990c128075668ffbddde3e63ff95

Add macroblockd_plane variable to super_block_uvrd

Change-Id: I43da630aa38c1b77fd76e5ef1a8e07a3b2b4ba6b

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 63188c0..522761c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3538,7 +3538,8 @@
                             int64_t ref_best_rd) {
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
-  const TX_SIZE uv_tx_size = av1_get_uv_tx_size(mbmi, &xd->plane[1]);
+  struct macroblockd_plane *const pd = &xd->plane[AOM_PLANE_U];
+  const TX_SIZE uv_tx_size = av1_get_uv_tx_size(mbmi, pd);
   int plane;
   int is_cost_valid = 1;
   av1_init_rd_stats(rd_stats);
@@ -3547,8 +3548,7 @@
 
   if (x->skip_chroma_rd) return is_cost_valid;
 
-  bsize = scale_chroma_bsize(bsize, xd->plane[1].subsampling_x,
-                             xd->plane[1].subsampling_y);
+  bsize = scale_chroma_bsize(bsize, pd->subsampling_x, pd->subsampling_y);
 
   if (is_inter_block(mbmi) && is_cost_valid) {
     for (plane = 1; plane < MAX_MB_PLANE; ++plane)