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

Side by Side Diff: media/mojo/services/mojo_audio_output_stream.cc

Issue 2809673002: Fix double close in MojoAudioOutputStream. (Closed)
Patch Set: Fix Win complie. Created 3 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "media/mojo/services/mojo_audio_output_stream.h" 5 #include "media/mojo/services/mojo_audio_output_stream.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 << ") out of range."; 51 << ") out of range.";
52 OnError(); 52 OnError();
53 return; 53 return;
54 } 54 }
55 delegate_->OnSetVolume(volume); 55 delegate_->OnSetVolume(volume);
56 } 56 }
57 57
58 void MojoAudioOutputStream::OnStreamCreated( 58 void MojoAudioOutputStream::OnStreamCreated(
59 int stream_id, 59 int stream_id,
60 base::SharedMemory* shared_memory, 60 base::SharedMemory* shared_memory,
61 base::CancelableSyncSocket* foreign_socket) { 61 std::unique_ptr<base::CancelableSyncSocket> foreign_socket) {
62 DCHECK(thread_checker_.CalledOnValidThread()); 62 DCHECK(thread_checker_.CalledOnValidThread());
63 DCHECK(stream_created_callback_); 63 DCHECK(stream_created_callback_);
64 DCHECK(shared_memory); 64 DCHECK(shared_memory);
65 DCHECK(foreign_socket); 65 DCHECK(foreign_socket);
66 66
67 base::SharedMemoryHandle foreign_memory_handle = 67 base::SharedMemoryHandle foreign_memory_handle =
68 base::SharedMemory::DuplicateHandle(shared_memory->handle()); 68 base::SharedMemory::DuplicateHandle(shared_memory->handle());
69 DCHECK(base::SharedMemory::IsHandleValid(foreign_memory_handle)); 69 DCHECK(base::SharedMemory::IsHandleValid(foreign_memory_handle));
70 70
71 mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle( 71 mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle(
72 foreign_memory_handle, shared_memory->requested_size(), false); 72 foreign_memory_handle, shared_memory->requested_size(), false);
73 mojo::ScopedHandle socket_handle = 73 mojo::ScopedHandle socket_handle =
74 mojo::WrapPlatformFile(foreign_socket->handle()); 74 mojo::WrapPlatformFile(foreign_socket->Release());
75 75
76 DCHECK(buffer_handle.is_valid()); 76 DCHECK(buffer_handle.is_valid());
77 DCHECK(socket_handle.is_valid()); 77 DCHECK(socket_handle.is_valid());
78 78
79 base::ResetAndReturn(&stream_created_callback_) 79 base::ResetAndReturn(&stream_created_callback_)
80 .Run(std::move(buffer_handle), std::move(socket_handle)); 80 .Run(std::move(buffer_handle), std::move(socket_handle));
81 } 81 }
82 82
83 void MojoAudioOutputStream::OnStreamError(int stream_id) { 83 void MojoAudioOutputStream::OnStreamError(int stream_id) {
84 DCHECK(thread_checker_.CalledOnValidThread()); 84 DCHECK(thread_checker_.CalledOnValidThread());
85 OnError(); 85 OnError();
86 } 86 }
87 87
88 void MojoAudioOutputStream::OnError() { 88 void MojoAudioOutputStream::OnError() {
89 DCHECK(thread_checker_.CalledOnValidThread()); 89 DCHECK(thread_checker_.CalledOnValidThread());
90 DCHECK(deleter_callback_); 90 DCHECK(deleter_callback_);
91 std::move(deleter_callback_).Run(); // Deletes |this|. 91 std::move(deleter_callback_).Run(); // Deletes |this|.
92 } 92 }
93 93
94 } // namespace media 94 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698