| Index: media/formats/webm/webm_video_client.cc
|
| diff --git a/media/formats/webm/webm_video_client.cc b/media/formats/webm/webm_video_client.cc
|
| index a32c36c41d992f567a77358aff74417af04e2282..0a9ec0e3228e9aa4a334fcd6b993275d94505990 100644
|
| --- a/media/formats/webm/webm_video_client.cc
|
| +++ b/media/formats/webm/webm_video_client.cc
|
| @@ -9,8 +9,8 @@
|
|
|
| namespace media {
|
|
|
| -WebMVideoClient::WebMVideoClient(const LogCB& log_cb)
|
| - : log_cb_(log_cb) {
|
| +WebMVideoClient::WebMVideoClient(const scoped_refptr<MediaLog>& media_log)
|
| + : media_log_(media_log) {
|
| Reset();
|
| }
|
|
|
| @@ -44,7 +44,7 @@ bool WebMVideoClient::InitializeConfig(
|
| video_codec = kCodecVP9;
|
| profile = VP9PROFILE_ANY;
|
| } else {
|
| - MEDIA_LOG(ERROR, log_cb_) << "Unsupported video codec_id " << codec_id;
|
| + MEDIA_LOG(ERROR, media_log_) << "Unsupported video codec_id " << codec_id;
|
| return false;
|
| }
|
|
|
| @@ -83,8 +83,8 @@ bool WebMVideoClient::InitializeConfig(
|
| if (display_width_ <= 0 || display_height_ <= 0)
|
| return false;
|
| } else {
|
| - MEDIA_LOG(ERROR, log_cb_) << "Unsupported display unit type "
|
| - << display_unit_;
|
| + MEDIA_LOG(ERROR, media_log_) << "Unsupported display unit type "
|
| + << display_unit_;
|
| return false;
|
| }
|
| gfx::Size natural_size = gfx::Size(display_width_, display_height_);
|
| @@ -140,9 +140,9 @@ bool WebMVideoClient::OnUInt(int id, int64 val) {
|
| }
|
|
|
| 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;
|
| }
|
|
|
|
|