OLD | NEW |
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 #include "ppapi/proxy/media_stream_video_track_resource.h" | 5 #include "ppapi/proxy/media_stream_audio_track_resource.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "ppapi/proxy/audio_frame_resource.h" |
8 #include "ppapi/proxy/video_frame_resource.h" | |
9 #include "ppapi/shared_impl/media_stream_frame.h" | 8 #include "ppapi/shared_impl/media_stream_frame.h" |
10 #include "ppapi/shared_impl/var.h" | 9 #include "ppapi/shared_impl/var.h" |
11 | 10 |
12 namespace ppapi { | 11 namespace ppapi { |
13 namespace proxy { | 12 namespace proxy { |
14 | 13 |
15 MediaStreamVideoTrackResource::MediaStreamVideoTrackResource( | 14 MediaStreamAudioTrackResource::MediaStreamAudioTrackResource( |
16 Connection connection, | 15 Connection connection, |
17 PP_Instance instance, | 16 PP_Instance instance, |
18 int pending_renderer_id, | 17 int pending_renderer_id, |
19 const std::string& id) | 18 const std::string& id) |
20 : MediaStreamTrackResourceBase( | 19 : MediaStreamTrackResourceBase( |
21 connection, instance, pending_renderer_id, id), | 20 connection, instance, pending_renderer_id, id), |
22 get_frame_output_(NULL) { | 21 get_frame_output_(NULL) { |
23 } | 22 } |
24 | 23 |
25 MediaStreamVideoTrackResource::~MediaStreamVideoTrackResource() { | 24 MediaStreamAudioTrackResource::~MediaStreamAudioTrackResource() { |
26 Close(); | 25 Close(); |
27 } | 26 } |
28 | 27 |
29 thunk::PPB_MediaStreamVideoTrack_API* | 28 thunk::PPB_MediaStreamAudioTrack_API* |
30 MediaStreamVideoTrackResource::AsPPB_MediaStreamVideoTrack_API() { | 29 MediaStreamAudioTrackResource::AsPPB_MediaStreamAudioTrack_API() { |
31 return this; | 30 return this; |
32 } | 31 } |
33 | 32 |
34 PP_Var MediaStreamVideoTrackResource::GetId() { | 33 PP_Var MediaStreamAudioTrackResource::GetId() { |
35 return StringVar::StringToPPVar(id()); | 34 return StringVar::StringToPPVar(id()); |
36 } | 35 } |
37 | 36 |
38 PP_Bool MediaStreamVideoTrackResource::HasEnded() { | 37 PP_Bool MediaStreamAudioTrackResource::HasEnded() { |
39 return PP_FromBool(has_ended()); | 38 return PP_FromBool(has_ended()); |
40 } | 39 } |
41 | 40 |
42 | 41 int32_t MediaStreamAudioTrackResource::Configure( |
43 int32_t MediaStreamVideoTrackResource::Configure( | |
44 const int32_t attrib_list[], | 42 const int32_t attrib_list[], |
45 scoped_refptr<TrackedCallback> callback) { | 43 scoped_refptr<TrackedCallback> callback) { |
46 // TODO(penghuang): redesign and implement Configure() to support format, | 44 // TODO(penghuang): Implement this function. |
47 // size, etc. | |
48 return PP_ERROR_NOTSUPPORTED; | 45 return PP_ERROR_NOTSUPPORTED; |
49 } | 46 } |
50 | 47 |
51 int32_t MediaStreamVideoTrackResource::GetAttrib( | 48 int32_t MediaStreamAudioTrackResource::GetAttrib( |
52 PP_MediaStreamVideoTrack_Attrib attrib, | 49 PP_MediaStreamAudioTrack_Attrib attrib, |
53 int32_t* value) { | 50 int32_t* value) { |
54 // TODO(penghuang): implement this function. | 51 // TODO(penghuang): Implement this function. |
55 return PP_ERROR_NOTSUPPORTED; | 52 return PP_ERROR_NOTSUPPORTED; |
56 } | 53 } |
57 | 54 |
58 int32_t MediaStreamVideoTrackResource::GetFrame( | 55 int32_t MediaStreamAudioTrackResource::GetFrame( |
59 PP_Resource* frame, | 56 PP_Resource* frame, |
60 scoped_refptr<TrackedCallback> callback) { | 57 scoped_refptr<TrackedCallback> callback) { |
61 if (has_ended()) | 58 if (has_ended()) |
62 return PP_ERROR_FAILED; | 59 return PP_ERROR_FAILED; |
63 | 60 |
64 if (TrackedCallback::IsPending(get_frame_callback_)) | 61 if (TrackedCallback::IsPending(get_frame_callback_)) |
65 return PP_ERROR_INPROGRESS; | 62 return PP_ERROR_INPROGRESS; |
66 | 63 |
67 *frame = GetVideoFrame(); | 64 *frame = GetAudioFrame(); |
68 if (*frame) | 65 if (*frame) |
69 return PP_OK; | 66 return PP_OK; |
70 | 67 |
| 68 // TODO(penghuang): Use the callback as hints to determine which thread will |
| 69 // use the resource, so we could deliver frames to the target thread directly |
| 70 // for better performance. |
71 get_frame_output_ = frame; | 71 get_frame_output_ = frame; |
72 get_frame_callback_ = callback; | 72 get_frame_callback_ = callback; |
73 return PP_OK_COMPLETIONPENDING; | 73 return PP_OK_COMPLETIONPENDING; |
74 } | 74 } |
75 | 75 |
76 int32_t MediaStreamVideoTrackResource::RecycleFrame(PP_Resource frame) { | 76 int32_t MediaStreamAudioTrackResource::RecycleFrame(PP_Resource frame) { |
77 FrameMap::iterator it = frames_.find(frame); | 77 FrameMap::iterator it = frames_.find(frame); |
78 if (it == frames_.end()) | 78 if (it == frames_.end()) |
79 return PP_ERROR_BADRESOURCE; | 79 return PP_ERROR_BADRESOURCE; |
80 | 80 |
81 scoped_refptr<VideoFrameResource> frame_resource = it->second; | 81 scoped_refptr<AudioFrameResource> frame_resource = it->second; |
82 frames_.erase(it); | 82 frames_.erase(it); |
83 | 83 |
84 if (has_ended()) | 84 if (has_ended()) |
85 return PP_OK; | 85 return PP_OK; |
86 | 86 |
87 DCHECK_GE(frame_resource->GetFrameBufferIndex(), 0); | 87 DCHECK_GE(frame_resource->GetFrameBufferIndex(), 0); |
88 | 88 |
89 SendEnqueueFrameMessageToHost(frame_resource->GetFrameBufferIndex()); | 89 SendEnqueueFrameMessageToHost(frame_resource->GetFrameBufferIndex()); |
90 frame_resource->Invalidate(); | 90 frame_resource->Invalidate(); |
91 return PP_OK; | 91 return PP_OK; |
92 } | 92 } |
93 | 93 |
94 void MediaStreamVideoTrackResource::Close() { | 94 void MediaStreamAudioTrackResource::Close() { |
95 if (has_ended()) | 95 if (has_ended()) |
96 return; | 96 return; |
97 | 97 |
98 if (TrackedCallback::IsPending(get_frame_callback_)) { | 98 if (TrackedCallback::IsPending(get_frame_callback_)) { |
99 *get_frame_output_ = 0; | 99 *get_frame_output_ = 0; |
100 get_frame_callback_->PostAbort(); | 100 get_frame_callback_->PostAbort(); |
101 get_frame_callback_ = NULL; | 101 get_frame_callback_ = NULL; |
102 get_frame_output_ = 0; | 102 get_frame_output_ = 0; |
103 } | 103 } |
104 | 104 |
105 ReleaseFrames(); | 105 ReleaseFrames(); |
106 MediaStreamTrackResourceBase::CloseInternal(); | 106 MediaStreamTrackResourceBase::CloseInternal(); |
107 } | 107 } |
108 | 108 |
109 void MediaStreamVideoTrackResource::OnNewFrameEnqueued() { | 109 void MediaStreamAudioTrackResource::OnNewFrameEnqueued() { |
110 if (TrackedCallback::IsPending(get_frame_callback_)) { | 110 if (!TrackedCallback::IsPending(get_frame_callback_)) |
111 *get_frame_output_ = GetVideoFrame(); | 111 return; |
112 get_frame_output_ = NULL; | 112 |
113 scoped_refptr<TrackedCallback> callback; | 113 *get_frame_output_ = GetAudioFrame(); |
114 callback.swap(get_frame_callback_); | 114 int32_t result = *get_frame_output_ ? PP_OK : PP_ERROR_FAILED; |
115 callback->Run(PP_OK); | 115 get_frame_output_ = NULL; |
116 } | 116 scoped_refptr<TrackedCallback> callback; |
| 117 callback.swap(get_frame_callback_); |
| 118 callback->Run(result); |
117 } | 119 } |
118 | 120 |
119 PP_Resource MediaStreamVideoTrackResource::GetVideoFrame() { | 121 PP_Resource MediaStreamAudioTrackResource::GetAudioFrame() { |
120 int32_t index = frame_buffer()->DequeueFrame(); | 122 int32_t index = frame_buffer()->DequeueFrame(); |
121 if (index < 0) | 123 if (index < 0) |
122 return 0; | 124 return 0; |
| 125 |
123 MediaStreamFrame* frame = frame_buffer()->GetFramePointer(index); | 126 MediaStreamFrame* frame = frame_buffer()->GetFramePointer(index); |
124 scoped_refptr<VideoFrameResource> resource = | 127 DCHECK(frame); |
125 new VideoFrameResource(pp_instance(), index, frame); | 128 scoped_refptr<AudioFrameResource> resource = |
| 129 new AudioFrameResource(pp_instance(), index, frame); |
126 // Add |pp_resource()| and |resource| into |frames_|. | 130 // Add |pp_resource()| and |resource| into |frames_|. |
127 // |frames_| uses scoped_ptr<> to hold a ref of |resource|. It keeps the | 131 // |frames_| uses scoped_ptr<> to hold a ref of |resource|. It keeps the |
128 // resource alive. | 132 // resource alive. |
129 frames_.insert(FrameMap::value_type(resource->pp_resource(), resource)); | 133 frames_.insert(FrameMap::value_type(resource->pp_resource(), resource)); |
130 return resource->GetReference(); | 134 return resource->GetReference(); |
131 } | 135 } |
132 | 136 |
133 void MediaStreamVideoTrackResource::ReleaseFrames() { | 137 void MediaStreamAudioTrackResource::ReleaseFrames() { |
134 FrameMap::iterator it = frames_.begin(); | 138 FrameMap::iterator it = frames_.begin(); |
135 while (it != frames_.end()) { | 139 while (it != frames_.end()) { |
136 // Just invalidate and release VideoFrameResorce, but keep PP_Resource. | 140 // Just invalidate and release VideoFrameResorce, but keep PP_Resource. |
137 // So plugin can still use |RecycleFrame()|. | 141 // So plugin can still use |RecycleFrame()|. |
138 it->second->Invalidate(); | 142 it->second->Invalidate(); |
139 it->second = NULL; | 143 it->second = NULL; |
140 } | 144 } |
141 } | 145 } |
142 | 146 |
143 } // namespace proxy | 147 } // namespace proxy |
144 } // namespace ppapi | 148 } // namespace ppapi |
OLD | NEW |