| 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 "media/formats/webm/webm_audio_client.h" | 5 #include "media/formats/webm/webm_audio_client.h" |
| 6 | 6 |
| 7 #include "media/base/audio_decoder_config.h" | 7 #include "media/base/audio_decoder_config.h" |
| 8 #include "media/base/channel_layout.h" | 8 #include "media/base/channel_layout.h" |
| 9 #include "media/formats/webm/webm_constants.h" | 9 #include "media/formats/webm/webm_constants.h" |
| 10 | 10 |
| 11 namespace media { | 11 namespace media { |
| 12 | 12 |
| 13 WebMAudioClient::WebMAudioClient(const scoped_refptr<MediaLog>& media_log) | 13 WebMAudioClient::WebMAudioClient(MediaLog* media_log) : media_log_(media_log) { |
| 14 : media_log_(media_log) { | |
| 15 Reset(); | 14 Reset(); |
| 16 } | 15 } |
| 17 | 16 |
| 18 WebMAudioClient::~WebMAudioClient() { | 17 WebMAudioClient::~WebMAudioClient() { |
| 19 } | 18 } |
| 20 | 19 |
| 21 void WebMAudioClient::Reset() { | 20 void WebMAudioClient::Reset() { |
| 22 channels_ = -1; | 21 channels_ = -1; |
| 23 samples_per_second_ = -1; | 22 samples_per_second_ = -1; |
| 24 output_samples_per_second_ = -1; | 23 output_samples_per_second_ = -1; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 << " specified (" << *dst << " and " << val | 121 << " specified (" << *dst << " and " << val |
| 123 << ")"; | 122 << ")"; |
| 124 return false; | 123 return false; |
| 125 } | 124 } |
| 126 | 125 |
| 127 *dst = val; | 126 *dst = val; |
| 128 return true; | 127 return true; |
| 129 } | 128 } |
| 130 | 129 |
| 131 } // namespace media | 130 } // namespace media |
| OLD | NEW |