Merge "Cleaning up encode_frame_to_data_rate()."