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

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

Issue 2691393002: Fix auto raw pointer deduction on linux (Closed)
Patch Set: rebase Created 3 years, 10 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
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/source_buffer_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ffmpeg_demuxer.h" 5 #include "media/filters/ffmpeg_demuxer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1647 1647
1648 // First disable all streams that need to be disabled and then enable streams 1648 // First disable all streams that need to be disabled and then enable streams
1649 // that are enabled. 1649 // that are enabled.
1650 for (const auto& stream : streams_) { 1650 for (const auto& stream : streams_) {
1651 if (stream && stream->type() == DemuxerStream::AUDIO && 1651 if (stream && stream->type() == DemuxerStream::AUDIO &&
1652 enabled_streams.find(stream.get()) == enabled_streams.end()) { 1652 enabled_streams.find(stream.get()) == enabled_streams.end()) {
1653 DVLOG(1) << __func__ << ": disabling stream " << stream.get(); 1653 DVLOG(1) << __func__ << ": disabling stream " << stream.get();
1654 stream->set_enabled(false, currTime); 1654 stream->set_enabled(false, currTime);
1655 } 1655 }
1656 } 1656 }
1657 for (const auto& stream : enabled_streams) { 1657 for (auto* stream : enabled_streams) {
1658 DCHECK(stream); 1658 DCHECK(stream);
1659 DVLOG(1) << __func__ << ": enabling stream " << stream; 1659 DVLOG(1) << __func__ << ": enabling stream " << stream;
1660 stream->set_enabled(true, currTime); 1660 stream->set_enabled(true, currTime);
1661 } 1661 }
1662 } 1662 }
1663 1663
1664 void FFmpegDemuxer::OnSelectedVideoTrackChanged( 1664 void FFmpegDemuxer::OnSelectedVideoTrackChanged(
1665 const std::vector<MediaTrack::Id>& track_ids, 1665 const std::vector<MediaTrack::Id>& track_ids,
1666 base::TimeDelta currTime) { 1666 base::TimeDelta currTime) {
1667 DCHECK(task_runner_->BelongsToCurrentThread()); 1667 DCHECK(task_runner_->BelongsToCurrentThread());
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1837 1837
1838 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) { 1838 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
1839 DCHECK(task_runner_->BelongsToCurrentThread()); 1839 DCHECK(task_runner_->BelongsToCurrentThread());
1840 for (const auto& stream : streams_) { 1840 for (const auto& stream : streams_) {
1841 if (stream) 1841 if (stream)
1842 stream->SetLiveness(liveness); 1842 stream->SetLiveness(liveness);
1843 } 1843 }
1844 } 1844 }
1845 1845
1846 } // namespace media 1846 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/source_buffer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698