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

Side by Side Diff: ppapi/proxy/media_stream_video_track_resource.h

Issue 1097393007: Update {virtual,override} to follow C++11 style in ppapi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split off one file into separate review. Created 5 years, 8 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 | « ppapi/proxy/media_stream_track_resource_base.h ('k') | ppapi/proxy/net_address_resource.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_ 5 #ifndef PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_
6 #define PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_ 6 #define PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 10 matching lines...) Expand all
21 : public MediaStreamTrackResourceBase, 21 : public MediaStreamTrackResourceBase,
22 public thunk::PPB_MediaStreamVideoTrack_API { 22 public thunk::PPB_MediaStreamVideoTrack_API {
23 public: 23 public:
24 MediaStreamVideoTrackResource(Connection connection, 24 MediaStreamVideoTrackResource(Connection connection,
25 PP_Instance instance, 25 PP_Instance instance,
26 int pending_renderer_id, 26 int pending_renderer_id,
27 const std::string& id); 27 const std::string& id);
28 28
29 MediaStreamVideoTrackResource(Connection connection, PP_Instance instance); 29 MediaStreamVideoTrackResource(Connection connection, PP_Instance instance);
30 30
31 virtual ~MediaStreamVideoTrackResource(); 31 ~MediaStreamVideoTrackResource() override;
32 32
33 // Resource overrides: 33 // Resource overrides:
34 virtual thunk::PPB_MediaStreamVideoTrack_API* 34 thunk::PPB_MediaStreamVideoTrack_API* AsPPB_MediaStreamVideoTrack_API()
35 AsPPB_MediaStreamVideoTrack_API() override; 35 override;
36 36
37 // PPB_MediaStreamVideoTrack_API overrides: 37 // PPB_MediaStreamVideoTrack_API overrides:
38 virtual PP_Var GetId() override; 38 PP_Var GetId() override;
39 virtual PP_Bool HasEnded() override; 39 PP_Bool HasEnded() override;
40 virtual int32_t Configure(const int32_t attrib_list[], 40 int32_t Configure(const int32_t attrib_list[],
41 scoped_refptr<TrackedCallback> callback) override; 41 scoped_refptr<TrackedCallback> callback) override;
42 virtual int32_t GetAttrib(PP_MediaStreamVideoTrack_Attrib attrib, 42 int32_t GetAttrib(PP_MediaStreamVideoTrack_Attrib attrib,
43 int32_t* value) override; 43 int32_t* value) override;
44 virtual int32_t GetFrame(PP_Resource* frame, 44 int32_t GetFrame(PP_Resource* frame,
45 scoped_refptr<TrackedCallback> callback) override; 45 scoped_refptr<TrackedCallback> callback) override;
46 virtual int32_t RecycleFrame(PP_Resource frame) override; 46 int32_t RecycleFrame(PP_Resource frame) override;
47 virtual void Close() override; 47 void Close() override;
48 virtual int32_t GetEmptyFrame( 48 int32_t GetEmptyFrame(PP_Resource* frame,
49 PP_Resource* frame, scoped_refptr<TrackedCallback> callback) override; 49 scoped_refptr<TrackedCallback> callback) override;
50 virtual int32_t PutFrame(PP_Resource frame) override; 50 int32_t PutFrame(PP_Resource frame) override;
51 51
52 // MediaStreamBufferManager::Delegate overrides: 52 // MediaStreamBufferManager::Delegate overrides:
53 virtual void OnNewBufferEnqueued() override; 53 void OnNewBufferEnqueued() override;
54 54
55 private: 55 private:
56 PP_Resource GetVideoFrame(); 56 PP_Resource GetVideoFrame();
57 57
58 void ReleaseFrames(); 58 void ReleaseFrames();
59 59
60 // IPC message handlers. 60 // IPC message handlers.
61 void OnPluginMsgConfigureReply(const ResourceMessageReplyParams& params, 61 void OnPluginMsgConfigureReply(const ResourceMessageReplyParams& params,
62 const std::string& track_id); 62 const std::string& track_id);
63 63
64 // Allocated frame resources by |GetFrame()|. 64 // Allocated frame resources by |GetFrame()|.
65 typedef std::map<PP_Resource, scoped_refptr<VideoFrameResource> > FrameMap; 65 typedef std::map<PP_Resource, scoped_refptr<VideoFrameResource> > FrameMap;
66 FrameMap frames_; 66 FrameMap frames_;
67 67
68 PP_Resource* get_frame_output_; 68 PP_Resource* get_frame_output_;
69 scoped_refptr<TrackedCallback> get_frame_callback_; 69 scoped_refptr<TrackedCallback> get_frame_callback_;
70 70
71 scoped_refptr<TrackedCallback> configure_callback_; 71 scoped_refptr<TrackedCallback> configure_callback_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrackResource); 73 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrackResource);
74 }; 74 };
75 75
76 } // namespace proxy 76 } // namespace proxy
77 } // namespace ppapi 77 } // namespace ppapi
78 78
79 #endif // PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_ 79 #endif // PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/media_stream_track_resource_base.h ('k') | ppapi/proxy/net_address_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698