Implemented Multiple video track recoding.

media/capture/webm_muxer.h

 // Copyright 2015 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_FILTERS_LIBWEBM_MUXER_H_
 #define MEDIA_FILTERS_LIBWEBM_MUXER_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 28 matching lines @@
   // either any file header or a SingleBlock. The chunk is described as a byte
   // array and a byte length.
   using WriteDataCB = base::Callback<void(const base::StringPiece&)>;
 
   explicit WebmMuxer(const WriteDataCB& write_data_callback);
   ~WebmMuxer() override;
 
   // Adds a |video_frame| with |encoded_data.data()| to WebM Segment.
   // TODO(mcasas): Revisit how |encoded_data| is passed once the whole recording
   // chain is setup (http://crbug.com/262211).
-  void OnEncodedVideo(const scoped_refptr<VideoFrame>& video_frame,
+  void OnEncodedVideo(int track_index,
+                      const scoped_refptr<VideoFrame>& video_frame,
                       const base::StringPiece& encoded_data,
                       base::TimeTicks timestamp,
                       bool is_key_frame);
 
+  int GetNextTrackIndex();
+
  private:
   friend class WebmMuxerTest;
+  struct MuxerArg {

[ajose, 2015/09/18 18:28:58]

Change to VideoMuxerArg or similar? These tests will eventually need to test
audio too, so nice to have clear names in this regard.

[msu.koo, 2015/09/21 04:28:37]

Done.

+    MuxerArg(const base::TimeTicks& first_frame_timestamp, uint64 track_number)
+        : first_frame_timestamp(first_frame_timestamp),
+          track_number(track_number) {}
+
+    base::TimeTicks first_frame_timestamp;
+    uint64 track_number;
+  };
 
   // 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.
-  void AddVideoTrack(const gfx::Size& frame_size, double frame_rate);
+  uint64 AddVideoTrack(const gfx::Size& frame_size, double frame_rate);
 
   // IMkvWriter interface.
   mkvmuxer::int32 Write(const void* buf, mkvmuxer::uint32 len) override;
   mkvmuxer::int64 Position() const override;
   mkvmuxer::int32 Position(mkvmuxer::int64 position) override;
   bool Seekable() const override;
   void ElementStartNotify(mkvmuxer::uint64 element_id,
                           mkvmuxer::int64 position) override;
 
   // Used to DCHECK that we are called on the correct thread (usually IO)
   base::ThreadChecker thread_checker_;
 
-  // A caller-side identifier to interact with |segment_|, initialised upon
-  // first frame arrival by AddVideoTrack().
-  uint64_t track_index_;
-
-  // Origin of times for frame timestamps.
-  base::TimeTicks first_frame_timestamp_;
+  // Arguments for each tracks to mkvmuxer.
+  std::vector<MuxerArg> muxer_args;

[ajose, 2015/09/18 18:28:58]

muxer_args_ (or muxer_args_for_video_ or something)

[msu.koo, 2015/09/21 04:28:37]

Done.

 
   // Callback to dump written data as being called by libwebm.
   const WriteDataCB write_data_callback_;
 
   // Rolling counter of the position in bytes of the written goo.
   base::CheckedNumeric<mkvmuxer::int64> position_;
 
   // The MkvMuxer active element.
   mkvmuxer::Segment segment_;
 
   DISALLOW_COPY_AND_ASSIGN(WebmMuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_LIBWEBM_MUXER_H_