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

Side by Side Diff: media/filters/vpx_video_decoder.h

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 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 unified diff | Download patch
« no previous file with comments | « media/filters/video_frame_stream_unittest.cc ('k') | media/filters/vpx_video_decoder.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 #ifndef MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/threading/thread_checker.h" 10 #include "base/threading/thread_checker.h"
(...skipping 21 matching lines...) Expand all
32 // [1] http://wiki.webmproject.org/alpha-channel 32 // [1] http://wiki.webmproject.org/alpha-channel
33 class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder { 33 class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder {
34 public: 34 public:
35 VpxVideoDecoder(); 35 VpxVideoDecoder();
36 ~VpxVideoDecoder() override; 36 ~VpxVideoDecoder() override;
37 37
38 // VideoDecoder implementation. 38 // VideoDecoder implementation.
39 std::string GetDisplayName() const override; 39 std::string GetDisplayName() const override;
40 void Initialize(const VideoDecoderConfig& config, 40 void Initialize(const VideoDecoderConfig& config,
41 bool low_delay, 41 bool low_delay,
42 const SetCdmReadyCB& set_cdm_ready_cb, 42 CdmContext* cdm_context,
43 const InitCB& init_cb, 43 const InitCB& init_cb,
44 const OutputCB& output_cb) override; 44 const OutputCB& output_cb) override;
45 void Decode(const scoped_refptr<DecoderBuffer>& buffer, 45 void Decode(const scoped_refptr<DecoderBuffer>& buffer,
46 const DecodeCB& decode_cb) override; 46 const DecodeCB& decode_cb) override;
47 void Reset(const base::Closure& closure) override; 47 void Reset(const base::Closure& closure) override;
48 48
49 private: 49 private:
50 enum DecoderState { 50 enum DecoderState {
51 kUninitialized, 51 kUninitialized,
52 kNormal, 52 kNormal,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 scoped_refptr<base::SingleThreadTaskRunner> offload_task_runner_; 99 scoped_refptr<base::SingleThreadTaskRunner> offload_task_runner_;
100 100
101 VideoFramePool frame_pool_; 101 VideoFramePool frame_pool_;
102 102
103 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder); 103 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder);
104 }; 104 };
105 105
106 } // namespace media 106 } // namespace media
107 107
108 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ 108 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/video_frame_stream_unittest.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698