OLD | NEW |
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/base/pipeline.h" | 5 #include "media/base/pipeline.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 | 381 |
382 { | 382 { |
383 PipelineMetadata metadata; | 383 PipelineMetadata metadata; |
384 metadata.has_audio = audio_renderer_; | 384 metadata.has_audio = audio_renderer_; |
385 metadata.has_video = video_renderer_; | 385 metadata.has_video = video_renderer_; |
386 metadata.timeline_offset = demuxer_->GetTimelineOffset(); | 386 metadata.timeline_offset = demuxer_->GetTimelineOffset(); |
387 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); | 387 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); |
388 if (stream) { | 388 if (stream) { |
389 metadata.natural_size = | 389 metadata.natural_size = |
390 stream->video_decoder_config().natural_size(); | 390 stream->video_decoder_config().natural_size(); |
| 391 metadata.video_rotation = stream->video_rotation(); |
391 } | 392 } |
392 metadata_cb_.Run(metadata); | 393 metadata_cb_.Run(metadata); |
393 } | 394 } |
394 } | 395 } |
395 | 396 |
396 base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK); | 397 base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK); |
397 | 398 |
398 { | 399 { |
399 base::AutoLock auto_lock(lock_); | 400 base::AutoLock auto_lock(lock_); |
400 clock_->SetTime(start_timestamp_, start_timestamp_); | 401 clock_->SetTime(start_timestamp_, start_timestamp_); |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
908 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() { | 909 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() { |
909 lock_.AssertAcquired(); | 910 lock_.AssertAcquired(); |
910 if (clock_state_ != CLOCK_WAITING_FOR_AUDIO_TIME_UPDATE) | 911 if (clock_state_ != CLOCK_WAITING_FOR_AUDIO_TIME_UPDATE) |
911 return; | 912 return; |
912 | 913 |
913 clock_state_ = CLOCK_PLAYING; | 914 clock_state_ = CLOCK_PLAYING; |
914 clock_->Play(); | 915 clock_->Play(); |
915 } | 916 } |
916 | 917 |
917 } // namespace media | 918 } // namespace media |
OLD | NEW |