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

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

Issue 1384483005: MediaStream Recorder: Support VP9 encoder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sandersd@ comments Created 5 years, 2 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
« no previous file with comments | « media/capture/webm_muxer.h ('k') | media/capture/webm_muxer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "media/capture/webm_muxer.h" 5 #include "media/capture/webm_muxer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/base/limits.h" 8 #include "media/base/limits.h"
9 #include "media/base/video_frame.h" 9 #include "media/base/video_frame.h"
10 #include "ui/gfx/geometry/size.h" 10 #include "ui/gfx/geometry/size.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 static double GetFrameRate(const scoped_refptr<VideoFrame>& video_frame) { 14 static double GetFrameRate(const scoped_refptr<VideoFrame>& video_frame) {
15 const double kZeroFrameRate = 0.0; 15 const double kZeroFrameRate = 0.0;
16 const double kDefaultFrameRate = 30.0; 16 const double kDefaultFrameRate = 30.0;
17 17
18 double frame_rate = kDefaultFrameRate; 18 double frame_rate = kDefaultFrameRate;
19 if (!video_frame->metadata()->GetDouble( 19 if (!video_frame->metadata()->GetDouble(
20 VideoFrameMetadata::FRAME_RATE, &frame_rate) || 20 VideoFrameMetadata::FRAME_RATE, &frame_rate) ||
21 frame_rate <= kZeroFrameRate || 21 frame_rate <= kZeroFrameRate ||
22 frame_rate > media::limits::kMaxFramesPerSecond) { 22 frame_rate > media::limits::kMaxFramesPerSecond) {
23 frame_rate = kDefaultFrameRate; 23 frame_rate = kDefaultFrameRate;
24 } 24 }
25 return frame_rate; 25 return frame_rate;
26 } 26 }
27 27
28 WebmMuxer::WebmMuxer(const WriteDataCB& write_data_callback) 28 WebmMuxer::WebmMuxer(VideoCodec codec, const WriteDataCB& write_data_callback)
29 : track_index_(0), 29 : use_vp9_(codec == kCodecVP9),
30 track_index_(0),
30 write_data_callback_(write_data_callback), 31 write_data_callback_(write_data_callback),
31 position_(0) { 32 position_(0) {
32 DCHECK(!write_data_callback_.is_null()); 33 DCHECK(!write_data_callback_.is_null());
34 DCHECK(codec == kCodecVP8 || codec == kCodecVP9)
35 << " Only Vp8 and VP9 are supported in WebmMuxer";
33 // Creation is done on a different thread than main activities. 36 // Creation is done on a different thread than main activities.
34 thread_checker_.DetachFromThread(); 37 thread_checker_.DetachFromThread();
35 } 38 }
36 39
37 WebmMuxer::~WebmMuxer() { 40 WebmMuxer::~WebmMuxer() {
38 // No need to segment_.Finalize() since is not Seekable(), i.e. a live 41 // No need to segment_.Finalize() since is not Seekable(), i.e. a live
39 // stream, but is a good practice. 42 // stream, but is a good practice.
40 DCHECK(thread_checker_.CalledOnValidThread()); 43 DCHECK(thread_checker_.CalledOnValidThread());
41 segment_.Finalize(); 44 segment_.Finalize();
42 } 45 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 info->set_muxing_app("Chrome"); 78 info->set_muxing_app("Chrome");
76 79
77 track_index_ = 80 track_index_ =
78 segment_.AddVideoTrack(frame_size.width(), frame_size.height(), 0); 81 segment_.AddVideoTrack(frame_size.width(), frame_size.height(), 0);
79 DCHECK_GT(track_index_, 0u); 82 DCHECK_GT(track_index_, 0u);
80 83
81 mkvmuxer::VideoTrack* const video_track = 84 mkvmuxer::VideoTrack* const video_track =
82 reinterpret_cast<mkvmuxer::VideoTrack*>( 85 reinterpret_cast<mkvmuxer::VideoTrack*>(
83 segment_.GetTrackByNumber(track_index_)); 86 segment_.GetTrackByNumber(track_index_));
84 DCHECK(video_track); 87 DCHECK(video_track);
85 video_track->set_codec_id(mkvmuxer::Tracks::kVp8CodecId); 88 video_track->set_codec_id(use_vp9_ ? mkvmuxer::Tracks::kVp9CodecId
89 : mkvmuxer::Tracks::kVp8CodecId);
86 DCHECK_EQ(video_track->crop_right(), 0ull); 90 DCHECK_EQ(video_track->crop_right(), 0ull);
87 DCHECK_EQ(video_track->crop_left(), 0ull); 91 DCHECK_EQ(video_track->crop_left(), 0ull);
88 DCHECK_EQ(video_track->crop_top(), 0ull); 92 DCHECK_EQ(video_track->crop_top(), 0ull);
89 DCHECK_EQ(video_track->crop_bottom(), 0ull); 93 DCHECK_EQ(video_track->crop_bottom(), 0ull);
90 94
91 video_track->set_frame_rate(frame_rate); 95 video_track->set_frame_rate(frame_rate);
92 video_track->set_default_duration(base::Time::kNanosecondsPerSecond / 96 video_track->set_default_duration(base::Time::kNanosecondsPerSecond /
93 frame_rate); 97 frame_rate);
94 // Segment's timestamps should be in milliseconds, DCHECK it. See 98 // Segment's timestamps should be in milliseconds, DCHECK it. See
95 // http://www.webmproject.org/docs/container/#muxer-guidelines 99 // http://www.webmproject.org/docs/container/#muxer-guidelines
(...skipping 23 matching lines...) Expand all
119 } 123 }
120 124
121 void WebmMuxer::ElementStartNotify(mkvmuxer::uint64 element_id, 125 void WebmMuxer::ElementStartNotify(mkvmuxer::uint64 element_id,
122 mkvmuxer::int64 position) { 126 mkvmuxer::int64 position) {
123 // This method gets pinged before items are sent to |write_data_callback_|. 127 // This method gets pinged before items are sent to |write_data_callback_|.
124 DCHECK_GE(position, position_.ValueOrDefault(0)) 128 DCHECK_GE(position, position_.ValueOrDefault(0))
125 << "Can't go back in a live WebM stream."; 129 << "Can't go back in a live WebM stream.";
126 } 130 }
127 131
128 } // namespace media 132 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/webm_muxer.h ('k') | media/capture/webm_muxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698