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

Side by Side Diff: media/base/android/webaudio_media_codec_bridge.cc

Issue 1471043004: Convert various vector_as_array calls to vector::data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 (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 #include "media/base/android/webaudio_media_codec_bridge.h" 5 #include "media/base/android/webaudio_media_codec_bridge.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <string.h> 9 #include <string.h>
10 #include <sys/stat.h> 10 #include <sys/stat.h>
11 #include <sys/types.h> 11 #include <sys/types.h>
12 #include <unistd.h> 12 #include <unistd.h>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/android/jni_android.h" 15 #include "base/android/jni_android.h"
16 #include "base/android/jni_array.h" 16 #include "base/android/jni_array.h"
17 #include "base/android/jni_string.h" 17 #include "base/android/jni_string.h"
18 #include "base/basictypes.h" 18 #include "base/basictypes.h"
19 #include "base/files/scoped_file.h" 19 #include "base/files/scoped_file.h"
20 #include "base/logging.h" 20 #include "base/logging.h"
21 #include "base/posix/eintr_wrapper.h" 21 #include "base/posix/eintr_wrapper.h"
22 #include "base/stl_util.h"
23 #include "jni/WebAudioMediaCodecBridge_jni.h" 22 #include "jni/WebAudioMediaCodecBridge_jni.h"
24 #include "media/base/android/webaudio_media_codec_info.h" 23 #include "media/base/android/webaudio_media_codec_info.h"
25 24
26 25
27 using base::android::AttachCurrentThread; 26 using base::android::AttachCurrentThread;
28 27
29 namespace media { 28 namespace media {
30 29
31 void WebAudioMediaCodecBridge::RunWebAudioMediaCodec( 30 void WebAudioMediaCodecBridge::RunWebAudioMediaCodec(
32 base::SharedMemoryHandle encoded_audio_handle, 31 base::SharedMemoryHandle encoded_audio_handle,
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // the number of channels in the file, only send one channel (the 171 // the number of channels in the file, only send one channel (the
173 // first). 172 // first).
174 int16_t* data = static_cast<int16_t*>(env->GetDirectBufferAddress(buf)); 173 int16_t* data = static_cast<int16_t*>(env->GetDirectBufferAddress(buf));
175 int frame_count = buf_size / sizeof(*data) / 2; 174 int frame_count = buf_size / sizeof(*data) / 2;
176 175
177 decoded_data.resize(frame_count); 176 decoded_data.resize(frame_count);
178 for (int k = 0; k < frame_count; ++k) { 177 for (int k = 0; k < frame_count; ++k) {
179 decoded_data[k] = *data; 178 decoded_data[k] = *data;
180 data += 2; 179 data += 2;
181 } 180 }
182 buffer = reinterpret_cast<int8_t*>(vector_as_array(&decoded_data)); 181 buffer = reinterpret_cast<int8_t*>(decoded_data.data());
183 DCHECK(buffer); 182 DCHECK(buffer);
184 count = frame_count * sizeof(*data); 183 count = frame_count * sizeof(*data);
185 } 184 }
186 185
187 // Write out the data to the pipe in small chunks if necessary. 186 // Write out the data to the pipe in small chunks if necessary.
188 while (count > 0) { 187 while (count > 0) {
189 int bytes_to_write = (count >= PIPE_BUF) ? PIPE_BUF : count; 188 int bytes_to_write = (count >= PIPE_BUF) ? PIPE_BUF : count;
190 ssize_t bytes_written = HANDLE_EINTR(write(pcm_output_, 189 ssize_t bytes_written = HANDLE_EINTR(write(pcm_output_,
191 buffer, 190 buffer,
192 bytes_to_write)); 191 bytes_to_write));
193 if (bytes_written == -1) 192 if (bytes_written == -1)
194 break; 193 break;
195 count -= bytes_written; 194 count -= bytes_written;
196 buffer += bytes_written; 195 buffer += bytes_written;
197 } 196 }
198 } 197 }
199 198
200 bool WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge(JNIEnv* env) { 199 bool WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge(JNIEnv* env) {
201 return RegisterNativesImpl(env); 200 return RegisterNativesImpl(env);
202 } 201 }
203 202
204 } // namespace 203 } // namespace
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | media/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698