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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/webm_muxer.cc
diff --git a/media/capture/webm_muxer.cc b/media/capture/webm_muxer.cc
index c59bbae805293bc02d0463dc9fb37c5f1960756b..a2285efae9fe94143868c855721310c0b9906b3c 100644
--- a/media/capture/webm_muxer.cc
+++ b/media/capture/webm_muxer.cc
@@ -25,11 +25,14 @@ static double GetFrameRate(const scoped_refptr<VideoFrame>& video_frame) {
return frame_rate;
}
-WebmMuxer::WebmMuxer(const WriteDataCB& write_data_callback)
- : track_index_(0),
+WebmMuxer::WebmMuxer(VideoCodec codec, const WriteDataCB& write_data_callback)
+ : use_vp9_(codec == kCodecVP9),
+ track_index_(0),
write_data_callback_(write_data_callback),
position_(0) {
DCHECK(!write_data_callback_.is_null());
+ DCHECK(codec == kCodecVP8 || codec == kCodecVP9)
+ << " Only Vp8 and VP9 are supported in WebmMuxer";
// Creation is done on a different thread than main activities.
thread_checker_.DetachFromThread();
}
@@ -82,7 +85,8 @@ void WebmMuxer::AddVideoTrack(const gfx::Size& frame_size, double frame_rate) {
reinterpret_cast<mkvmuxer::VideoTrack*>(
segment_.GetTrackByNumber(track_index_));
DCHECK(video_track);
- video_track->set_codec_id(mkvmuxer::Tracks::kVp8CodecId);
+ video_track->set_codec_id(use_vp9_ ? mkvmuxer::Tracks::kVp9CodecId
+ : mkvmuxer::Tracks::kVp8CodecId);
DCHECK_EQ(video_track->crop_right(), 0ull);
DCHECK_EQ(video_track->crop_left(), 0ull);
DCHECK_EQ(video_track->crop_top(), 0ull);
« 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