diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 1 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 2 | ||||
| -rw-r--r-- | media/filters/ffmpeg_audio_decoder.cc | 6 |
4 files changed, 6 insertions, 5 deletions
@@ -11,7 +11,7 @@ vars = { "nacl_revision": "3626", "libjingle_revision": "33", "libvpx_revision": "65287", - "ffmpeg_revision": "65312", + "ffmpeg_revision": "65696", } deps = { diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 7b73781..4250233 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -17,6 +17,7 @@ extern "C" { // TODO(scherkus): fix and upstream the compiler warnings. MSVC_PUSH_DISABLE_WARNING(4244); #include <libavcodec/avcodec.h> +#include <libavcore/samplefmt.h> #include <libavformat/avformat.h> #include <libavformat/avio.h> #include <libavutil/avutil.h> diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index f9229a0..d6eebe2 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -272,7 +272,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { if (result > 0) { // TODO(scherkus): move this to ffmpeg_util.h and dedup. int64 denominator = av_audio_context()->channels * - av_get_bits_per_sample_format(av_audio_context()->sample_fmt) / 8 * + av_get_bits_per_sample_fmt(av_audio_context()->sample_fmt) / 8 * av_audio_context()->sample_rate; double microseconds = size_out / (denominator / diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc index 1895221..efd176e 100644 --- a/media/filters/ffmpeg_audio_decoder.cc +++ b/media/filters/ffmpeg_audio_decoder.cc @@ -50,7 +50,7 @@ void FFmpegAudioDecoder::DoInitialize(DemuxerStream* demuxer_stream, // Grab the AVStream's codec context and make sure we have sensible values. codec_context_ = av_stream->codec; - int bps = av_get_bits_per_sample_format(codec_context_->sample_fmt); + int bps = av_get_bits_per_sample_fmt(codec_context_->sample_fmt); if (codec_context_->channels <= 0 || codec_context_->channels > Limits::kMaxChannels || bps <= 0 || bps > Limits::kMaxBitsPerSample || @@ -77,7 +77,7 @@ void FFmpegAudioDecoder::DoInitialize(DemuxerStream* demuxer_stream, // information. media_format_.SetAsInteger(MediaFormat::kChannels, codec_context_->channels); media_format_.SetAsInteger(MediaFormat::kSampleBits, - av_get_bits_per_sample_format(codec_context_->sample_fmt)); + av_get_bits_per_sample_fmt(codec_context_->sample_fmt)); media_format_.SetAsInteger(MediaFormat::kSampleRate, codec_context_->sample_rate); media_format_.SetAsString(MediaFormat::kMimeType, @@ -245,7 +245,7 @@ void FFmpegAudioDecoder::DoDecode(Buffer* input) { base::TimeDelta FFmpegAudioDecoder::CalculateDuration(size_t size) { int64 denominator = codec_context_->channels * - av_get_bits_per_sample_format(codec_context_->sample_fmt) / 8 * + av_get_bits_per_sample_fmt(codec_context_->sample_fmt) / 8 * codec_context_->sample_rate; double microseconds = size / (denominator / static_cast<double>(base::Time::kMicrosecondsPerSecond)); |