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

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

Issue 208263018: Add SupportsConfigChanges() to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audioconverterchunk
Patch Set: Make comment not specific to video_decoder_config(). Created 6 years, 9 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/chunk_demuxer.h" 5 #include "media/filters/chunk_demuxer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <list> 9 #include <list>
10 10
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 base::AutoLock auto_lock(lock_); 896 base::AutoLock auto_lock(lock_);
897 return stream_->GetCurrentAudioDecoderConfig(); 897 return stream_->GetCurrentAudioDecoderConfig();
898 } 898 }
899 899
900 VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() { 900 VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() {
901 CHECK_EQ(type_, VIDEO); 901 CHECK_EQ(type_, VIDEO);
902 base::AutoLock auto_lock(lock_); 902 base::AutoLock auto_lock(lock_);
903 return stream_->GetCurrentVideoDecoderConfig(); 903 return stream_->GetCurrentVideoDecoderConfig();
904 } 904 }
905 905
906 bool ChunkDemuxerStream::SupportsConfigChanges() { return true; }
907
906 TextTrackConfig ChunkDemuxerStream::text_track_config() { 908 TextTrackConfig ChunkDemuxerStream::text_track_config() {
907 CHECK_EQ(type_, TEXT); 909 CHECK_EQ(type_, TEXT);
908 base::AutoLock auto_lock(lock_); 910 base::AutoLock auto_lock(lock_);
909 return stream_->GetCurrentTextTrackConfig(); 911 return stream_->GetCurrentTextTrackConfig();
910 } 912 }
911 913
912 void ChunkDemuxerStream::ChangeState_Locked(State state) { 914 void ChunkDemuxerStream::ChangeState_Locked(State state) {
913 lock_.AssertAcquired(); 915 lock_.AssertAcquired();
914 DVLOG(1) << "ChunkDemuxerStream::ChangeState_Locked() : " 916 DVLOG(1) << "ChunkDemuxerStream::ChangeState_Locked() : "
915 << "type " << type_ 917 << "type " << type_
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 } 1633 }
1632 1634
1633 void ChunkDemuxer::ShutdownAllStreams() { 1635 void ChunkDemuxer::ShutdownAllStreams() {
1634 for (SourceStateMap::iterator itr = source_state_map_.begin(); 1636 for (SourceStateMap::iterator itr = source_state_map_.begin();
1635 itr != source_state_map_.end(); ++itr) { 1637 itr != source_state_map_.end(); ++itr) {
1636 itr->second->Shutdown(); 1638 itr->second->Shutdown();
1637 } 1639 }
1638 } 1640 }
1639 1641
1640 } // namespace media 1642 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698