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

Unified Diff: media/muxers/webm_muxer.cc

Issue 1710713002: Move media/capture/webm_muxer* to media/muxers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moving webm_muxer* going to media/muxers, cleaning up DEPS Created 4 years, 10 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/muxers/webm_muxer.h ('k') | media/muxers/webm_muxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/muxers/webm_muxer.cc
diff --git a/media/capture/webm_muxer.cc b/media/muxers/webm_muxer.cc
similarity index 98%
rename from media/capture/webm_muxer.cc
rename to media/muxers/webm_muxer.cc
index c017032c5e57c19442fc6664cb6055d6cd737102..e00982a759f7e2fee0e853d14443fef936ca5437 100644
--- a/media/capture/webm_muxer.cc
+++ b/media/muxers/webm_muxer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/capture/webm_muxer.h"
+#include "media/muxers/webm_muxer.h"
#include "base/bind.h"
#include "media/audio/audio_parameters.h"
@@ -59,8 +59,8 @@ static double GetFrameRate(const scoped_refptr<VideoFrame>& video_frame) {
const double kDefaultFrameRate = 30.0;
double frame_rate = kDefaultFrameRate;
- if (!video_frame->metadata()->GetDouble(
- VideoFrameMetadata::FRAME_RATE, &frame_rate) ||
+ if (!video_frame->metadata()->GetDouble(VideoFrameMetadata::FRAME_RATE,
+ &frame_rate) ||
frame_rate <= kZeroFrameRate ||
frame_rate > media::limits::kMaxFramesPerSecond) {
frame_rate = kDefaultFrameRate;
« no previous file with comments | « media/muxers/webm_muxer.h ('k') | media/muxers/webm_muxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698