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

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

Issue 12320078: Delete old RTCVideoDecoder code path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make the line no longer than 80 chars Created 7 years, 9 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 | « webkit/support/test_media_stream_client.h ('k') | webkit/support/webkit_support.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 (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/pipeline.h" 8 #include "media/base/pipeline.h"
9 #include "media/filters/video_frame_generator.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
11 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack .h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack .h"
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h"
14 #include "webkit/media/media_stream_audio_renderer.h" 13 #include "webkit/media/media_stream_audio_renderer.h"
15 #include "webkit/media/simple_video_frame_provider.h" 14 #include "webkit/media/simple_video_frame_provider.h"
16 15
17 using namespace WebKit; 16 using namespace WebKit;
18 17
19 namespace { 18 namespace {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 if (!IsMockMediaStreamWithVideo(url)) 51 if (!IsMockMediaStreamWithVideo(url))
53 return NULL; 52 return NULL;
54 53
55 return new webkit_media::SimpleVideoFrameProvider( 54 return new webkit_media::SimpleVideoFrameProvider(
56 gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight), 55 gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
57 base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs), 56 base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs),
58 error_cb, 57 error_cb,
59 repaint_cb); 58 repaint_cb);
60 } 59 }
61 60
62 scoped_refptr<media::VideoDecoder> TestMediaStreamClient::GetVideoDecoder(
63 const GURL& url,
64 const scoped_refptr<base::MessageLoopProxy>& message_loop) {
65 // This class is installed in a chain of possible VideoDecoder creators
66 // which are called in order until one returns an object.
67 // Make sure we are dealing with a Mock MediaStream. If not, bail out.
68 if (!IsMockMediaStreamWithVideo(url))
69 return NULL;
70
71 return new media::VideoFrameGenerator(
72 message_loop,
73 gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
74 base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs));
75 }
76
77 scoped_refptr<webkit_media::MediaStreamAudioRenderer> 61 scoped_refptr<webkit_media::MediaStreamAudioRenderer>
78 TestMediaStreamClient::GetAudioRenderer(const GURL& url) { 62 TestMediaStreamClient::GetAudioRenderer(const GURL& url) {
79 return NULL; 63 return NULL;
80 } 64 }
81 65
82 } // namespace webkit_support 66 } // namespace webkit_support
OLDNEW
« no previous file with comments | « webkit/support/test_media_stream_client.h ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698