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

Side by Side Diff: media/filters/chunk_demuxer.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: Fixed Merge 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/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 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 } 945 }
946 946
947 bool ChunkDemuxerStream::SupportsConfigChanges() { return true; } 947 bool ChunkDemuxerStream::SupportsConfigChanges() { return true; }
948 948
949 TextTrackConfig ChunkDemuxerStream::text_track_config() { 949 TextTrackConfig ChunkDemuxerStream::text_track_config() {
950 CHECK_EQ(type_, TEXT); 950 CHECK_EQ(type_, TEXT);
951 base::AutoLock auto_lock(lock_); 951 base::AutoLock auto_lock(lock_);
952 return stream_->GetCurrentTextTrackConfig(); 952 return stream_->GetCurrentTextTrackConfig();
953 } 953 }
954 954
955 VideoRotation ChunkDemuxerStream::video_rotation() {
956 return VIDEO_ROTATION_0;
957 }
958
955 void ChunkDemuxerStream::ChangeState_Locked(State state) { 959 void ChunkDemuxerStream::ChangeState_Locked(State state) {
956 lock_.AssertAcquired(); 960 lock_.AssertAcquired();
957 DVLOG(1) << "ChunkDemuxerStream::ChangeState_Locked() : " 961 DVLOG(1) << "ChunkDemuxerStream::ChangeState_Locked() : "
958 << "type " << type_ 962 << "type " << type_
959 << " - " << state_ << " -> " << state; 963 << " - " << state_ << " -> " << state;
960 state_ = state; 964 state_ = state;
961 } 965 }
962 966
963 ChunkDemuxerStream::~ChunkDemuxerStream() {} 967 ChunkDemuxerStream::~ChunkDemuxerStream() {}
964 968
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 } 1750 }
1747 1751
1748 void ChunkDemuxer::ShutdownAllStreams() { 1752 void ChunkDemuxer::ShutdownAllStreams() {
1749 for (SourceStateMap::iterator itr = source_state_map_.begin(); 1753 for (SourceStateMap::iterator itr = source_state_map_.begin();
1750 itr != source_state_map_.end(); ++itr) { 1754 itr != source_state_map_.end(); ++itr) {
1751 itr->second->Shutdown(); 1755 itr->second->Shutdown();
1752 } 1756 }
1753 } 1757 }
1754 1758
1755 } // namespace media 1759 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698