media/muxers/webm_muxer.cc - Issue 1907973003: media: Move audio_parameters and audio_point to media/base/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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/media.gyp ('k') | media/muxers/webm_muxer_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/bind.h"	7 #include "base/bind.h"

8 #include "media/audio/audio_parameters.h"	8 #include "media/base/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

16 namespace {	16 namespace {

17	17

18 void WriteOpusHeader(const media::AudioParameters& params, uint8_t* header) {	18 void WriteOpusHeader(const media::AudioParameters& params, uint8_t* header) {

(...skipping 281 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
300 }	300 }

301	301

302 WebmMuxer::EncodedVideoFrame::EncodedVideoFrame(scoped_ptr<std::string> data,	302 WebmMuxer::EncodedVideoFrame::EncodedVideoFrame(scoped_ptr<std::string> data,

303 base::TimeTicks timestamp,	303 base::TimeTicks timestamp,

304 bool is_keyframe)	304 bool is_keyframe)

305 : data(std::move(data)), timestamp(timestamp), is_keyframe(is_keyframe) {}	305 : data(std::move(data)), timestamp(timestamp), is_keyframe(is_keyframe) {}

306	306

307 WebmMuxer::EncodedVideoFrame::~EncodedVideoFrame() {}	307 WebmMuxer::EncodedVideoFrame::~EncodedVideoFrame() {}

308	308

309 } // namespace media	309 } // namespace media

OLD	NEW