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

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

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/callback.h" 5 #include "base/callback.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/stl_util-inl.h" 9 #include "base/stl_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/time.h" 11 #include "base/time.h"
12 #include "media/base/filter_host.h" 12 #include "media/base/filter_host.h"
13 #include "media/base/limits.h" 13 #include "media/base/limits.h"
14 #include "media/base/media_switches.h" 14 #include "media/base/media_switches.h"
15 #include "media/ffmpeg/ffmpeg_common.h" 15 #include "media/ffmpeg/ffmpeg_common.h"
16 #include "media/filters/bitstream_converter.h" 16 #include "media/filters/bitstream_converter.h"
17 #include "media/filters/ffmpeg_demuxer.h" 17 #include "media/filters/ffmpeg_demuxer.h"
18 #include "media/filters/ffmpeg_glue.h" 18 #include "media/filters/ffmpeg_glue.h"
19 #include "media/filters/ffmpeg_h264_bitstream_converter.h" 19 #include "media/filters/ffmpeg_h264_bitstream_converter.h"
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 read_event_.Wait(); 684 read_event_.Wait();
685 return last_read_bytes_; 685 return last_read_bytes_;
686 } 686 }
687 687
688 void FFmpegDemuxer::SignalReadCompleted(size_t size) { 688 void FFmpegDemuxer::SignalReadCompleted(size_t size) {
689 last_read_bytes_ = size; 689 last_read_bytes_ = size;
690 read_event_.Signal(); 690 read_event_.Signal();
691 } 691 }
692 692
693 } // namespace media 693 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698