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

Side by Side 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 unified diff | 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 »
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/muxers/webm_muxer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/audio/audio_parameters.h" 8 #include "media/audio/audio_parameters.h"
9 #include "media/base/limits.h" 9 #include "media/base/limits.h"
10 #include "media/base/video_frame.h" 10 #include "media/base/video_frame.h"
11 #include "media/filters/opus_constants.h" 11 #include "media/filters/opus_constants.h"
12 #include "ui/gfx/geometry/size.h" 12 #include "ui/gfx/geometry/size.h"
13 13
14 namespace media { 14 namespace media {
15 15
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } else { 52 } else {
53 header[OPUS_EXTRADATA_CHANNEL_MAPPING_OFFSET] = 0; 53 header[OPUS_EXTRADATA_CHANNEL_MAPPING_OFFSET] = 0;
54 } 54 }
55 } 55 }
56 56
57 static double GetFrameRate(const scoped_refptr<VideoFrame>& video_frame) { 57 static double GetFrameRate(const scoped_refptr<VideoFrame>& video_frame) {
58 const double kZeroFrameRate = 0.0; 58 const double kZeroFrameRate = 0.0;
59 const double kDefaultFrameRate = 30.0; 59 const double kDefaultFrameRate = 30.0;
60 60
61 double frame_rate = kDefaultFrameRate; 61 double frame_rate = kDefaultFrameRate;
62 if (!video_frame->metadata()->GetDouble( 62 if (!video_frame->metadata()->GetDouble(VideoFrameMetadata::FRAME_RATE,
63 VideoFrameMetadata::FRAME_RATE, &frame_rate) || 63 &frame_rate) ||
64 frame_rate <= kZeroFrameRate || 64 frame_rate <= kZeroFrameRate ||
65 frame_rate > media::limits::kMaxFramesPerSecond) { 65 frame_rate > media::limits::kMaxFramesPerSecond) {
66 frame_rate = kDefaultFrameRate; 66 frame_rate = kDefaultFrameRate;
67 } 67 }
68 return frame_rate; 68 return frame_rate;
69 } 69 }
70 70
71 } // anonymous namespace 71 } // anonymous namespace
72 72
73 WebmMuxer::WebmMuxer(VideoCodec codec, 73 WebmMuxer::WebmMuxer(VideoCodec codec,
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 } 280 }
281 281
282 WebmMuxer::EncodedVideoFrame::EncodedVideoFrame(scoped_ptr<std::string> data, 282 WebmMuxer::EncodedVideoFrame::EncodedVideoFrame(scoped_ptr<std::string> data,
283 base::TimeTicks timestamp, 283 base::TimeTicks timestamp,
284 bool is_keyframe) 284 bool is_keyframe)
285 : data(std::move(data)), timestamp(timestamp), is_keyframe(is_keyframe) {} 285 : data(std::move(data)), timestamp(timestamp), is_keyframe(is_keyframe) {}
286 286
287 WebmMuxer::EncodedVideoFrame::~EncodedVideoFrame() {} 287 WebmMuxer::EncodedVideoFrame::~EncodedVideoFrame() {}
288 288
289 } // namespace media 289 } // namespace media
OLDNEW
« 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