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

Side by Side Diff: webkit/media/filter_helpers.cc

Issue 11416367: Add Opus decode wrapper to media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
« media/filters/opus_audio_decoder.cc ('K') | « media/media.gyp ('k') | no next file » | 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/media/filter_helpers.h" 5 #include "webkit/media/filter_helpers.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/base/filter_collection.h" 8 #include "media/base/filter_collection.h"
9 #include "media/filters/decrypting_audio_decoder.h" 9 #include "media/filters/decrypting_audio_decoder.h"
10 #include "media/filters/decrypting_video_decoder.h" 10 #include "media/filters/decrypting_video_decoder.h"
11 #include "media/filters/chunk_demuxer.h" 11 #include "media/filters/chunk_demuxer.h"
12 #include "media/filters/dummy_demuxer.h" 12 #include "media/filters/dummy_demuxer.h"
13 #include "media/filters/ffmpeg_audio_decoder.h" 13 #include "media/filters/ffmpeg_audio_decoder.h"
14 #include "media/filters/ffmpeg_demuxer.h" 14 #include "media/filters/ffmpeg_demuxer.h"
15 #include "media/filters/ffmpeg_video_decoder.h" 15 #include "media/filters/ffmpeg_video_decoder.h"
16 #include "media/filters/opus_audio_decoder.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
17 #include "webkit/media/crypto/proxy_decryptor.h" 18 #include "webkit/media/crypto/proxy_decryptor.h"
18 #include "webkit/media/media_stream_client.h" 19 #include "webkit/media/media_stream_client.h"
19 20
20 namespace webkit_media { 21 namespace webkit_media {
21 22
22 // Constructs and adds the default audio/video decoders to |filter_collection|. 23 // Constructs and adds the default audio/video decoders to |filter_collection|.
23 // Note that decoders in the |filter_collection| are ordered. The first 24 // Note that decoders in the |filter_collection| are ordered. The first
24 // audio/video decoder in the |filter_collection| that supports the input 25 // audio/video decoder in the |filter_collection| that supports the input
25 // audio/video stream will be selected as the audio/video decoder in the media 26 // audio/video stream will be selected as the audio/video decoder in the media
26 // pipeline. This is done by trying to initialize the decoder with the input 27 // pipeline. This is done by trying to initialize the decoder with the input
27 // stream. Some decoder may only accept certain types of streams. For example, 28 // stream. Some decoder may only accept certain types of streams. For example,
28 // DecryptingVideoDecoder only supports encrypted video stream. 29 // DecryptingVideoDecoder only supports encrypted video stream.
29 static void AddDefaultDecodersToCollection( 30 static void AddDefaultDecodersToCollection(
30 const scoped_refptr<base::MessageLoopProxy>& message_loop, 31 const scoped_refptr<base::MessageLoopProxy>& message_loop,
31 media::FilterCollection* filter_collection, 32 media::FilterCollection* filter_collection,
32 ProxyDecryptor* proxy_decryptor) { 33 ProxyDecryptor* proxy_decryptor) {
34 scoped_refptr<media::OpusAudioDecoder> opus_audio_decoder =
35 new media::OpusAudioDecoder(message_loop);
36 filter_collection->GetAudioDecoders()->push_back(opus_audio_decoder);
37
33 scoped_refptr<media::FFmpegAudioDecoder> ffmpeg_audio_decoder = 38 scoped_refptr<media::FFmpegAudioDecoder> ffmpeg_audio_decoder =
34 new media::FFmpegAudioDecoder(message_loop); 39 new media::FFmpegAudioDecoder(message_loop);
35 filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder); 40 filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder);
36 41
37 if (proxy_decryptor) { 42 if (proxy_decryptor) {
38 scoped_refptr<media::DecryptingAudioDecoder> decrypting_audio_decoder = 43 scoped_refptr<media::DecryptingAudioDecoder> decrypting_audio_decoder =
39 new media::DecryptingAudioDecoder( 44 new media::DecryptingAudioDecoder(
40 message_loop, 45 message_loop,
41 base::Bind(&ProxyDecryptor::RequestDecryptorNotification, 46 base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
42 base::Unretained(proxy_decryptor))); 47 base::Unretained(proxy_decryptor)));
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 media::FilterCollection* filter_collection, 113 media::FilterCollection* filter_collection,
109 ProxyDecryptor* proxy_decryptor) { 114 ProxyDecryptor* proxy_decryptor) {
110 filter_collection->SetDemuxer(new media::FFmpegDemuxer( 115 filter_collection->SetDemuxer(new media::FFmpegDemuxer(
111 message_loop, data_source)); 116 message_loop, data_source));
112 117
113 AddDefaultDecodersToCollection(message_loop, filter_collection, 118 AddDefaultDecodersToCollection(message_loop, filter_collection,
114 proxy_decryptor); 119 proxy_decryptor);
115 } 120 }
116 121
117 } // webkit_media 122 } // webkit_media
OLDNEW
« media/filters/opus_audio_decoder.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698