Commit 3a1d00c3 authored by Matt Wolenetz's avatar Matt Wolenetz Committed by Commit Bot

Roll src/third_party/ffmpeg/ 4468d4967..02ec9ce5a (389 commits)

https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/4468d4967f5d..02ec9ce5a9bc

$ git log 4468d4967..02ec9ce5a --date=short --no-merges --format='%ad %ae %s'
2018-03-13 wolenetz Updating build configs for M67 roll.
2018-03-13 wolenetz Update build_ffmpeg.py's sysroot name for M67
2018-03-13 wolenetz Remove deprecated av_register_all from ffmpeg.sigs
2018-03-13 wolenetz Copy [de]muxer, codec and parser lists into configs
2018-03-12 wolenetz Update chromium patches README
2018-03-12 vdixit avformat/hlsenc: fix for zero EXTINF tag duration
2018-03-12 matthieu.bouron avcodec/mediacodecdec_common: make INFO_TRY_AGAIN trace messages more consistent
2018-03-10 aman avcodec/mediacodecdec: add debug logging around hw buffer lifecycle
2018-02-27 michael avcodec/nuv: rtjpeg with dimensions less than 16 would result in no decoded pixels thus reject it
2018-02-27 michael avcodec/nuv: Check for minimum input size for uncomprssed and rtjpeg
(...)

Created with:
  roll-dep src/third_party/ffmpeg

Includes removal of FFmpegGlue::InitializeFFmpeg() because
av_register_all is no longer needed (and is deprecated in FFmpeg).

BUG=803898, 772699, 786793, 791237, 791349, 795653, 796778, 800123, 817338

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I94ccecab95831174a3bae6e9a8422e10bfec8e85
Reviewed-on: https://chromium-review.googlesource.com/964248Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Matthew Wolenetz <wolenetz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543531}
parent 6860d6ff
...@@ -365,7 +365,7 @@ deps = { ...@@ -365,7 +365,7 @@ deps = {
}, },
'src/third_party/ffmpeg': 'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '4468d4967f5dd6a733860af355ef61095b5cd5b1', Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '02ec9ce5a9bc14a5e245fdfce30770d2e878bb24',
'src/third_party/flac': 'src/third_party/flac':
Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '7d0f5b3a173ffe98db08057d1f52b7787569e0a6', Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '7d0f5b3a173ffe98db08057d1f52b7787569e0a6',
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include "crypto/openssl_util.h" #include "crypto/openssl_util.h"
#include "jingle/glue/thread_wrapper.h" #include "jingle/glue/thread_wrapper.h"
#include "media/base/media_permission.h" #include "media/base/media_permission.h"
#include "media/filters/ffmpeg_glue.h"
#include "media/media_features.h" #include "media/media_features.h"
#include "media/video/gpu_video_accelerator_factories.h" #include "media/video/gpu_video_accelerator_factories.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h" #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
...@@ -160,12 +159,8 @@ void PeerConnectionDependencyFactory::CreatePeerConnectionFactory() { ...@@ -160,12 +159,8 @@ void PeerConnectionDependencyFactory::CreatePeerConnectionFactory() {
#if BUILDFLAG(RTC_USE_H264) && BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) #if BUILDFLAG(RTC_USE_H264) && BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS)
// Building /w |rtc_use_h264|, is the corresponding run-time feature enabled? // Building /w |rtc_use_h264|, is the corresponding run-time feature enabled?
if (base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg)) { if (!base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg)) {
// |H264DecoderImpl| may be used which depends on FFmpeg, therefore we need // Feature is to be disabled.
// to initialize FFmpeg before going further.
media::FFmpegGlue::InitializeFFmpeg();
} else {
// Feature is to be disabled, no need to make sure FFmpeg is initialized.
webrtc::DisableRtcUseH264(); webrtc::DisableRtcUseH264();
} }
#else #else
......
...@@ -38,14 +38,6 @@ ...@@ -38,14 +38,6 @@
#include "media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.h" #include "media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.h"
#include "media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_video_decoder.h" #include "media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_video_decoder.h"
// Include FFmpeg avformat.h for av_register_all().
extern "C" {
// Temporarily disable possible loss of data warning.
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavformat/avformat.h>
MSVC_POP_WARNING();
} // extern "C"
#if !defined COMPONENT_BUILD #if !defined COMPONENT_BUILD
static base::AtExitManager g_at_exit_manager; static base::AtExitManager g_at_exit_manager;
#endif #endif
...@@ -234,7 +226,6 @@ void INITIALIZE_CDM_MODULE() { ...@@ -234,7 +226,6 @@ void INITIALIZE_CDM_MODULE() {
DVLOG(1) << __func__; DVLOG(1) << __func__;
#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
media::InitializeMediaLibrary(); media::InitializeMediaLibrary();
av_register_all();
#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
g_is_cdm_module_initialized = true; g_is_cdm_module_initialized = true;
......
...@@ -25,9 +25,7 @@ namespace media { ...@@ -25,9 +25,7 @@ namespace media {
class FFmpegCommonTest : public testing::Test { class FFmpegCommonTest : public testing::Test {
public: public:
FFmpegCommonTest() { FFmpegCommonTest() {}
FFmpegGlue::InitializeFFmpeg();
}
~FFmpegCommonTest() override = default; ~FFmpegCommonTest() override = default;
}; };
......
...@@ -80,8 +80,6 @@ void FFmpegAudioDecoder::Initialize( ...@@ -80,8 +80,6 @@ void FFmpegAudioDecoder::Initialize(
return; return;
} }
FFmpegGlue::InitializeFFmpeg();
if (!ConfigureDecoder(config)) { if (!ConfigureDecoder(config)) {
av_sample_format_ = 0; av_sample_format_ = 0;
bound_init_cb.Run(false); bound_init_cb.Run(false);
......
...@@ -63,13 +63,7 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) { ...@@ -63,13 +63,7 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
return new_offset; return new_offset;
} }
void FFmpegGlue::InitializeFFmpeg() {
av_register_all();
}
FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) { FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
InitializeFFmpeg();
// Initialize an AVIOContext using our custom read and seek operations. Don't // Initialize an AVIOContext using our custom read and seek operations. Don't
// keep pointers to the buffer since FFmpeg may reallocate it on the fly. It // keep pointers to the buffer since FFmpeg may reallocate it on the fly. It
// will be cleaned up // will be cleaned up
......
...@@ -17,10 +17,6 @@ ...@@ -17,10 +17,6 @@
// //
// The glue in turn processes those read and seek requests using the // The glue in turn processes those read and seek requests using the
// FFmpegURLProtocol provided during construction. // FFmpegURLProtocol provided during construction.
//
// FFmpegGlue is also responsible for initializing FFmpeg, which is done once
// per process. Initialization includes: turning off log messages, registering
// a lock manager, and finally registering all demuxers and codecs.
#ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_ #ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_
#define MEDIA_FILTERS_FFMPEG_GLUE_H_ #define MEDIA_FILTERS_FFMPEG_GLUE_H_
...@@ -63,8 +59,6 @@ class MEDIA_EXPORT FFmpegURLProtocol { ...@@ -63,8 +59,6 @@ class MEDIA_EXPORT FFmpegURLProtocol {
class MEDIA_EXPORT FFmpegGlue { class MEDIA_EXPORT FFmpegGlue {
public: public:
static void InitializeFFmpeg();
// See file documentation for usage. |protocol| must outlive FFmpegGlue. // See file documentation for usage. |protocol| must outlive FFmpegGlue.
explicit FFmpegGlue(FFmpegURLProtocol* protocol); explicit FFmpegGlue(FFmpegURLProtocol* protocol);
~FFmpegGlue(); ~FFmpegGlue();
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "media/base/video_util.h" #include "media/base/video_util.h"
#include "media/ffmpeg/ffmpeg_common.h" #include "media/ffmpeg/ffmpeg_common.h"
#include "media/ffmpeg/ffmpeg_decoding_loop.h" #include "media/ffmpeg/ffmpeg_decoding_loop.h"
#include "media/filters/ffmpeg_glue.h"
namespace media { namespace media {
...@@ -111,7 +110,6 @@ static void ReleaseVideoBufferImpl(void* opaque, uint8_t* data) { ...@@ -111,7 +110,6 @@ static void ReleaseVideoBufferImpl(void* opaque, uint8_t* data) {
// static // static
bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) { bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
FFmpegGlue::InitializeFFmpeg();
return avcodec_find_decoder(VideoCodecToCodecID(codec)) != nullptr; return avcodec_find_decoder(VideoCodecToCodecID(codec)) != nullptr;
} }
...@@ -243,8 +241,6 @@ void FFmpegVideoDecoder::Initialize( ...@@ -243,8 +241,6 @@ void FFmpegVideoDecoder::Initialize(
return; return;
} }
FFmpegGlue::InitializeFFmpeg();
if (!ConfigureDecoder(config, low_delay)) { if (!ConfigureDecoder(config, low_delay)) {
bound_init_cb.Run(false); bound_init_cb.Run(false);
return; return;
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "media/base/video_frame.h" #include "media/base/video_frame.h"
#include "media/base/video_util.h" #include "media/base/video_util.h"
#include "media/ffmpeg/ffmpeg_common.h" #include "media/ffmpeg/ffmpeg_common.h"
#include "media/filters/ffmpeg_glue.h"
#include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/ffmpeg_video_decoder.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
...@@ -63,8 +62,6 @@ class FFmpegVideoDecoderTest : public testing::Test { ...@@ -63,8 +62,6 @@ class FFmpegVideoDecoderTest : public testing::Test {
: decoder_(new FFmpegVideoDecoder(&media_log_)), : decoder_(new FFmpegVideoDecoder(&media_log_)),
decode_cb_(base::Bind(&FFmpegVideoDecoderTest::DecodeDone, decode_cb_(base::Bind(&FFmpegVideoDecoderTest::DecodeDone,
base::Unretained(this))) { base::Unretained(this))) {
FFmpegGlue::InitializeFFmpeg();
// Initialize various test buffers. // Initialize various test buffers.
frame_buffer_.reset(new uint8_t[kCodedSize.GetArea()]); frame_buffer_.reset(new uint8_t[kCodedSize.GetArea()]);
end_of_stream_buffer_ = DecoderBuffer::CreateEOSBuffer(); end_of_stream_buffer_ = DecoderBuffer::CreateEOSBuffer();
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "media/base/test_data_util.h" #include "media/base/test_data_util.h"
#include "media/base/video_decoder.h" #include "media/base/video_decoder.h"
#include "media/base/video_frame.h" #include "media/base/video_frame.h"
#include "media/filters/ffmpeg_glue.h"
#include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/ffmpeg_video_decoder.h"
#include "media/filters/ivf_parser.h" #include "media/filters/ivf_parser.h"
#include "media/gpu/features.h" #include "media/gpu/features.h"
...@@ -728,7 +727,6 @@ VideoFrameQualityValidator::VideoFrameQualityValidator( ...@@ -728,7 +727,6 @@ VideoFrameQualityValidator::VideoFrameQualityValidator(
void VideoFrameQualityValidator::Initialize(const gfx::Size& coded_size, void VideoFrameQualityValidator::Initialize(const gfx::Size& coded_size,
const gfx::Rect& visible_size) { const gfx::Rect& visible_size) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
FFmpegGlue::InitializeFFmpeg();
gfx::Size natural_size(visible_size.size()); gfx::Size natural_size(visible_size.size());
// The default output format of ffmpeg video decoder is YV12. // The default output format of ffmpeg video decoder is YV12.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment