webkit/media/audio_decoder.cc - Issue 11887029: Update some #includes in webkit/media for headers in the new Platform directory

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: webkit/media/audio_decoder.cc

Issue 11887029: Update some #includes in webkit/media for headers in the new Platform directory (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 7 years, 11 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 | Annotate | Revision Log

« no previous file with comments | « webkit/media/active_loader.cc ('k') | webkit/media/buffered_data_source_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "webkit/media/audio_decoder.h"	5 #include "webkit/media/audio_decoder.h"

6	6

7 #include <vector>	7 #include <vector>

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/string_util.h"	9 #include "base/string_util.h"

10 #include "base/time.h"	10 #include "base/time.h"

11 #include "media/base/audio_bus.h"	11 #include "media/base/audio_bus.h"

12 #include "media/base/limits.h"	12 #include "media/base/limits.h"

13 #include "media/filters/audio_file_reader.h"	13 #include "media/filters/audio_file_reader.h"

14 #include "media/filters/in_memory_url_protocol.h"	14 #include "media/filters/in_memory_url_protocol.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebAudioBus. h"	15 #include "third_party/WebKit/Source/Platform/chromium/public/WebAudioBus.h"

16	16

17 using media::AudioBus;	17 using media::AudioBus;

18 using media::AudioFileReader;	18 using media::AudioFileReader;

19 using media::InMemoryUrlProtocol;	19 using media::InMemoryUrlProtocol;

20 using std::vector;	20 using std::vector;

21 using WebKit::WebAudioBus;	21 using WebKit::WebAudioBus;

22	22

23 namespace webkit_media {	23 namespace webkit_media {

24	24

25 // Decode in-memory audio file data.	25 // Decode in-memory audio file data.

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 << " data size: " << data_size	84 << " data size: " << data_size

85 << " duration: " << duration	85 << " duration: " << duration

86 << " number of frames: " << actual_frames	86 << " number of frames: " << actual_frames

87 << " sample rate: " << file_sample_rate	87 << " sample rate: " << file_sample_rate

88 << " number of channels: " << number_of_channels;	88 << " number of channels: " << number_of_channels;

89	89

90 return actual_frames > 0;	90 return actual_frames > 0;

91 }	91 }

92	92

93 } // namespace webkit_media	93 } // namespace webkit_media

OLD	NEW