Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1254)

Unified Diff: content/renderer/media/media_recorder_handler.h

Issue 1351473006: WebmMuxer-MediaRecorderHandler: thread hopping and data ownership (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix data ownership before thread jump. ajose@ comment Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_recorder_handler.h
diff --git a/content/renderer/media/media_recorder_handler.h b/content/renderer/media/media_recorder_handler.h
index a97843bba757f81ed06da8c691718b4bf3962300..d08a80943a79d917c68066d27870cba59571ace4 100644
--- a/content/renderer/media/media_recorder_handler.h
+++ b/content/renderer/media/media_recorder_handler.h
@@ -8,7 +8,6 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
-#include "base/strings/string_piece.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/WebMediaRecorderHandler.h"
@@ -57,7 +56,7 @@ class CONTENT_EXPORT MediaRecorderHandler final
private:
friend class MediaRecorderHandlerTest;
- void WriteData(const base::StringPiece& data);
+ void WriteData(scoped_ptr<std::string> data);
void OnVideoFrameForTesting(const scoped_refptr<media::VideoFrame>& frame,
const base::TimeTicks& timestamp);
@@ -74,7 +73,7 @@ class CONTENT_EXPORT MediaRecorderHandler final
ScopedVector<VideoTrackRecorder> video_recorders_;
// Worker class doing the actual Webm Muxing work.
- scoped_ptr<media::WebmMuxer> webm_muxer_;
+ scoped_refptr<media::WebmMuxer> webm_muxer_;
base::WeakPtrFactory<MediaRecorderHandler> weak_factory_;
« no previous file with comments | « no previous file | content/renderer/media/media_recorder_handler.cc » ('j') | content/renderer/media/media_recorder_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698