Merge changes from topic "am-d9f32dd9-3390-41f5-bb22-01a4025e5105" into oc-dev

* changes:
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb am: 18dd00f64d am: 484190d3e0 am: 7f576ec64a am: b38eb184d9 am: 249cc8d791
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb am: 18dd00f64d am: 484190d3e0 am: 7f576ec64a am: b38eb184d9
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb am: 18dd00f64d am: 484190d3e0 am: 7f576ec64a
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb am: 18dd00f64d am: 484190d3e0
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb am: 18dd00f64d
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc
  [automerger] Update sps id after decoding the sps am: df865d1a3d
  Update sps id after decoding the sps
This commit is contained in:
TreeHugger Robot 2018-02-07 22:38:27 +00:00 committed by Android (Google) Code Review
commit e4d70afdf5

View file

@ -1318,8 +1318,7 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec)
ps_sps->i1_vps_id = vps_id;
ps_sps->i1_sps_max_sub_layers = sps_max_sub_layers;
ps_sps->i1_sps_temporal_id_nesting_flag = sps_temporal_id_nesting_flag;
/* This is used only during initialization to get reorder count etc */
ps_codec->i4_sps_id = sps_id;
memcpy(&ps_sps->s_ptl, &s_ptl, sizeof(profile_tier_lvl_info_t));
UEV_PARSE("chroma_format_idc", value, ps_bitstrm);
@ -1707,6 +1706,9 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec)
}
}
/* This is used only during initialization to get reorder count etc */
ps_codec->i4_sps_id = sps_id;
ps_codec->i4_sps_done = 1;
return ret;
}