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

Unified Diff: media/capture/webm_muxer.cc

Issue 1313603004: MediaRecorderHandler (video part) and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: miu@s comments -- except thread in which ~VpxEncoder() executes. Rebase. Using blink::WebMediaRecor… 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: media/capture/webm_muxer.cc
diff --git a/media/capture/webm_muxer.cc b/media/capture/webm_muxer.cc
index b3f8e749546b9ef0776474727459407d15ebdf93..bb72e6fbc45b7409fb37bf5babb60bc1855ca108 100644
--- a/media/capture/webm_muxer.cc
+++ b/media/capture/webm_muxer.cc
@@ -28,26 +28,20 @@ WebmMuxer::WebmMuxer(const WriteDataCB& write_data_callback)
: track_index_(0),
write_data_callback_(write_data_callback),
position_(0) {
- DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!write_data_callback_.is_null());
- segment_.Init(this);
- segment_.set_mode(mkvmuxer::Segment::kLive);
- segment_.OutputCues(false);
-
- mkvmuxer::SegmentInfo* const info = segment_.GetSegmentInfo();
- info->set_writing_app("Chrome");
- info->set_muxing_app("Chrome");
+ // Creation is done on a different thread than main activities.
+ thread_checker_.DetachFromThread();
}
WebmMuxer::~WebmMuxer() {
- DCHECK(thread_checker_.CalledOnValidThread());
- segment_.Finalize();
+ // No need to segment_.Finalize() since is not Seekable(), i.e. a live stream.
}
void WebmMuxer::OnEncodedVideo(const scoped_refptr<VideoFrame>& video_frame,
const base::StringPiece& encoded_data,
base::TimeTicks timestamp,
bool is_key_frame) {
+ DVLOG(1) << __FUNCTION__ << " - " << encoded_data.size() << "B";
DCHECK(thread_checker_.CalledOnValidThread());
if (!track_index_) {
// |track_index_|, cannot be zero (!), initialize WebmMuxer in that case.
@@ -66,6 +60,15 @@ void WebmMuxer::OnEncodedVideo(const scoped_refptr<VideoFrame>& video_frame,
void WebmMuxer::AddVideoTrack(const gfx::Size& frame_size, double frame_rate) {
DCHECK(thread_checker_.CalledOnValidThread());
+
+ segment_.Init(this);
+ segment_.set_mode(mkvmuxer::Segment::kLive);
+ segment_.OutputCues(false);
+
+ mkvmuxer::SegmentInfo* const info = segment_.GetSegmentInfo();
+ info->set_writing_app("Chrome");
+ info->set_muxing_app("Chrome");
+
DCHECK_EQ(track_index_, 0u);
track_index_ =
segment_.AddVideoTrack(frame_size.width(), frame_size.height(), 0);

Powered by Google App Engine
This is Rietveld 408576698