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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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
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 <stdint.h>
8
7 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
8 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
9 #include "media/base/audio_buffer.h" 11 #include "media/base/audio_buffer.h"
10 #include "media/base/audio_bus.h" 12 #include "media/base/audio_bus.h"
11 #include "media/base/audio_decoder_config.h" 13 #include "media/base/audio_decoder_config.h"
12 #include "media/base/audio_discard_helper.h" 14 #include "media/base/audio_discard_helper.h"
13 #include "media/base/bind_to_current_loop.h" 15 #include "media/base/bind_to_current_loop.h"
14 #include "media/base/decoder_buffer.h" 16 #include "media/base/decoder_buffer.h"
15 #include "media/base/limits.h" 17 #include "media/base/limits.h"
16 #include "media/base/timestamp_constants.h" 18 #include "media/base/timestamp_constants.h"
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 return true; 387 return true;
386 } 388 }
387 389
388 void FFmpegAudioDecoder::ResetTimestampState() { 390 void FFmpegAudioDecoder::ResetTimestampState() {
389 discard_helper_.reset(new AudioDiscardHelper(config_.samples_per_second(), 391 discard_helper_.reset(new AudioDiscardHelper(config_.samples_per_second(),
390 config_.codec_delay())); 392 config_.codec_delay()));
391 discard_helper_->Reset(config_.codec_delay()); 393 discard_helper_->Reset(config_.codec_delay());
392 } 394 }
393 395
394 } // namespace media 396 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_aac_bitstream_converter_unittest.cc ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698