Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 6cbffee002a827dc7dbb2a878995a6a21f4de543 Mon Sep 17 00:00:00 2001
- From: "michal.lazo" <xlazom00@gmail.com>
- Date: Wed, 28 Sep 2016 23:57:03 +0200
- Subject: [PATCH] enable HEVC
- ---
- chromium/config/Chrome/win/x64/config.asm | 6 +++---
- chromium/config/Chrome/win/x64/config.h | 8 ++++----
- chromium/config/Chromium/win/x64/config.asm | 6 +++---
- chromium/config/Chromium/win/x64/config.h | 8 ++++----
- ffmpeg_generated.gni | 28 ++++++++++++++++++++++++++++
- libavformat/autorename_libavformat_hevc.c | 2 ++
- 6 files changed, 44 insertions(+), 14 deletions(-)
- create mode 100644 libavformat/autorename_libavformat_hevc.c
- diff --git a/chromium/config/Chrome/win/x64/config.asm b/chromium/config/Chrome/win/x64/config.asm
- index 6792c19..8b4b0b8 100644
- --- a/chromium/config/Chrome/win/x64/config.asm
- +++ b/chromium/config/Chrome/win/x64/config.asm
- @@ -700,7 +700,7 @@
- %define CONFIG_H264_VDA_DECODER 0
- %define CONFIG_H264_VDPAU_DECODER 0
- %define CONFIG_HAP_DECODER 0
- -%define CONFIG_HEVC_DECODER 0
- +%define CONFIG_HEVC_DECODER 1
- %define CONFIG_HEVC_QSV_DECODER 0
- %define CONFIG_HNM4_VIDEO_DECODER 0
- %define CONFIG_HQ_HQA_DECODER 0
- @@ -1131,7 +1131,7 @@
- %define CONFIG_H261_DEMUXER 0
- %define CONFIG_H263_DEMUXER 0
- %define CONFIG_H264_DEMUXER 0
- -%define CONFIG_HEVC_DEMUXER 0
- +%define CONFIG_HEVC_DEMUXER 1
- %define CONFIG_HLS_DEMUXER 0
- %define CONFIG_HNM_DEMUXER 0
- %define CONFIG_ICO_DEMUXER 0
- @@ -1999,7 +1999,7 @@
- %define CONFIG_H261_PARSER 0
- %define CONFIG_H263_PARSER 0
- %define CONFIG_H264_PARSER 1
- -%define CONFIG_HEVC_PARSER 0
- +%define CONFIG_HEVC_PARSER 1
- %define CONFIG_MJPEG_PARSER 0
- %define CONFIG_MLP_PARSER 0
- %define CONFIG_MPEG4VIDEO_PARSER 0
- diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h
- index 9899dd4..5b3dcde 100644
- --- a/chromium/config/Chrome/win/x64/config.h
- +++ b/chromium/config/Chrome/win/x64/config.h
- @@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
- -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-decoder=vorbis --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vorbis' --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --enable-yasm --extra-cflags=-I/cygdrive/d/ffmpeg-tmp/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio'"
- +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-decoder=vorbis --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vorbis' --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --enable-yasm --extra-cflags=-I/cygdrive/d/ffmpeg-tmp/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder='hevc' --enable-demuxer='hevc' --enable-parser='hevc'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2016
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- @@ -716,7 +716,7 @@
- #define CONFIG_H264_VDA_DECODER 0
- #define CONFIG_H264_VDPAU_DECODER 0
- #define CONFIG_HAP_DECODER 0
- -#define CONFIG_HEVC_DECODER 0
- +#define CONFIG_HEVC_DECODER 1
- #define CONFIG_HEVC_QSV_DECODER 0
- #define CONFIG_HNM4_VIDEO_DECODER 0
- #define CONFIG_HQ_HQA_DECODER 0
- @@ -1147,7 +1147,7 @@
- #define CONFIG_H261_DEMUXER 0
- #define CONFIG_H263_DEMUXER 0
- #define CONFIG_H264_DEMUXER 0
- -#define CONFIG_HEVC_DEMUXER 0
- +#define CONFIG_HEVC_DEMUXER 1
- #define CONFIG_HLS_DEMUXER 0
- #define CONFIG_HNM_DEMUXER 0
- #define CONFIG_ICO_DEMUXER 0
- @@ -2015,7 +2015,7 @@
- #define CONFIG_H261_PARSER 0
- #define CONFIG_H263_PARSER 0
- #define CONFIG_H264_PARSER 1
- -#define CONFIG_HEVC_PARSER 0
- +#define CONFIG_HEVC_PARSER 1
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
- diff --git a/chromium/config/Chromium/win/x64/config.asm b/chromium/config/Chromium/win/x64/config.asm
- index 503fda5..d09a458 100644
- --- a/chromium/config/Chromium/win/x64/config.asm
- +++ b/chromium/config/Chromium/win/x64/config.asm
- @@ -700,7 +700,7 @@
- %define CONFIG_H264_VDA_DECODER 0
- %define CONFIG_H264_VDPAU_DECODER 0
- %define CONFIG_HAP_DECODER 0
- -%define CONFIG_HEVC_DECODER 0
- +%define CONFIG_HEVC_DECODER 1
- %define CONFIG_HEVC_QSV_DECODER 0
- %define CONFIG_HNM4_VIDEO_DECODER 0
- %define CONFIG_HQ_HQA_DECODER 0
- @@ -1131,7 +1131,7 @@
- %define CONFIG_H261_DEMUXER 0
- %define CONFIG_H263_DEMUXER 0
- %define CONFIG_H264_DEMUXER 0
- -%define CONFIG_HEVC_DEMUXER 0
- +%define CONFIG_HEVC_DEMUXER 1
- %define CONFIG_HLS_DEMUXER 0
- %define CONFIG_HNM_DEMUXER 0
- %define CONFIG_ICO_DEMUXER 0
- @@ -1999,7 +1999,7 @@
- %define CONFIG_H261_PARSER 0
- %define CONFIG_H263_PARSER 0
- %define CONFIG_H264_PARSER 0
- -%define CONFIG_HEVC_PARSER 0
- +%define CONFIG_HEVC_PARSER 1
- %define CONFIG_MJPEG_PARSER 0
- %define CONFIG_MLP_PARSER 0
- %define CONFIG_MPEG4VIDEO_PARSER 0
- diff --git a/chromium/config/Chromium/win/x64/config.h b/chromium/config/Chromium/win/x64/config.h
- index 14b9e07..6fddb0e 100644
- --- a/chromium/config/Chromium/win/x64/config.h
- +++ b/chromium/config/Chromium/win/x64/config.h
- @@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
- -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-decoder=vorbis --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vorbis' --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --enable-yasm --extra-cflags=-I/cygdrive/d/ffmpeg-tmp/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib'"
- +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-decoder=vorbis --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vorbis' --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --enable-yasm --extra-cflags=-I/cygdrive/d/ffmpeg-tmp/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='hevc' --enable-demuxer='hevc' --enable-parser='hevc'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2016
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- @@ -716,7 +716,7 @@
- #define CONFIG_H264_VDA_DECODER 0
- #define CONFIG_H264_VDPAU_DECODER 0
- #define CONFIG_HAP_DECODER 0
- -#define CONFIG_HEVC_DECODER 0
- +#define CONFIG_HEVC_DECODER 1
- #define CONFIG_HEVC_QSV_DECODER 0
- #define CONFIG_HNM4_VIDEO_DECODER 0
- #define CONFIG_HQ_HQA_DECODER 0
- @@ -1147,7 +1147,7 @@
- #define CONFIG_H261_DEMUXER 0
- #define CONFIG_H263_DEMUXER 0
- #define CONFIG_H264_DEMUXER 0
- -#define CONFIG_HEVC_DEMUXER 0
- +#define CONFIG_HEVC_DEMUXER 1
- #define CONFIG_HLS_DEMUXER 0
- #define CONFIG_HNM_DEMUXER 0
- #define CONFIG_ICO_DEMUXER 0
- @@ -2015,7 +2015,7 @@
- #define CONFIG_H261_PARSER 0
- #define CONFIG_H263_PARSER 0
- #define CONFIG_H264_PARSER 0
- -#define CONFIG_HEVC_PARSER 0
- +#define CONFIG_HEVC_PARSER 1
- #define CONFIG_MJPEG_PARSER 0
- #define CONFIG_MLP_PARSER 0
- #define CONFIG_MPEG4VIDEO_PARSER 0
- diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni
- index e952679..24f9f24 100644
- --- a/ffmpeg_generated.gni
- +++ b/ffmpeg_generated.gni
- @@ -143,7 +143,35 @@ if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "C
- "libavutil/timecode.c",
- "libavutil/twofish.c",
- "libavutil/utils.c",
- + "libavcodec/hevc.c",
- + "libavcodec/hevc_cabac.c",
- + "libavcodec/hevc_data.c",
- + "libavcodec/hevc_filter.c",
- + "libavcodec/hevc_mvs.c",
- + "libavcodec/hevc_parse.c",
- + "libavcodec/hevc_parser.c",
- + "libavcodec/hevc_ps.c",
- + "libavcodec/hevc_refs.c",
- + "libavcodec/hevc_sei.c",
- + "libavcodec/hevcdsp.c",
- + "libavcodec/hevcpred.c",
- + "libavcodec/x86/hevcdsp_init.c",
- + "libavcodec/bswapdsp.c",
- + "libavcodec/x86/bswapdsp_init.c",
- + "libavformat/autorename_libavformat_hevc.c",
- + "libavformat/hevcdec.c",
- + "libavformat/avc.c",
- + ]
- + ffmpeg_yasm_sources += [
- + "libavcodec/x86/hevc_deblock.asm",
- + "libavcodec/x86/hevc_idct.asm",
- + "libavcodec/x86/hevc_mc.asm",
- + "libavcodec/x86/hevc_res_add.asm",
- + "libavcodec/x86/hevc_sao.asm",
- + "libavcodec/x86/hevc_sao_10bit.asm",
- + "libavcodec/x86/bswapdsp.asm",
- ]
- +
- }
- if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
- diff --git a/libavformat/autorename_libavformat_hevc.c b/libavformat/autorename_libavformat_hevc.c
- new file mode 100644
- index 0000000..c9593dc
- --- /dev/null
- +++ b/libavformat/autorename_libavformat_hevc.c
- @@ -0,0 +1,2 @@
- +// File automatically generated. See crbug.com/495833.
- +#include "hevc.c"
- --
- 2.9.2.windows.1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement