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

Side by Side Diff: media/blink/webmediaplayer_impl.cc

Issue 1415793003: fix build when ffmpeg, libvpx and libwebm are disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « media/BUILD.gn ('k') | media/media.gyp » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/blink/webmediaplayer_impl.h" 5 #include "media/blink/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <limits> 9 #include <limits>
10 #include <string> 10 #include <string>
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 DCHECK(main_task_runner_->BelongsToCurrentThread()); 951 DCHECK(main_task_runner_->BelongsToCurrentThread());
952 952
953 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = 953 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb =
954 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnEncryptedMediaInitData); 954 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnEncryptedMediaInitData);
955 955
956 // Figure out which demuxer to use. 956 // Figure out which demuxer to use.
957 if (load_type_ != LoadTypeMediaSource) { 957 if (load_type_ != LoadTypeMediaSource) {
958 DCHECK(!chunk_demuxer_); 958 DCHECK(!chunk_demuxer_);
959 DCHECK(data_source_); 959 DCHECK(data_source_);
960 960
961 #if !defined(MEDIA_DISABLE_FFMPEG)
961 demuxer_.reset(new FFmpegDemuxer(media_task_runner_, data_source_.get(), 962 demuxer_.reset(new FFmpegDemuxer(media_task_runner_, data_source_.get(),
962 encrypted_media_init_data_cb, media_log_)); 963 encrypted_media_init_data_cb, media_log_));
964 #else
965 OnPipelineError(PipelineStatus::DEMUXER_ERROR_COULD_NOT_OPEN);
966 return;
967 #endif
963 } else { 968 } else {
964 DCHECK(!chunk_demuxer_); 969 DCHECK(!chunk_demuxer_);
965 DCHECK(!data_source_); 970 DCHECK(!data_source_);
966 971
967 chunk_demuxer_ = new ChunkDemuxer( 972 chunk_demuxer_ = new ChunkDemuxer(
968 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), 973 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
969 encrypted_media_init_data_cb, media_log_, true); 974 encrypted_media_init_data_cb, media_log_, true);
970 demuxer_.reset(chunk_demuxer_); 975 demuxer_.reset(chunk_demuxer_);
971 } 976 }
972 977
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 << ", Video: " << stats.video_memory_usage << ", DataSource: " 1111 << ", Video: " << stats.video_memory_usage << ", DataSource: "
1107 << (data_source_ ? data_source_->GetMemoryUsage() : 0) 1112 << (data_source_ ? data_source_->GetMemoryUsage() : 0)
1108 << ", Demuxer: " << (demuxer_ ? demuxer_->GetMemoryUsage() : 0); 1113 << ", Demuxer: " << (demuxer_ ? demuxer_->GetMemoryUsage() : 0);
1109 1114
1110 const int64_t delta = current_memory_usage - last_reported_memory_usage_; 1115 const int64_t delta = current_memory_usage - last_reported_memory_usage_;
1111 last_reported_memory_usage_ = current_memory_usage; 1116 last_reported_memory_usage_ = current_memory_usage;
1112 adjust_allocated_memory_cb_.Run(delta); 1117 adjust_allocated_memory_cb_.Run(delta);
1113 } 1118 }
1114 1119
1115 } // namespace media 1120 } // namespace media
OLDNEW
« no previous file with comments | « media/BUILD.gn ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698