OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/media/media_recorder_handler.h" | 5 #include "content/renderer/media/media_recorder_handler.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/strings/stringprintf.h" | |
10 #include "content/renderer/media/video_track_recorder.h" | 11 #include "content/renderer/media/video_track_recorder.h" |
11 #include "media/base/bind_to_current_loop.h" | 12 #include "media/base/bind_to_current_loop.h" |
12 #include "media/capture/webm_muxer.h" | 13 #include "media/capture/webm_muxer.h" |
13 #include "third_party/WebKit/public/platform/WebMediaRecorderHandlerClient.h" | 14 #include "third_party/WebKit/public/platform/WebMediaRecorderHandlerClient.h" |
14 #include "third_party/WebKit/public/platform/WebString.h" | 15 #include "third_party/WebKit/public/platform/WebString.h" |
15 | 16 |
16 namespace content { | 17 namespace content { |
17 | 18 |
18 MediaRecorderHandler::MediaRecorderHandler() | 19 MediaRecorderHandler::MediaRecorderHandler() |
19 : recording_(false), client_(nullptr), weak_factory_(this) { | 20 : recording_(false), client_(nullptr), weak_factory_(this) { |
20 DVLOG(3) << __FUNCTION__; | 21 DVLOG(3) << __FUNCTION__; |
22 webm_muxer_ = | |
23 new media::WebmMuxer(base::MessageLoop::current()->task_runner(), | |
24 media::BindToCurrentLoop( | |
25 base::Bind(&MediaRecorderHandler::WriteData, | |
26 weak_factory_.GetWeakPtr()))); | |
21 } | 27 } |
22 | 28 |
23 MediaRecorderHandler::~MediaRecorderHandler() { | 29 MediaRecorderHandler::~MediaRecorderHandler() { |
24 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 30 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
25 // Send a |last_in_slice| to our |client_|. | 31 // Send a |last_in_slice| to our |client_|. |
26 if (client_) | 32 if (client_) |
27 client_->writeData(nullptr, 0u, true); | 33 client_->writeData(nullptr, 0u, true); |
28 } | 34 } |
29 | 35 |
30 bool MediaRecorderHandler::canSupportMimeType( | 36 bool MediaRecorderHandler::canSupportMimeType( |
(...skipping 22 matching lines...) Expand all Loading... | |
53 bool MediaRecorderHandler::start() { | 59 bool MediaRecorderHandler::start() { |
54 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 60 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
55 DCHECK(!recording_); | 61 DCHECK(!recording_); |
56 return start(0); | 62 return start(0); |
57 } | 63 } |
58 | 64 |
59 bool MediaRecorderHandler::start(int timeslice) { | 65 bool MediaRecorderHandler::start(int timeslice) { |
60 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 66 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
61 DCHECK(!recording_); | 67 DCHECK(!recording_); |
62 DCHECK(!media_stream_.isNull()); | 68 DCHECK(!media_stream_.isNull()); |
63 | |
64 webm_muxer_.reset(new media::WebmMuxer(media::BindToCurrentLoop(base::Bind( | |
65 &MediaRecorderHandler::WriteData, weak_factory_.GetWeakPtr())))); | |
66 DCHECK(webm_muxer_); | 69 DCHECK(webm_muxer_); |
67 | 70 |
68 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; | 71 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; |
69 media_stream_.videoTracks(video_tracks); | 72 media_stream_.videoTracks(video_tracks); |
70 | 73 |
71 if (video_tracks.isEmpty()) { | 74 if (video_tracks.isEmpty()) { |
72 // TODO(mcasas): Add audio_tracks and update the code in this function | 75 // TODO(mcasas): Add audio_tracks and update the code in this function |
73 // correspondingly, see http://crbug.com/528519. As of now, only video | 76 // correspondingly, see http://crbug.com/528519. As of now, only video |
74 // tracks are supported. | 77 // tracks are supported. |
75 LOG(WARNING) << "Recording no video tracks is not implemented"; | 78 LOG(WARNING) << "Recording no video tracks is not implemented"; |
76 return false; | 79 return false; |
77 } | 80 } |
78 // TODO(mcasas): The muxer API supports only one video track. Extend it to | 81 // TODO(mcasas): The muxer API supports only one video track. Extend it to |
79 // several video tracks, see http://crbug.com/528523. | 82 // several video tracks, see http://crbug.com/528523. |
80 LOG_IF(WARNING, video_tracks.size() > 1u) << "Recording multiple video" | 83 LOG_IF(WARNING, video_tracks.size() > 1u) << "Recording multiple video" |
81 << " tracks is not implemented. Only recording first video track."; | 84 << " tracks is not implemented. Only recording first video track."; |
82 const blink::WebMediaStreamTrack& video_track = video_tracks[0]; | 85 const blink::WebMediaStreamTrack& video_track = video_tracks[0]; |
83 if (video_track.isNull()) | 86 if (video_track.isNull()) |
84 return false; | 87 return false; |
85 | 88 |
86 const VideoTrackRecorder::OnEncodedVideoCB on_encoded_video_cb = | 89 const VideoTrackRecorder::OnEncodedVideoCB on_encoded_video_cb = |
87 base::Bind(&media::WebmMuxer::OnEncodedVideo, | 90 base::Bind(&media::WebmMuxer::OnEncodedVideo, webm_muxer_); |
miu
2015/09/21 19:39:43
This does not call for ref-counting WebmMuxer. Wh
mcasas
2015/09/21 20:22:18
Yes, that's another possibility, essentially bounc
miu
2015/09/21 20:57:12
That's why, in my example, I wrapped the base::Bin
| |
88 base::Unretained(webm_muxer_.get())); | |
89 | 91 |
90 video_recorders_.push_back(new VideoTrackRecorder(video_track, | 92 video_recorders_.push_back(new VideoTrackRecorder(video_track, |
91 on_encoded_video_cb)); | 93 on_encoded_video_cb)); |
92 | 94 |
93 recording_ = true; | 95 recording_ = true; |
94 return true; | 96 return true; |
95 } | 97 } |
96 | 98 |
97 void MediaRecorderHandler::stop() { | 99 void MediaRecorderHandler::stop() { |
98 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 100 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
99 DCHECK(recording_); | 101 DCHECK(recording_); |
100 | 102 |
101 recording_ = false; | 103 recording_ = false; |
102 video_recorders_.clear(); | 104 video_recorders_.clear(); |
103 webm_muxer_.reset(NULL); | |
104 } | 105 } |
105 | 106 |
106 void MediaRecorderHandler::pause() { | 107 void MediaRecorderHandler::pause() { |
107 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 108 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
108 DCHECK(recording_); | 109 DCHECK(recording_); |
109 recording_ = false; | 110 recording_ = false; |
110 NOTIMPLEMENTED(); | 111 NOTIMPLEMENTED(); |
111 } | 112 } |
112 | 113 |
113 void MediaRecorderHandler::resume() { | 114 void MediaRecorderHandler::resume() { |
114 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 115 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
115 DCHECK(!recording_); | 116 DCHECK(!recording_); |
116 recording_ = true; | 117 recording_ = true; |
117 NOTIMPLEMENTED(); | 118 NOTIMPLEMENTED(); |
118 } | 119 } |
119 | 120 |
120 void MediaRecorderHandler::WriteData(const base::StringPiece& data) { | 121 void MediaRecorderHandler::WriteData(scoped_ptr<std::string> data) { |
121 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 122 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
122 client_->writeData(data.data(), data.size(), false /* lastInSlice */); | 123 client_->writeData(data->data(), data->length(), false /* lastInSlice */); |
123 } | 124 } |
124 | 125 |
125 void MediaRecorderHandler::OnVideoFrameForTesting( | 126 void MediaRecorderHandler::OnVideoFrameForTesting( |
126 const scoped_refptr<media::VideoFrame>& frame, | 127 const scoped_refptr<media::VideoFrame>& frame, |
127 const base::TimeTicks& timestamp) { | 128 const base::TimeTicks& timestamp) { |
128 for (auto* recorder : video_recorders_) | 129 for (auto* recorder : video_recorders_) |
129 recorder->OnVideoFrameForTesting(frame, timestamp); | 130 recorder->OnVideoFrameForTesting(frame, timestamp); |
130 } | 131 } |
131 | 132 |
132 } // namespace content | 133 } // namespace content |
OLD | NEW |