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

Side by Side Diff: media/filters/chunk_demuxer.cc

Issue 2856633002: Adding defensive CHECKs for AudioDecoderConfig crash (Closed)
Patch Set: Created 3 years, 7 months 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 | « no previous file | media/filters/source_buffer_stream.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/filters/chunk_demuxer.h" 5 #include "media/filters/chunk_demuxer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 DemuxerStream::Type ChunkDemuxerStream::type() const { return type_; } 277 DemuxerStream::Type ChunkDemuxerStream::type() const { return type_; }
278 278
279 DemuxerStream::Liveness ChunkDemuxerStream::liveness() const { 279 DemuxerStream::Liveness ChunkDemuxerStream::liveness() const {
280 base::AutoLock auto_lock(lock_); 280 base::AutoLock auto_lock(lock_);
281 return liveness_; 281 return liveness_;
282 } 282 }
283 283
284 AudioDecoderConfig ChunkDemuxerStream::audio_decoder_config() { 284 AudioDecoderConfig ChunkDemuxerStream::audio_decoder_config() {
285 CHECK_EQ(type_, AUDIO); 285 CHECK_EQ(type_, AUDIO);
286 base::AutoLock auto_lock(lock_); 286 base::AutoLock auto_lock(lock_);
287 // Trying to track down crash. http://crbug.com/715761
288 CHECK(stream_);
287 return stream_->GetCurrentAudioDecoderConfig(); 289 return stream_->GetCurrentAudioDecoderConfig();
288 } 290 }
289 291
290 VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() { 292 VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() {
291 CHECK_EQ(type_, VIDEO); 293 CHECK_EQ(type_, VIDEO);
292 base::AutoLock auto_lock(lock_); 294 base::AutoLock auto_lock(lock_);
295 // Trying to track down crash. http://crbug.com/715761
296 CHECK(stream_);
293 return stream_->GetCurrentVideoDecoderConfig(); 297 return stream_->GetCurrentVideoDecoderConfig();
294 } 298 }
295 299
296 bool ChunkDemuxerStream::SupportsConfigChanges() { return true; } 300 bool ChunkDemuxerStream::SupportsConfigChanges() { return true; }
297 301
298 VideoRotation ChunkDemuxerStream::video_rotation() { 302 VideoRotation ChunkDemuxerStream::video_rotation() {
299 return VIDEO_ROTATION_0; 303 return VIDEO_ROTATION_0;
300 } 304 }
301 305
302 bool ChunkDemuxerStream::IsEnabled() const { 306 bool ChunkDemuxerStream::IsEnabled() const {
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1356 } 1360 }
1357 1361
1358 void ChunkDemuxer::ShutdownAllStreams() { 1362 void ChunkDemuxer::ShutdownAllStreams() {
1359 for (auto itr = source_state_map_.begin(); itr != source_state_map_.end(); 1363 for (auto itr = source_state_map_.begin(); itr != source_state_map_.end();
1360 ++itr) { 1364 ++itr) {
1361 itr->second->Shutdown(); 1365 itr->second->Shutdown();
1362 } 1366 }
1363 } 1367 }
1364 1368
1365 } // namespace media 1369 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/filters/source_buffer_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698