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

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

Issue 363813002: Update to Pipeline Metadata and Decoder Stream for Orientation Data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor editing, mov->MP4, removed unneeded media prefix Created 6 years, 5 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 | Annotate | Revision Log
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/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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 } 158 }
159 159
160 void DecryptingDemuxerStream::EnableBitstreamConverter() { 160 void DecryptingDemuxerStream::EnableBitstreamConverter() {
161 demuxer_stream_->EnableBitstreamConverter(); 161 demuxer_stream_->EnableBitstreamConverter();
162 } 162 }
163 163
164 bool DecryptingDemuxerStream::SupportsConfigChanges() { 164 bool DecryptingDemuxerStream::SupportsConfigChanges() {
165 return demuxer_stream_->SupportsConfigChanges(); 165 return demuxer_stream_->SupportsConfigChanges();
166 } 166 }
167 167
168 VideoRotation DecryptingDemuxerStream::video_rotation() {
169 return VIDEO_ROTATION_0;
170 }
171
168 DecryptingDemuxerStream::~DecryptingDemuxerStream() { 172 DecryptingDemuxerStream::~DecryptingDemuxerStream() {
169 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_; 173 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_;
170 } 174 }
171 175
172 void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) { 176 void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) {
173 DVLOG(2) << __FUNCTION__; 177 DVLOG(2) << __FUNCTION__;
174 DCHECK(task_runner_->BelongsToCurrentThread()); 178 DCHECK(task_runner_->BelongsToCurrentThread());
175 DCHECK_EQ(state_, kDecryptorRequested) << state_; 179 DCHECK_EQ(state_, kDecryptorRequested) << state_;
176 DCHECK(!init_cb_.is_null()); 180 DCHECK(!init_cb_.is_null());
177 DCHECK(!set_decryptor_ready_cb_.is_null()); 181 DCHECK(!set_decryptor_ready_cb_.is_null());
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 break; 394 break;
391 } 395 }
392 396
393 default: 397 default:
394 NOTREACHED(); 398 NOTREACHED();
395 return; 399 return;
396 } 400 }
397 } 401 }
398 402
399 } // namespace media 403 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698