diff options
Diffstat (limited to 'chromium/media/formats/webm/webm_audio_client.cc')
| -rw-r--r-- | chromium/media/formats/webm/webm_audio_client.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chromium/media/formats/webm/webm_audio_client.cc b/chromium/media/formats/webm/webm_audio_client.cc index ea911ec290e..bde72332542 100644 --- a/chromium/media/formats/webm/webm_audio_client.cc +++ b/chromium/media/formats/webm/webm_audio_client.cc @@ -10,8 +10,8 @@ namespace media { -WebMAudioClient::WebMAudioClient(const LogCB& log_cb) - : log_cb_(log_cb) { +WebMAudioClient::WebMAudioClient(const scoped_refptr<MediaLog>& media_log) + : media_log_(media_log) { Reset(); } @@ -37,7 +37,7 @@ bool WebMAudioClient::InitializeConfig( } else if (codec_id == "A_OPUS") { audio_codec = kCodecOpus; } else { - MEDIA_LOG(ERROR, log_cb_) << "Unsupported audio codec_id " << codec_id; + MEDIA_LOG(ERROR, media_log_) << "Unsupported audio codec_id " << codec_id; return false; } @@ -51,7 +51,7 @@ bool WebMAudioClient::InitializeConfig( ChannelLayout channel_layout = GuessChannelLayout(channels_); if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { - MEDIA_LOG(ERROR, log_cb_) << "Unsupported channel count " << channels_; + MEDIA_LOG(ERROR, media_log_) << "Unsupported channel count " << channels_; return false; } @@ -90,7 +90,6 @@ bool WebMAudioClient::InitializeConfig( extra_data, extra_data_size, is_encrypted, - true, base::TimeDelta::FromMicroseconds( (seek_preroll != -1 ? seek_preroll : 0) / 1000), codec_delay_in_frames); @@ -100,9 +99,9 @@ bool WebMAudioClient::InitializeConfig( bool WebMAudioClient::OnUInt(int id, int64 val) { if (id == kWebMIdChannels) { if (channels_ != -1) { - MEDIA_LOG(ERROR, log_cb_) << "Multiple values for id " << std::hex << id - << " specified. (" << channels_ << " and " - << val << ")"; + MEDIA_LOG(ERROR, media_log_) << "Multiple values for id " << std::hex + << id << " specified. (" << channels_ + << " and " << val << ")"; return false; } @@ -129,9 +128,9 @@ bool WebMAudioClient::OnFloat(int id, double val) { return false; if (*dst != -1) { - MEDIA_LOG(ERROR, log_cb_) << "Multiple values for id " << std::hex << id - << " specified (" << *dst << " and " << val - << ")"; + MEDIA_LOG(ERROR, media_log_) << "Multiple values for id " << std::hex << id + << " specified (" << *dst << " and " << val + << ")"; return false; } |