OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
134 return nullptr; | 134 return nullptr; |
135 } | 135 } |
136 | 136 |
137 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) | 137 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) |
138 { | 138 { |
139 MediaStreamDescriptor* stream = webStream; | 139 MediaStreamDescriptor* stream = webStream; |
140 MediaStreamDescriptorClient* client = stream->client(); | 140 MediaStreamDescriptorClient* client = stream->client(); |
141 if (client) | 141 if (client) |
142 client->streamEnded(); | 142 client->streamEnded(); |
143 else | 143 else |
144 stream->setEnded(); | 144 stream->setActive(false); |
perkj_chrome
2015/01/13 08:24:31
Shouldn't you keep setEnded here? MediaStream.Stop
jiajia.qin
2015/01/13 08:52:45
Agree. I will leave this unchanged.
| |
145 } | 145 } |
146 | 146 |
147 } // namespace blink | 147 } // namespace blink |
OLD | NEW |