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

Side by Side Diff: media/capture/webm_muxer.h

Issue 1233033002: MediaStream: Adding VideoTrackRecorder class and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: miu@s comment on OnFirstFrameCB and OnEncodedVideoCB Created 5 years, 4 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 unified diff | Download patch
OLDNEW
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 #ifndef MEDIA_FILTERS_LIBWEBM_MUXER_H_ 5 #ifndef MEDIA_FILTERS_LIBWEBM_MUXER_H_
6 #define MEDIA_FILTERS_LIBWEBM_MUXER_H_ 6 #define MEDIA_FILTERS_LIBWEBM_MUXER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/memory/weak_ptr.h"
12 #include "base/numerics/safe_math.h" 13 #include "base/numerics/safe_math.h"
13 #include "base/strings/string_piece.h" 14 #include "base/strings/string_piece.h"
14 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
15 #include "base/time/time.h" 16 #include "base/time/time.h"
16 #include "media/base/media_export.h" 17 #include "media/base/media_export.h"
17 #include "third_party/libwebm/source/mkvmuxer.hpp" 18 #include "third_party/libwebm/source/mkvmuxer.hpp"
18 #include "ui/gfx/geometry/size.h" 19 #include "ui/gfx/geometry/size.h"
19 20
20 namespace media { 21 namespace media {
21 22
22 // Adapter class to manage a WebM container [1], a simplified version of a 23 // Adapter class to manage a WebM container [1], a simplified version of a
23 // Matroska container [2], composed of an EBML header, and a single Segment 24 // Matroska container [2], composed of an EBML header, and a single Segment
24 // including at least a Track Section and a number of SimpleBlocks each 25 // including at least a Track Section and a number of SimpleBlocks each
25 // containing a single encoded video frame. WebM container has no Trailer. 26 // containing a single encoded video frame. WebM container has no Trailer.
26 // Clients will push encoded VPx video frames one by one via OnEncodedVideo() 27 // Clients will push encoded VPx video frames one by one via the
27 // with indication of the Track they belong to, and libwebm will eventually ping 28 // OnEncodedVideoCB() returned by AddVideoTrack(). libwebm will eventually ping
28 // the WriteDataCB passed on contructor with the wrapped encoded data. All 29 // the WriteDataCB passed on contructor with the wrapped encoded data. All
29 // operations must happen in a single thread, where WebmMuxer is created and 30 // operations must happen in a single thread, where WebmMuxer is created and
30 // destroyed. 31 // destroyed.
31 // [1] http://www.webmproject.org/docs/container/ 32 // [1] http://www.webmproject.org/docs/container/
32 // [2] http://www.matroska.org/technical/specs/index.html 33 // [2] http://www.matroska.org/technical/specs/index.html
33 // TODO(mcasas): Add support for Audio muxing. 34 // TODO(mcasas): Add support for Audio muxing.
34 class MEDIA_EXPORT WebmMuxer : public NON_EXPORTED_BASE(mkvmuxer::IMkvWriter) { 35 class MEDIA_EXPORT WebmMuxer : public NON_EXPORTED_BASE(mkvmuxer::IMkvWriter) {
35 public: 36 public:
36 // Callback to be called when WebmMuxer is ready to write a chunk of data, 37 // Callback to be called when WebmMuxer is ready to write a chunk of data,
37 // either any file header or a SingleBlock. The chunk is described as a byte 38 // either any file header or a SingleBlock. The chunk is described as a byte
38 // array and a byte length. 39 // array and a byte length.
39 using WriteDataCB = base::Callback<void(const base::StringPiece&)>; 40 using WriteDataCB = base::Callback<void(const base::StringPiece&)>;
40 41
41 explicit WebmMuxer(const WriteDataCB& write_data_callback); 42 explicit WebmMuxer(const WriteDataCB& write_data_callback);
42 ~WebmMuxer() override; 43 ~WebmMuxer() override;
43 44
44 // Creates and adds a new video track. Called before receiving the first 45 // Creates and adds a new video track. Called upon receiving the first
45 // frame of a given Track, adds |frame_size| and |frame_rate| to the Segment 46 // frame of a given Track, adds |frame_size| and |frame_rate| to the Segment
46 // info, although individual frames passed to OnEncodedVideo() can have any 47 // info, although individual frames passed to OnEncodedVideo() can have any
47 // frame size. Returns the track_index to be used for OnEncodedVideo(). 48 // frame size. Returns OnEncodedVideo() callback with a |track_number| bound
48 uint64_t AddVideoTrack(const gfx::Size& frame_size, double frame_rate); 49 // in the callback.
50 using OnEncodedVideoCB = base::Callback<void(const base::StringPiece& data,
51 base::TimeDelta timestamp,
52 bool is_key_frame)>;
53 OnEncodedVideoCB AddVideoTrack(const gfx::Size& frame_size,
54 double frame_rate);
55
56 private:
57 friend class WebmMuxerTest;
49 58
50 // Adds a frame with |encoded_data.data()| to WebM Segment. |track_number| is 59 // Adds a frame with |encoded_data.data()| to WebM Segment. |track_number| is
51 // a caller-side identifier and must have been provided by AddVideoTrack(). 60 // a caller-side identifier and must have been returned by AddVideoTrack().
52 // TODO(mcasas): Revisit how |encoded_data| is passed once the whole recording 61 // TODO(mcasas): Revisit how |encoded_data| is passed once the whole recording
53 // chain is setup (http://crbug.com/262211). 62 // chain is setup (http://crbug.com/262211).
54 void OnEncodedVideo(uint64_t track_number, 63 void OnEncodedVideo(uint64_t track_number,
55 const base::StringPiece& encoded_data, 64 const base::StringPiece& encoded_data,
56 base::TimeDelta timestamp, 65 base::TimeDelta timestamp,
57 bool keyframe); 66 bool keyframe);
58 67
59 private:
60 friend class WebmMuxerTest;
61
62 // IMkvWriter interface. 68 // IMkvWriter interface.
63 mkvmuxer::int32 Write(const void* buf, mkvmuxer::uint32 len) override; 69 mkvmuxer::int32 Write(const void* buf, mkvmuxer::uint32 len) override;
64 mkvmuxer::int64 Position() const override; 70 mkvmuxer::int64 Position() const override;
65 mkvmuxer::int32 Position(mkvmuxer::int64 position) override; 71 mkvmuxer::int32 Position(mkvmuxer::int64 position) override;
66 bool Seekable() const override; 72 bool Seekable() const override;
67 void ElementStartNotify(mkvmuxer::uint64 element_id, 73 void ElementStartNotify(mkvmuxer::uint64 element_id,
68 mkvmuxer::int64 position) override; 74 mkvmuxer::int64 position) override;
69 75
70 // Used to DCHECK that we are called on the correct thread. 76 // Used to DCHECK that we are called on the correct thread.
71 base::ThreadChecker thread_checker_; 77 base::ThreadChecker thread_checker_;
72 78
73 // Callback to dump written data as being called by libwebm. 79 // Callback to dump written data as being called by libwebm.
74 const WriteDataCB write_data_callback_; 80 const WriteDataCB write_data_callback_;
75 81
76 // Rolling counter of the position in bytes of the written goo. 82 // Rolling counter of the position in bytes of the written goo.
77 base::CheckedNumeric<mkvmuxer::int64> position_; 83 base::CheckedNumeric<mkvmuxer::int64> position_;
78 84
79 // The MkvMuxer active element. 85 // The MkvMuxer active element.
80 mkvmuxer::Segment segment_; 86 mkvmuxer::Segment segment_;
81 87
88 base::WeakPtrFactory<WebmMuxer> weak_factory_;
89
82 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); 90 DISALLOW_COPY_AND_ASSIGN(WebmMuxer);
83 }; 91 };
84 92
85 } // namespace media 93 } // namespace media
86 94
87 #endif // MEDIA_FILTERS_LIBWEBM_MUXER_H_ 95 #endif // MEDIA_FILTERS_LIBWEBM_MUXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698