media/filters/decrypting_demuxer_stream.cc - Issue 23702007: Render inband text tracks in the media pipeline

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: media/filters/decrypting_demuxer_stream.cc

diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc

index 3f44aa60247178ea61093e21ff91dd47a00e7079..524fea9d11c1f9c9b3d4bdca5b259fe9058a687f 100644

--- a/media/filters/decrypting_demuxer_stream.cc

+++ b/media/filters/decrypting_demuxer_stream.cc

@@ -123,6 +123,12 @@ VideoDecoderConfig DecryptingDemuxerStream::video_decoder_config() {

return video_config_;

}

+TextTrackConfig DecryptingDemuxerStream::text_track_config() {

+ DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_;

+ CHECK_EQ(demuxer_stream_->type(), TEXT);

+ return TextTrackConfig();

DemuxerStream::Type DecryptingDemuxerStream::type() {

DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_;

return demuxer_stream_->type();