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

Side by Side Diff: media/base/audio_decoder.h

Issue 1447533006: media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/renderer/pepper/video_decoder_shim.cc ('k') | media/base/mock_filters.h » ('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 #ifndef MEDIA_BASE_AUDIO_DECODER_H_ 5 #ifndef MEDIA_BASE_AUDIO_DECODER_H_
6 #define MEDIA_BASE_AUDIO_DECODER_H_ 6 #define MEDIA_BASE_AUDIO_DECODER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "media/base/audio_decoder_config.h" 12 #include "media/base/audio_decoder_config.h"
13 #include "media/base/cdm_context.h"
13 #include "media/base/channel_layout.h" 14 #include "media/base/channel_layout.h"
14 #include "media/base/decoder_buffer.h" 15 #include "media/base/decoder_buffer.h"
15 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
16 #include "media/base/pipeline_status.h" 17 #include "media/base/pipeline_status.h"
17 18
18 namespace media { 19 namespace media {
19 20
20 class AudioBuffer; 21 class AudioBuffer;
21 class DemuxerStream; 22 class DemuxerStream;
22 23
(...skipping 26 matching lines...) Expand all
49 // Note: Since this is a destructor, |this| will be destroyed after this call. 50 // Note: Since this is a destructor, |this| will be destroyed after this call.
50 // Make sure the callbacks fired from this call doesn't post any task that 51 // Make sure the callbacks fired from this call doesn't post any task that
51 // depends on |this|. 52 // depends on |this|.
52 virtual ~AudioDecoder(); 53 virtual ~AudioDecoder();
53 54
54 // Returns the name of the decoder for logging purpose. 55 // Returns the name of the decoder for logging purpose.
55 virtual std::string GetDisplayName() const = 0; 56 virtual std::string GetDisplayName() const = 0;
56 57
57 // Initializes an AudioDecoder with the given DemuxerStream, executing the 58 // Initializes an AudioDecoder with the given DemuxerStream, executing the
58 // callback upon completion. 59 // callback upon completion.
60 //
61 // |set_cdm_ready_cb| can be used to set/cancel a CdmReadyCB with which the
62 // decoder can be notified when a CDM is ready. The decoder can use the CDM to
63 // handle encrypted video stream.
64 //
59 // |init_cb| is used to return initialization status. 65 // |init_cb| is used to return initialization status.
60 // |output_cb| is called for decoded audio buffers (see Decode()). 66 // |output_cb| is called for decoded audio buffers (see Decode()).
61 virtual void Initialize(const AudioDecoderConfig& config, 67 virtual void Initialize(const AudioDecoderConfig& config,
68 const SetCdmReadyCB& set_cdm_ready_cb,
62 const InitCB& init_cb, 69 const InitCB& init_cb,
63 const OutputCB& output_cb) = 0; 70 const OutputCB& output_cb) = 0;
64 71
65 // Requests samples to be decoded. Only one decode may be in flight at any 72 // Requests samples to be decoded. Only one decode may be in flight at any
66 // given time. Once the buffer is decoded the decoder calls |decode_cb|. 73 // given time. Once the buffer is decoded the decoder calls |decode_cb|.
67 // |output_cb| specified in Initialize() is called for each decoded buffer, 74 // |output_cb| specified in Initialize() is called for each decoded buffer,
68 // before or after |decode_cb|. 75 // before or after |decode_cb|.
69 // 76 //
70 // Implementations guarantee that the callbacks will not be called from within 77 // Implementations guarantee that the callbacks will not be called from within
71 // this method. 78 // this method.
72 // 79 //
73 // If |buffer| is an EOS buffer then the decoder must be flushed, i.e. 80 // If |buffer| is an EOS buffer then the decoder must be flushed, i.e.
74 // |output_cb| must be called for each frame pending in the queue and 81 // |output_cb| must be called for each frame pending in the queue and
75 // |decode_cb| must be called after that. 82 // |decode_cb| must be called after that.
76 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, 83 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
77 const DecodeCB& decode_cb) = 0; 84 const DecodeCB& decode_cb) = 0;
78 85
79 // Resets decoder state. All pending Decode() requests will be finished or 86 // Resets decoder state. All pending Decode() requests will be finished or
80 // aborted before |closure| is called. 87 // aborted before |closure| is called.
81 virtual void Reset(const base::Closure& closure) = 0; 88 virtual void Reset(const base::Closure& closure) = 0;
82 89
83 private: 90 private:
84 DISALLOW_COPY_AND_ASSIGN(AudioDecoder); 91 DISALLOW_COPY_AND_ASSIGN(AudioDecoder);
85 }; 92 };
86 93
87 } // namespace media 94 } // namespace media
88 95
89 #endif // MEDIA_BASE_AUDIO_DECODER_H_ 96 #endif // MEDIA_BASE_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/video_decoder_shim.cc ('k') | media/base/mock_filters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698