[rbp] Fix for audio out of sync part 2
Merge pull request #2080 from popcornmix/timestamp_fix2

[rbp] Fix for audio out of sync part 2