| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 | 136 |
| 137 void DecryptingDemuxerStream::EnableBitstreamConverter() { | 137 void DecryptingDemuxerStream::EnableBitstreamConverter() { |
| 138 demuxer_stream_->EnableBitstreamConverter(); | 138 demuxer_stream_->EnableBitstreamConverter(); |
| 139 } | 139 } |
| 140 | 140 |
| 141 bool DecryptingDemuxerStream::SupportsConfigChanges() { | 141 bool DecryptingDemuxerStream::SupportsConfigChanges() { |
| 142 return demuxer_stream_->SupportsConfigChanges(); | 142 return demuxer_stream_->SupportsConfigChanges(); |
| 143 } | 143 } |
| 144 | 144 |
| 145 VideoRotation DecryptingDemuxerStream::video_rotation() { | 145 VideoRotation DecryptingDemuxerStream::video_rotation() { |
| 146 return VIDEO_ROTATION_0; | 146 return demuxer_stream_->video_rotation(); |
| 147 } | 147 } |
| 148 | 148 |
| 149 DecryptingDemuxerStream::~DecryptingDemuxerStream() { | 149 DecryptingDemuxerStream::~DecryptingDemuxerStream() { |
| 150 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_; | 150 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_; |
| 151 DCHECK(task_runner_->BelongsToCurrentThread()); | 151 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 152 | 152 |
| 153 if (state_ == kUninitialized) | 153 if (state_ == kUninitialized) |
| 154 return; | 154 return; |
| 155 | 155 |
| 156 if (decryptor_) { | 156 if (decryptor_) { |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 break; | 403 break; |
| 404 } | 404 } |
| 405 | 405 |
| 406 default: | 406 default: |
| 407 NOTREACHED(); | 407 NOTREACHED(); |
| 408 return; | 408 return; |
| 409 } | 409 } |
| 410 } | 410 } |
| 411 | 411 |
| 412 } // namespace media | 412 } // namespace media |
| OLD | NEW |