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

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

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 3 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/cdm/simple_cdm_allocator.cc ('k') | media/filters/vpx_video_decoder_fuzzertest.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 <utility> 10 #include <utility>
10 11
11 #include "base/base64.h" 12 #include "base/base64.h"
12 #include "base/bind.h" 13 #include "base/bind.h"
13 #include "base/callback_helpers.h" 14 #include "base/callback_helpers.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
16 #include "base/metrics/histogram_macros.h" 17 #include "base/metrics/histogram_macros.h"
17 #include "base/metrics/sparse_histogram.h" 18 #include "base/metrics/sparse_histogram.h"
18 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
(...skipping 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1767 1768
1768 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) { 1769 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
1769 DCHECK(task_runner_->BelongsToCurrentThread()); 1770 DCHECK(task_runner_->BelongsToCurrentThread());
1770 for (const auto& stream : streams_) { 1771 for (const auto& stream : streams_) {
1771 if (stream) 1772 if (stream)
1772 stream->SetLiveness(liveness); 1773 stream->SetLiveness(liveness);
1773 } 1774 }
1774 } 1775 }
1775 1776
1776 } // namespace media 1777 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/simple_cdm_allocator.cc ('k') | media/filters/vpx_video_decoder_fuzzertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698