Merge change I55a6ac8c into eclair

* changes:
  Fixed the long recorder time and reduce the number of loops.