| OLD | NEW |
| 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/decrypting_demuxer_stream.h" | 5 #include "media/filters/decrypting_demuxer_stream.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 CHECK_EQ(demuxer_stream_->type(), AUDIO); | 114 CHECK_EQ(demuxer_stream_->type(), AUDIO); |
| 115 return audio_config_; | 115 return audio_config_; |
| 116 } | 116 } |
| 117 | 117 |
| 118 VideoDecoderConfig DecryptingDemuxerStream::video_decoder_config() { | 118 VideoDecoderConfig DecryptingDemuxerStream::video_decoder_config() { |
| 119 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_; | 119 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_; |
| 120 CHECK_EQ(demuxer_stream_->type(), VIDEO); | 120 CHECK_EQ(demuxer_stream_->type(), VIDEO); |
| 121 return video_config_; | 121 return video_config_; |
| 122 } | 122 } |
| 123 | 123 |
| 124 DemuxerStream::Type DecryptingDemuxerStream::type() { | 124 DemuxerStream::Type DecryptingDemuxerStream::type() const { |
| 125 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_; | 125 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_; |
| 126 return demuxer_stream_->type(); | 126 return demuxer_stream_->type(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 DemuxerStream::Liveness DecryptingDemuxerStream::liveness() const { |
| 130 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_; |
| 131 return demuxer_stream_->liveness(); |
| 132 } |
| 133 |
| 129 void DecryptingDemuxerStream::EnableBitstreamConverter() { | 134 void DecryptingDemuxerStream::EnableBitstreamConverter() { |
| 130 demuxer_stream_->EnableBitstreamConverter(); | 135 demuxer_stream_->EnableBitstreamConverter(); |
| 131 } | 136 } |
| 132 | 137 |
| 133 bool DecryptingDemuxerStream::SupportsConfigChanges() { | 138 bool DecryptingDemuxerStream::SupportsConfigChanges() { |
| 134 return demuxer_stream_->SupportsConfigChanges(); | 139 return demuxer_stream_->SupportsConfigChanges(); |
| 135 } | 140 } |
| 136 | 141 |
| 137 VideoRotation DecryptingDemuxerStream::video_rotation() { | 142 VideoRotation DecryptingDemuxerStream::video_rotation() { |
| 138 return VIDEO_ROTATION_0; | 143 return VIDEO_ROTATION_0; |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 break; | 399 break; |
| 395 } | 400 } |
| 396 | 401 |
| 397 default: | 402 default: |
| 398 NOTREACHED(); | 403 NOTREACHED(); |
| 399 return; | 404 return; |
| 400 } | 405 } |
| 401 } | 406 } |
| 402 | 407 |
| 403 } // namespace media | 408 } // namespace media |
| OLD | NEW |