mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-23 17:42:45 +00:00
update ffmpeg patches
This commit is contained in:
Tigro
parent
a4c073283a
commit
553f1bf782
4 changed files with 61 additions and 40 deletions
|
|
@ -1,28 +0,0 @@
|
|||
diff -up chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
||||
--- chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 2016-03-03 21:02:35.000000000 +0100
|
||||
+++ chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-03-07 02:24:07.937055548 +0100
|
||||
@@ -15,9 +15,9 @@
|
||||
#include <limits>
|
||||
|
||||
extern "C" {
|
||||
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
||||
-#include "third_party/ffmpeg/libavformat/avformat.h"
|
||||
-#include "third_party/ffmpeg/libavutil/imgutils.h"
|
||||
+#include <libavcodec/avcodec.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
+#include <libavutil/imgutils.h>
|
||||
} // extern "C"
|
||||
|
||||
#include "webrtc/base/checks.h"
|
||||
diff -up chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
||||
--- chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 2016-03-03 21:02:35.000000000 +0100
|
||||
+++ chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-03-07 02:24:04.729115509 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
||||
|
||||
extern "C" {
|
||||
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
||||
+#include <libavcodec/avcodec.h>
|
||||
} // extern "C"
|
||||
|
||||
#include "webrtc/base/scoped_ptr.h"
|
||||
28
chromium-51-system-ffmpeg-3.patch
Normal file
28
chromium-51-system-ffmpeg-3.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
diff -urN chromium-51.0.2704.63.orig/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc chromium-51.0.2704.63/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
||||
--- chromium-51.0.2704.63.orig/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-05-26 14:23:10.796936658 +0300
|
||||
+++ chromium-51.0.2704.63/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-05-26 14:46:46.806085065 +0300
|
||||
@@ -15,9 +15,9 @@
|
||||
#include <limits>
|
||||
|
||||
extern "C" {
|
||||
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
||||
-#include "third_party/ffmpeg/libavformat/avformat.h"
|
||||
-#include "third_party/ffmpeg/libavutil/imgutils.h"
|
||||
+#include <libavcodec/avcodec.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
+#include <libavutil/imgutils.h>
|
||||
} // extern "C"
|
||||
|
||||
#include "webrtc/base/checks.h"
|
||||
diff -urN chromium-51.0.2704.63.orig/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h chromium-51.0.2704.63/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
||||
--- chromium-51.0.2704.63.orig/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-05-26 14:23:10.794936602 +0300
|
||||
+++ chromium-51.0.2704.63/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-05-26 14:46:15.335133108 +0300
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
||||
|
||||
extern "C" {
|
||||
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
||||
+#include <libavcodec/avcodec.h>
|
||||
} // extern "C"
|
||||
|
||||
#include "webrtc/common_video/include/i420_buffer_pool.h"
|
||||
|
|
@ -59,9 +59,9 @@ Patch503: enable_vaapi_on_linux.diff
|
|||
Patch504: chromium-system-icu-r0.patch
|
||||
# (cjw) Don't disable deprecated APIs in ffmpeg header files, some of which change the ABI.
|
||||
# From Gentoo: http://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
|
||||
Patch505: chromium-system-ffmpeg-r2.patch
|
||||
Patch505: chromium-system-ffmpeg-r3.patch
|
||||
# (cjw) fix webrtc build with system ffmpeg
|
||||
Patch506: chromium-50-system-ffmpeg-3.patch
|
||||
Patch506: chromium-51-system-ffmpeg-3.patch
|
||||
# fix https://bugs.chromium.org/p/chromium/issues/detail?id=585513
|
||||
# vaInitialize failed VA error: unknown libva error
|
||||
Patch507: issue1688073002_40001.diff
|
||||
|
|
|
|||
|
|
@ -1,6 +1,28 @@
|
|||
--- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000
|
||||
+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000
|
||||
@@ -19,10 +19,6 @@
|
||||
diff -urN chromium-51.0.2704.63.orig/build/linux/unbundle/ffmpeg.gyp chromium-51.0.2704.63/build/linux/unbundle/ffmpeg.gyp
|
||||
--- chromium-51.0.2704.63.orig/build/linux/unbundle/ffmpeg.gyp 2016-05-26 14:22:22.928579777 +0300
|
||||
+++ chromium-51.0.2704.63/build/linux/unbundle/ffmpeg.gyp 2016-05-26 14:24:33.459279812 +0300
|
||||
@@ -41,6 +41,17 @@
|
||||
'USE_SYSTEM_FFMPEG',
|
||||
],
|
||||
},
|
||||
+ 'variables': {
|
||||
+ 'headers_root_path': '.',
|
||||
+ 'header_filenames': [
|
||||
+ 'libavcodec/avcodec.h',
|
||||
+ 'libavformat/avformat.h',
|
||||
+ 'libavutil/imgutils.h',
|
||||
+ ],
|
||||
+ },
|
||||
+ 'includes': [
|
||||
+ '../../build/shim_headers.gypi',
|
||||
+ ],
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'<!@(pkg-config --libs-only-L --libs-only-other libavcodec libavformat libavutil)',
|
||||
diff -urN chromium-51.0.2704.63.orig/media/ffmpeg/ffmpeg_common.h chromium-51.0.2704.63/media/ffmpeg/ffmpeg_common.h
|
||||
--- chromium-51.0.2704.63.orig/media/ffmpeg/ffmpeg_common.h 2016-05-26 14:23:54.895186671 +0300
|
||||
+++ chromium-51.0.2704.63/media/ffmpeg/ffmpeg_common.h 2016-05-26 14:24:33.447279472 +0300
|
||||
@@ -22,10 +22,6 @@
|
||||
|
||||
// Include FFmpeg header files.
|
||||
extern "C" {
|
||||
|
|
@ -11,7 +33,7 @@
|
|||
// Upstream libavcodec/utils.c still uses the deprecated
|
||||
// av_dup_packet(), causing deprecation warnings.
|
||||
// The normal fix for such things is to disable the feature as below,
|
||||
@@ -36,7 +32,6 @@
|
||||
@@ -39,7 +35,6 @@
|
||||
MSVC_PUSH_DISABLE_WARNING(4244);
|
||||
#include <libavcodec/avcodec.h>
|
||||
#include <libavformat/avformat.h>
|
||||
|
|
@ -19,11 +41,10 @@
|
|||
#include <libavformat/avio.h>
|
||||
#include <libavutil/avutil.h>
|
||||
#include <libavutil/imgutils.h>
|
||||
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
|
||||
index 155e980..7ba327a 100644
|
||||
--- a/media/filters/ffmpeg_demuxer.cc
|
||||
+++ b/media/filters/ffmpeg_demuxer.cc
|
||||
@@ -1034,24 +1034,6 @@
|
||||
diff -urN chromium-51.0.2704.63.orig/media/filters/ffmpeg_demuxer.cc chromium-51.0.2704.63/media/filters/ffmpeg_demuxer.cc
|
||||
--- chromium-51.0.2704.63.orig/media/filters/ffmpeg_demuxer.cc 2016-05-26 14:23:55.197195232 +0300
|
||||
+++ chromium-51.0.2704.63/media/filters/ffmpeg_demuxer.cc 2016-05-26 14:24:33.452279614 +0300
|
||||
@@ -1092,24 +1092,6 @@
|
||||
// If no estimate is found, the stream entry will be kInfiniteDuration().
|
||||
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
|
||||
kInfiniteDuration());
|
||||
|
|
@ -46,5 +67,5 @@ index 155e980..7ba327a 100644
|
|||
- }
|
||||
- }
|
||||
|
||||
scoped_ptr<MediaTracks> media_tracks(new MediaTracks());
|
||||
AVStream* audio_stream = NULL;
|
||||
AudioDecoderConfig audio_config;
|
||||
Loading…
Add table
Reference in a new issue