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

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

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/fake_video_decoder.cc ('k') | media/filters/ffmpeg_demuxer.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_audio_decoder.h" 5 #include "media/filters/ffmpeg_audio_decoder.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "media/base/audio_buffer.h" 9 #include "media/base/audio_buffer.h"
10 #include "media/base/audio_bus.h" 10 #include "media/base/audio_bus.h"
11 #include "media/base/audio_decoder_config.h" 11 #include "media/base/audio_decoder_config.h"
12 #include "media/base/audio_discard_helper.h" 12 #include "media/base/audio_discard_helper.h"
13 #include "media/base/bind_to_current_loop.h" 13 #include "media/base/bind_to_current_loop.h"
14 #include "media/base/decoder_buffer.h" 14 #include "media/base/decoder_buffer.h"
15 #include "media/base/limits.h" 15 #include "media/base/limits.h"
16 #include "media/base/sample_format.h"
17 #include "media/ffmpeg/ffmpeg_common.h" 16 #include "media/ffmpeg/ffmpeg_common.h"
18 #include "media/filters/ffmpeg_glue.h" 17 #include "media/filters/ffmpeg_glue.h"
19 18
20 namespace media { 19 namespace media {
21 20
22 // Returns true if the decode result was end of stream. 21 // Returns true if the decode result was end of stream.
23 static inline bool IsEndOfStream(int result, 22 static inline bool IsEndOfStream(int result,
24 int decoded_size, 23 int decoded_size,
25 const scoped_refptr<DecoderBuffer>& input) { 24 const scoped_refptr<DecoderBuffer>& input) {
26 // Three conditions to meet to declare end of stream for this decoder: 25 // Three conditions to meet to declare end of stream for this decoder:
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 387
389 ResetTimestampState(); 388 ResetTimestampState();
390 return true; 389 return true;
391 } 390 }
392 391
393 void FFmpegAudioDecoder::ResetTimestampState() { 392 void FFmpegAudioDecoder::ResetTimestampState() {
394 discard_helper_->Reset(config_.codec_delay()); 393 discard_helper_->Reset(config_.codec_delay());
395 } 394 }
396 395
397 } // namespace media 396 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/fake_video_decoder.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698