Chromium Code Reviews| Index: media/capture/webm_muxer.h |
| diff --git a/media/capture/webm_muxer.h b/media/capture/webm_muxer.h |
| index 153e14fd942d995047e1c7c935f465b79cae42ee..42a0a11baf6c0d8a71e509d30e43d1448d879d12 100644 |
| --- a/media/capture/webm_muxer.h |
| +++ b/media/capture/webm_muxer.h |
| @@ -27,8 +27,10 @@ class VideoFrame; |
| // containing a single encoded video frame. WebM container has no Trailer. |
| // Clients will push encoded VPx video frames one by one via the |
| // OnEncodedVideo(). libwebm will eventually ping the WriteDataCB passed on |
| -// contructor with the wrapped encoded data. All operations must happen in a |
| -// single thread, where WebmMuxer is created and destroyed. |
| +// contructor with the wrapped encoded data. |
| +// WebmMuxer is created/destroyed on a thread, usually the Main Render thread, |
| +// and receives OnEncodedVideo()s on another thread, usually Render IO, although |
| +// its identity is not enforced. |
| // [1] http://www.webmproject.org/docs/container/ |
| // [2] http://www.matroska.org/technical/specs/index.html |
| // TODO(mcasas): Add support for Audio muxing. |
| @@ -56,8 +58,7 @@ class MEDIA_EXPORT WebmMuxer : public NON_EXPORTED_BASE(mkvmuxer::IMkvWriter) { |
| // Creates and adds a new video track. Called upon receiving the first |
| // frame of a given Track, adds |frame_size| and |frame_rate| to the Segment |
| // info, although individual frames passed to OnEncodedVideo() can have any |
| - // frame size. Returns OnEncodedVideo() callback with a |track_number| bound |
| - // in the callback. |
| + // frame size. |
| void AddVideoTrack(const gfx::Size& frame_size, double frame_rate); |
| // IMkvWriter interface. |
| @@ -69,7 +70,7 @@ class MEDIA_EXPORT WebmMuxer : public NON_EXPORTED_BASE(mkvmuxer::IMkvWriter) { |
| mkvmuxer::int64 position) override; |
| // Used to DCHECK that we are called on the correct thread. |
| - base::ThreadChecker thread_checker_; |
| + base::ThreadChecker io_thread_checker_; |
|
miu
2015/09/02 21:28:13
Not sure you need the name change here, since OnEn
mcasas
2015/09/04 02:16:30
Done., but in general IO thread is where the frame
|
| // A caller-side identifier to interact with |segment_|, initialised upon |
| // first frame arrival by AddVideoTrack(). |