Merge "[BITSTREAM]Fix the scaling calculation"