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

Side by Side Diff: media/base/audio_buffer_converter.cc

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: How many trial and errors before this builds on the Windows bots Created 5 years, 1 month 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 | « ipc/mojo/ipc_message_pipe_reader.h ('k') | media/base/serial_runner.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 #include "media/base/audio_buffer_converter.h" 5 #include "media/base/audio_buffer_converter.h"
6 6
7 #include <algorithm>
7 #include <cmath> 8 #include <cmath>
8 9
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "media/base/audio_buffer.h" 11 #include "media/base/audio_buffer.h"
11 #include "media/base/audio_bus.h" 12 #include "media/base/audio_bus.h"
12 #include "media/base/audio_decoder_config.h" 13 #include "media/base/audio_decoder_config.h"
13 #include "media/base/audio_timestamp_helper.h" 14 #include "media/base/audio_timestamp_helper.h"
14 #include "media/base/sinc_resampler.h" 15 #include "media/base/sinc_resampler.h"
15 #include "media/base/timestamp_constants.h" 16 #include "media/base/timestamp_constants.h"
16 #include "media/base/vector_math.h" 17 #include "media/base/vector_math.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 is_flushing_ = false; 240 is_flushing_ = false;
240 audio_converter_->Reset(); 241 audio_converter_->Reset();
241 DCHECK_EQ(input_frames_, 0); 242 DCHECK_EQ(input_frames_, 0);
242 DCHECK_EQ(last_input_buffer_offset_, 0); 243 DCHECK_EQ(last_input_buffer_offset_, 0);
243 DCHECK_LT(buffered_input_frames_, 1.0); 244 DCHECK_LT(buffered_input_frames_, 1.0);
244 DCHECK(queued_inputs_.empty()); 245 DCHECK(queued_inputs_.empty());
245 buffered_input_frames_ = 0.0; 246 buffered_input_frames_ = 0.0;
246 } 247 }
247 248
248 } // namespace media 249 } // namespace media
OLDNEW
« no previous file with comments | « ipc/mojo/ipc_message_pipe_reader.h ('k') | media/base/serial_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698