Freeze the reported media time while audio is restarted

media/renderers/renderer_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_RENDERERS_RENDERER_IMPL_H_
 #define MEDIA_RENDERERS_RENDERER_IMPL_H_
 
 #include <list>
 #include <memory>
 #include <vector>
@@ skipping 211 matching lines @@
   // Used to defer underflow for video when audio is present.
   base::CancelableClosure deferred_video_underflow_cb_;
 
   // Used to defer underflow for audio when restarting audio playback.
   base::CancelableClosure deferred_audio_restart_underflow_cb_;
 
   // The amount of time to wait before declaring underflow if the video renderer
   // runs out of data but the audio renderer still has enough.
   base::TimeDelta video_underflow_threshold_;
 
+  // Lock used to protect access to the |restarting_audio_| flag and
+  // |restarting_audio_time_|.
+  // TODO(servolk): Get rid of the lock and replace restarting_audio_ with
+  // std::atomic<bool> when atomics are unbanned in Chromium.
+  base::Lock restarting_audio_lock_;
   bool restarting_audio_ = false;
+  base::TimeDelta restarting_audio_time_ = kNoTimestamp;
+
   bool restarting_video_ = false;
 
   // Flush operations and media track status changes must be serialized to avoid
   // interfering with each other. This list will hold a list of postponed
   // actions that need to be completed after the current async operation is
   // completed.
   std::list<base::Closure> pending_actions_;
 
   base::WeakPtr<RendererImpl> weak_this_;
   base::WeakPtrFactory<RendererImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_RENDERER_IMPL_H_