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

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

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 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/mojo/services/mojo_cdm_allocator.cc ('k') | media/muxers/webm_muxer_fuzzertest.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/muxers/webm_muxer.h" 5 #include "media/muxers/webm_muxer.h"
6 6
7 #include <algorithm>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
9 #include "media/base/audio_parameters.h" 11 #include "media/base/audio_parameters.h"
10 #include "media/base/limits.h" 12 #include "media/base/limits.h"
11 #include "media/base/video_frame.h" 13 #include "media/base/video_frame.h"
12 #include "media/filters/opus_constants.h" 14 #include "media/filters/opus_constants.h"
13 #include "ui/gfx/geometry/size.h" 15 #include "ui/gfx/geometry/size.h"
14 16
15 namespace media { 17 namespace media {
16 18
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 325
324 WebmMuxer::EncodedVideoFrame::EncodedVideoFrame( 326 WebmMuxer::EncodedVideoFrame::EncodedVideoFrame(
325 std::unique_ptr<std::string> data, 327 std::unique_ptr<std::string> data,
326 base::TimeTicks timestamp, 328 base::TimeTicks timestamp,
327 bool is_keyframe) 329 bool is_keyframe)
328 : data(std::move(data)), timestamp(timestamp), is_keyframe(is_keyframe) {} 330 : data(std::move(data)), timestamp(timestamp), is_keyframe(is_keyframe) {}
329 331
330 WebmMuxer::EncodedVideoFrame::~EncodedVideoFrame() {} 332 WebmMuxer::EncodedVideoFrame::~EncodedVideoFrame() {}
331 333
332 } // namespace media 334 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_allocator.cc ('k') | media/muxers/webm_muxer_fuzzertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698