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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (10/16) Created 7 years, 2 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
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 CHECK_EQ(demuxer_stream_->type(), AUDIO); 116 CHECK_EQ(demuxer_stream_->type(), AUDIO);
117 return audio_config_; 117 return audio_config_;
118 } 118 }
119 119
120 VideoDecoderConfig DecryptingDemuxerStream::video_decoder_config() { 120 VideoDecoderConfig DecryptingDemuxerStream::video_decoder_config() {
121 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_; 121 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_;
122 CHECK_EQ(demuxer_stream_->type(), VIDEO); 122 CHECK_EQ(demuxer_stream_->type(), VIDEO);
123 return video_config_; 123 return video_config_;
124 } 124 }
125 125
126 TextTrackConfig DecryptingDemuxerStream::text_track_config() {
127 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_;
128 CHECK_EQ(demuxer_stream_->type(), TEXT);
129 return TextTrackConfig();
130 }
131
126 DemuxerStream::Type DecryptingDemuxerStream::type() { 132 DemuxerStream::Type DecryptingDemuxerStream::type() {
127 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_; 133 DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_;
128 return demuxer_stream_->type(); 134 return demuxer_stream_->type();
129 } 135 }
130 136
131 void DecryptingDemuxerStream::EnableBitstreamConverter() { 137 void DecryptingDemuxerStream::EnableBitstreamConverter() {
132 demuxer_stream_->EnableBitstreamConverter(); 138 demuxer_stream_->EnableBitstreamConverter();
133 } 139 }
134 140
135 DecryptingDemuxerStream::~DecryptingDemuxerStream() { 141 DecryptingDemuxerStream::~DecryptingDemuxerStream() {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 break; 348 break;
343 } 349 }
344 350
345 default: 351 default:
346 NOTREACHED(); 352 NOTREACHED();
347 return; 353 return;
348 } 354 }
349 } 355 }
350 356
351 } // namespace media 357 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698