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

Side by Side Diff: webkit/support/test_media_stream_client.cc

Issue 11270012: Adding audio support to the new webmediaplyer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed the nits from Andrew and fixed the chromeOS testbot error Created 8 years, 1 month 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
OLDNEW
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/support/test_media_stream_client.h" 5 #include "webkit/support/test_media_stream_client.h"
6 6
7 #include "googleurl/src/gurl.h" 7 #include "googleurl/src/gurl.h"
8 #include "media/base/message_loop_factory.h" 8 #include "media/base/message_loop_factory.h"
9 #include "media/base/pipeline.h" 9 #include "media/base/pipeline.h"
10 #include "media/filters/video_frame_generator.h" 10 #include "media/filters/video_frame_generator.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amComponent.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amComponent.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
15 #include "webkit/media/media_stream_audio_renderer.h"
15 #include "webkit/media/simple_video_frame_provider.h" 16 #include "webkit/media/simple_video_frame_provider.h"
16 17
17 using namespace WebKit; 18 using namespace WebKit;
18 19
19 namespace { 20 namespace {
20 21
21 static const int kVideoCaptureWidth = 352; 22 static const int kVideoCaptureWidth = 352;
22 static const int kVideoCaptureHeight = 288; 23 static const int kVideoCaptureHeight = 288;
23 static const int kVideoCaptureFrameDurationMs = 33; 24 static const int kVideoCaptureFrameDurationMs = 33;
24 25
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // Make sure we are dealing with a Mock MediaStream. If not, bail out. 67 // Make sure we are dealing with a Mock MediaStream. If not, bail out.
67 if (!IsMockMediaStreamWithVideo(url)) 68 if (!IsMockMediaStreamWithVideo(url))
68 return NULL; 69 return NULL;
69 70
70 return new media::VideoFrameGenerator( 71 return new media::VideoFrameGenerator(
71 message_loop_factory->GetMessageLoop(media::MessageLoopFactory::kDecoder), 72 message_loop_factory->GetMessageLoop(media::MessageLoopFactory::kDecoder),
72 gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight), 73 gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
73 base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs)); 74 base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs));
74 } 75 }
75 76
77 scoped_refptr<webkit_media::MediaStreamAudioRenderer>
78 TestMediaStreamClient::GetAudioRenderer(const GURL& url) {
79 return NULL;
80 }
81
76 } // namespace webkit_support 82 } // namespace webkit_support
OLDNEW
« content/renderer/media/webrtc_audio_renderer.h ('K') | « webkit/support/test_media_stream_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698