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

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

Issue 560563002: Add default impl for DemuxerStream::EnableBitstreamConverter(); (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « media/filters/decrypting_demuxer_stream.h ('k') | media/filters/fake_demuxer_stream.h » ('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/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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
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() {
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 void DecryptingDemuxerStream::EnableBitstreamConverter() {
130 demuxer_stream_->EnableBitstreamConverter();
acolwell GONE FROM CHROMIUM 2014/09/09 22:28:17 Why is this getting removed? Don't you still need
xhwang 2014/09/09 22:50:37 Oops, good catch. Reverted.
131 }
132
133 bool DecryptingDemuxerStream::SupportsConfigChanges() { 129 bool DecryptingDemuxerStream::SupportsConfigChanges() {
134 return demuxer_stream_->SupportsConfigChanges(); 130 return demuxer_stream_->SupportsConfigChanges();
135 } 131 }
136 132
137 VideoRotation DecryptingDemuxerStream::video_rotation() { 133 VideoRotation DecryptingDemuxerStream::video_rotation() {
138 return VIDEO_ROTATION_0; 134 return VIDEO_ROTATION_0;
139 } 135 }
140 136
141 DecryptingDemuxerStream::~DecryptingDemuxerStream() { 137 DecryptingDemuxerStream::~DecryptingDemuxerStream() {
142 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_; 138 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_;
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 break; 381 break;
386 } 382 }
387 383
388 default: 384 default:
389 NOTREACHED(); 385 NOTREACHED();
390 return; 386 return;
391 } 387 }
392 } 388 }
393 389
394 } // namespace media 390 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_demuxer_stream.h ('k') | media/filters/fake_demuxer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698