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

Unified Diff: webkit/media/filter_helpers.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, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/filter_helpers.h ('k') | webkit/media/media_stream_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 63013b305ef6cc417f6fd1f283c21d43db702620..4308f9aa03d92d0dc0d9b9f738a0a34e365db19e 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -9,14 +9,12 @@
#include "media/base/filter_collection.h"
#include "media/base/media_switches.h"
#include "media/filters/chunk_demuxer.h"
-#include "media/filters/dummy_demuxer.h"
#include "media/filters/ffmpeg_audio_decoder.h"
#include "media/filters/ffmpeg_demuxer.h"
#include "media/filters/ffmpeg_video_decoder.h"
#include "media/filters/opus_audio_decoder.h"
#include "media/filters/vpx_video_decoder.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
-#include "webkit/media/media_stream_client.h"
namespace webkit_media {
@@ -56,30 +54,6 @@ static void AddDefaultDecodersToCollection(
#endif // defined(MEDIA_USE_LIBVPX)
}
-bool BuildMediaStreamCollection(
- const WebKit::WebURL& url,
- MediaStreamClient* client,
- const scoped_refptr<base::MessageLoopProxy>& message_loop,
- media::FilterCollection* filter_collection) {
- if (!client)
- return false;
-
- scoped_refptr<media::VideoDecoder> video_decoder = client->GetVideoDecoder(
- url, message_loop);
- if (!video_decoder)
- return false;
-
- // Remove all other decoders and just use the MediaStream one.
- // NOTE: http://crbug.com/110800 is about replacing this ad-hockery with
- // something more designed.
- filter_collection->GetVideoDecoders()->clear();
- filter_collection->GetVideoDecoders()->push_back(video_decoder);
-
- filter_collection->SetDemuxer(new media::DummyDemuxer(true, false));
-
- return true;
-}
-
void BuildMediaSourceCollection(
const scoped_refptr<media::ChunkDemuxer>& demuxer,
const scoped_refptr<base::MessageLoopProxy>& message_loop,
« no previous file with comments | « webkit/media/filter_helpers.h ('k') | webkit/media/media_stream_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698