-
Notifications
You must be signed in to change notification settings - Fork 5
Expand file tree
/
Copy pathwebrtc_h264_codec_support.patch
More file actions
112 lines (110 loc) · 5.21 KB
/
webrtc_h264_codec_support.patch
File metadata and controls
112 lines (110 loc) · 5.21 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
diff --git a/chromium/config/Chrome/android/arm-neon/config_components.h b/chromium/config/Chrome/android/arm-neon/config_components.h
index 941ec3c97a..4c395608d4 100644
--- a/chromium/config/Chrome/android/arm-neon/config_components.h
+++ b/chromium/config/Chrome/android/arm-neon/config_components.h
@@ -129,7 +129,7 @@
#define CONFIG_H263I_DECODER 0
#define CONFIG_H263P_DECODER 0
#define CONFIG_H263_V4L2M2M_DECODER 0
-#define CONFIG_H264_DECODER 0
+#define CONFIG_H264_DECODER 1
#define CONFIG_H264_CRYSTALHD_DECODER 0
#define CONFIG_H264_V4L2M2M_DECODER 0
#define CONFIG_H264_MEDIACODEC_DECODER 0
diff --git a/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c b/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c
index dfe1c0ac28..38becbd853 100644
--- a/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c
+++ b/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c
@@ -13,4 +13,5 @@ static const FFCodec * const codec_list[] = {
&ff_pcm_s32le_decoder,
&ff_pcm_u8_decoder,
&ff_libopus_decoder,
+ &ff_h264_decoder,
NULL };
diff --git a/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c b/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c
index b1e4dd0061..42215fccc2 100644
--- a/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c
+++ b/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c
@@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = {
&ff_opus_parser,
&ff_vorbis_parser,
&ff_vp9_parser,
+ &ff_h264_parser,
NULL };
diff --git a/chromium/config/Chrome/android/arm64/config_components.h b/chromium/config/Chrome/android/arm64/config_components.h
index 941ec3c97a..4c395608d4 100644
--- a/chromium/config/Chrome/android/arm64/config_components.h
+++ b/chromium/config/Chrome/android/arm64/config_components.h
@@ -129,7 +129,7 @@
#define CONFIG_H263I_DECODER 0
#define CONFIG_H263P_DECODER 0
#define CONFIG_H263_V4L2M2M_DECODER 0
-#define CONFIG_H264_DECODER 0
+#define CONFIG_H264_DECODER 1
#define CONFIG_H264_CRYSTALHD_DECODER 0
#define CONFIG_H264_V4L2M2M_DECODER 0
#define CONFIG_H264_MEDIACODEC_DECODER 0
diff --git a/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c
index dfe1c0ac28..38becbd853 100644
--- a/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c
+++ b/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c
@@ -13,4 +13,5 @@ static const FFCodec * const codec_list[] = {
&ff_pcm_s32le_decoder,
&ff_pcm_u8_decoder,
&ff_libopus_decoder,
+ &ff_h264_decoder,
NULL };
diff --git a/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c
index b1e4dd0061..42215fccc2 100644
--- a/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c
+++ b/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c
@@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = {
&ff_opus_parser,
&ff_vorbis_parser,
&ff_vp9_parser,
+ &ff_h264_parser,
NULL };
diff --git a/chromium/config/Chrome/android/x64/config_components.h b/chromium/config/Chrome/android/x64/config_components.h
index 941ec3c97a..4c395608d4 100644
--- a/chromium/config/Chrome/android/x64/config_components.h
+++ b/chromium/config/Chrome/android/x64/config_components.h
@@ -129,7 +129,7 @@
#define CONFIG_H263I_DECODER 0
#define CONFIG_H263P_DECODER 0
#define CONFIG_H263_V4L2M2M_DECODER 0
-#define CONFIG_H264_DECODER 0
+#define CONFIG_H264_DECODER 1
#define CONFIG_H264_CRYSTALHD_DECODER 0
#define CONFIG_H264_V4L2M2M_DECODER 0
#define CONFIG_H264_MEDIACODEC_DECODER 0
diff --git a/chromium/config/Chrome/android/x64/libavcodec/codec_list.c b/chromium/config/Chrome/android/x64/libavcodec/codec_list.c
index dfe1c0ac28..38becbd853 100644
--- a/chromium/config/Chrome/android/x64/libavcodec/codec_list.c
+++ b/chromium/config/Chrome/android/x64/libavcodec/codec_list.c
@@ -13,4 +13,5 @@ static const FFCodec * const codec_list[] = {
&ff_pcm_s32le_decoder,
&ff_pcm_u8_decoder,
&ff_libopus_decoder,
+ &ff_h264_decoder,
NULL };
diff --git a/chromium/config/Chrome/android/x64/libavcodec/parser_list.c b/chromium/config/Chrome/android/x64/libavcodec/parser_list.c
index b1e4dd0061..42215fccc2 100644
--- a/chromium/config/Chrome/android/x64/libavcodec/parser_list.c
+++ b/chromium/config/Chrome/android/x64/libavcodec/parser_list.c
@@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = {
&ff_opus_parser,
&ff_vorbis_parser,
&ff_vp9_parser,
+ &ff_h264_parser,
NULL };
diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni
index 05965c3aff..70791ff906 100644
--- a/ffmpeg_generated.gni
+++ b/ffmpeg_generated.gni
@@ -12,7 +12,7 @@ ffmpeg_c_sources = []
ffmpeg_gas_sources = []
ffmpeg_asm_sources = []
-use_linux_config = is_linux || is_chromeos || is_fuchsia
+use_linux_config = is_linux || is_chromeos || is_fuchsia || is_android
if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_apple) || (is_win) || (use_linux_config)) {
ffmpeg_c_sources += [