├── COPYING.LGPLv2.1 ├── README.md ├── v18.2.1 ├── look_chromium_hevc_ac3.patch ├── look_electron_hevc_ac3.patch └── look_ffmpeg_hevc_ac3.patch ├── v20.0.0 ├── look_chromium_hevc_ac3.patch ├── look_electron_hevc_ac3.patch └── look_ffmpeg_hevc_ac3.patch ├── v20.1.1 ├── look_chromium_hevc_ac3.patch ├── look_electron_hevc_ac3.patch └── look_ffmpeg_hevc_ac3.patch ├── v25.1.0 ├── look_chromium_hevc_ac3.patch ├── look_electron_hevc_ac3.patch └── look_ffmpeg_hevc_ac3.patch └── v29.1.4 ├── look_chromium_hevc_ac3.patch ├── look_electron_hevc_ac3.patch └── look_ffmpeg_hevc_ac3.patch /COPYING.LGPLv2.1: -------------------------------------------------------------------------------- 1 | GNU LESSER GENERAL PUBLIC LICENSE 2 | Version 2.1, February 1999 3 | 4 | Copyright (C) 1991, 1999 Free Software Foundation, Inc. 5 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 6 | Everyone is permitted to copy and distribute verbatim copies 7 | of this license document, but changing it is not allowed. 8 | 9 | [This is the first released version of the Lesser GPL. It also counts 10 | as the successor of the GNU Library Public License, version 2, hence 11 | the version number 2.1.] 12 | 13 | Preamble 14 | 15 | The licenses for most software are designed to take away your 16 | freedom to share and change it. By contrast, the GNU General Public 17 | Licenses are intended to guarantee your freedom to share and change 18 | free software--to make sure the software is free for all its users. 19 | 20 | This license, the Lesser General Public License, applies to some 21 | specially designated software packages--typically libraries--of the 22 | Free Software Foundation and other authors who decide to use it. You 23 | can use it too, but we suggest you first think carefully about whether 24 | this license or the ordinary General Public License is the better 25 | strategy to use in any particular case, based on the explanations below. 26 | 27 | When we speak of free software, we are referring to freedom of use, 28 | not price. Our General Public Licenses are designed to make sure that 29 | you have the freedom to distribute copies of free software (and charge 30 | for this service if you wish); that you receive source code or can get 31 | it if you want it; that you can change the software and use pieces of 32 | it in new free programs; and that you are informed that you can do 33 | these things. 34 | 35 | To protect your rights, we need to make restrictions that forbid 36 | distributors to deny you these rights or to ask you to surrender these 37 | rights. These restrictions translate to certain responsibilities for 38 | you if you distribute copies of the library or if you modify it. 39 | 40 | For example, if you distribute copies of the library, whether gratis 41 | or for a fee, you must give the recipients all the rights that we gave 42 | you. You must make sure that they, too, receive or can get the source 43 | code. If you link other code with the library, you must provide 44 | complete object files to the recipients, so that they can relink them 45 | with the library after making changes to the library and recompiling 46 | it. And you must show them these terms so they know their rights. 47 | 48 | We protect your rights with a two-step method: (1) we copyright the 49 | library, and (2) we offer you this license, which gives you legal 50 | permission to copy, distribute and/or modify the library. 51 | 52 | To protect each distributor, we want to make it very clear that 53 | there is no warranty for the free library. Also, if the library is 54 | modified by someone else and passed on, the recipients should know 55 | that what they have is not the original version, so that the original 56 | author's reputation will not be affected by problems that might be 57 | introduced by others. 58 | 59 | Finally, software patents pose a constant threat to the existence of 60 | any free program. We wish to make sure that a company cannot 61 | effectively restrict the users of a free program by obtaining a 62 | restrictive license from a patent holder. Therefore, we insist that 63 | any patent license obtained for a version of the library must be 64 | consistent with the full freedom of use specified in this license. 65 | 66 | Most GNU software, including some libraries, is covered by the 67 | ordinary GNU General Public License. This license, the GNU Lesser 68 | General Public License, applies to certain designated libraries, and 69 | is quite different from the ordinary General Public License. We use 70 | this license for certain libraries in order to permit linking those 71 | libraries into non-free programs. 72 | 73 | When a program is linked with a library, whether statically or using 74 | a shared library, the combination of the two is legally speaking a 75 | combined work, a derivative of the original library. The ordinary 76 | General Public License therefore permits such linking only if the 77 | entire combination fits its criteria of freedom. The Lesser General 78 | Public License permits more lax criteria for linking other code with 79 | the library. 80 | 81 | We call this license the "Lesser" General Public License because it 82 | does Less to protect the user's freedom than the ordinary General 83 | Public License. It also provides other free software developers Less 84 | of an advantage over competing non-free programs. These disadvantages 85 | are the reason we use the ordinary General Public License for many 86 | libraries. However, the Lesser license provides advantages in certain 87 | special circumstances. 88 | 89 | For example, on rare occasions, there may be a special need to 90 | encourage the widest possible use of a certain library, so that it becomes 91 | a de-facto standard. To achieve this, non-free programs must be 92 | allowed to use the library. A more frequent case is that a free 93 | library does the same job as widely used non-free libraries. In this 94 | case, there is little to gain by limiting the free library to free 95 | software only, so we use the Lesser General Public License. 96 | 97 | In other cases, permission to use a particular library in non-free 98 | programs enables a greater number of people to use a large body of 99 | free software. For example, permission to use the GNU C Library in 100 | non-free programs enables many more people to use the whole GNU 101 | operating system, as well as its variant, the GNU/Linux operating 102 | system. 103 | 104 | Although the Lesser General Public License is Less protective of the 105 | users' freedom, it does ensure that the user of a program that is 106 | linked with the Library has the freedom and the wherewithal to run 107 | that program using a modified version of the Library. 108 | 109 | The precise terms and conditions for copying, distribution and 110 | modification follow. Pay close attention to the difference between a 111 | "work based on the library" and a "work that uses the library". The 112 | former contains code derived from the library, whereas the latter must 113 | be combined with the library in order to run. 114 | 115 | GNU LESSER GENERAL PUBLIC LICENSE 116 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 117 | 118 | 0. This License Agreement applies to any software library or other 119 | program which contains a notice placed by the copyright holder or 120 | other authorized party saying it may be distributed under the terms of 121 | this Lesser General Public License (also called "this License"). 122 | Each licensee is addressed as "you". 123 | 124 | A "library" means a collection of software functions and/or data 125 | prepared so as to be conveniently linked with application programs 126 | (which use some of those functions and data) to form executables. 127 | 128 | The "Library", below, refers to any such software library or work 129 | which has been distributed under these terms. A "work based on the 130 | Library" means either the Library or any derivative work under 131 | copyright law: that is to say, a work containing the Library or a 132 | portion of it, either verbatim or with modifications and/or translated 133 | straightforwardly into another language. (Hereinafter, translation is 134 | included without limitation in the term "modification".) 135 | 136 | "Source code" for a work means the preferred form of the work for 137 | making modifications to it. For a library, complete source code means 138 | all the source code for all modules it contains, plus any associated 139 | interface definition files, plus the scripts used to control compilation 140 | and installation of the library. 141 | 142 | Activities other than copying, distribution and modification are not 143 | covered by this License; they are outside its scope. The act of 144 | running a program using the Library is not restricted, and output from 145 | such a program is covered only if its contents constitute a work based 146 | on the Library (independent of the use of the Library in a tool for 147 | writing it). Whether that is true depends on what the Library does 148 | and what the program that uses the Library does. 149 | 150 | 1. You may copy and distribute verbatim copies of the Library's 151 | complete source code as you receive it, in any medium, provided that 152 | you conspicuously and appropriately publish on each copy an 153 | appropriate copyright notice and disclaimer of warranty; keep intact 154 | all the notices that refer to this License and to the absence of any 155 | warranty; and distribute a copy of this License along with the 156 | Library. 157 | 158 | You may charge a fee for the physical act of transferring a copy, 159 | and you may at your option offer warranty protection in exchange for a 160 | fee. 161 | 162 | 2. You may modify your copy or copies of the Library or any portion 163 | of it, thus forming a work based on the Library, and copy and 164 | distribute such modifications or work under the terms of Section 1 165 | above, provided that you also meet all of these conditions: 166 | 167 | a) The modified work must itself be a software library. 168 | 169 | b) You must cause the files modified to carry prominent notices 170 | stating that you changed the files and the date of any change. 171 | 172 | c) You must cause the whole of the work to be licensed at no 173 | charge to all third parties under the terms of this License. 174 | 175 | d) If a facility in the modified Library refers to a function or a 176 | table of data to be supplied by an application program that uses 177 | the facility, other than as an argument passed when the facility 178 | is invoked, then you must make a good faith effort to ensure that, 179 | in the event an application does not supply such function or 180 | table, the facility still operates, and performs whatever part of 181 | its purpose remains meaningful. 182 | 183 | (For example, a function in a library to compute square roots has 184 | a purpose that is entirely well-defined independent of the 185 | application. Therefore, Subsection 2d requires that any 186 | application-supplied function or table used by this function must 187 | be optional: if the application does not supply it, the square 188 | root function must still compute square roots.) 189 | 190 | These requirements apply to the modified work as a whole. If 191 | identifiable sections of that work are not derived from the Library, 192 | and can be reasonably considered independent and separate works in 193 | themselves, then this License, and its terms, do not apply to those 194 | sections when you distribute them as separate works. But when you 195 | distribute the same sections as part of a whole which is a work based 196 | on the Library, the distribution of the whole must be on the terms of 197 | this License, whose permissions for other licensees extend to the 198 | entire whole, and thus to each and every part regardless of who wrote 199 | it. 200 | 201 | Thus, it is not the intent of this section to claim rights or contest 202 | your rights to work written entirely by you; rather, the intent is to 203 | exercise the right to control the distribution of derivative or 204 | collective works based on the Library. 205 | 206 | In addition, mere aggregation of another work not based on the Library 207 | with the Library (or with a work based on the Library) on a volume of 208 | a storage or distribution medium does not bring the other work under 209 | the scope of this License. 210 | 211 | 3. You may opt to apply the terms of the ordinary GNU General Public 212 | License instead of this License to a given copy of the Library. To do 213 | this, you must alter all the notices that refer to this License, so 214 | that they refer to the ordinary GNU General Public License, version 2, 215 | instead of to this License. (If a newer version than version 2 of the 216 | ordinary GNU General Public License has appeared, then you can specify 217 | that version instead if you wish.) Do not make any other change in 218 | these notices. 219 | 220 | Once this change is made in a given copy, it is irreversible for 221 | that copy, so the ordinary GNU General Public License applies to all 222 | subsequent copies and derivative works made from that copy. 223 | 224 | This option is useful when you wish to copy part of the code of 225 | the Library into a program that is not a library. 226 | 227 | 4. You may copy and distribute the Library (or a portion or 228 | derivative of it, under Section 2) in object code or executable form 229 | under the terms of Sections 1 and 2 above provided that you accompany 230 | it with the complete corresponding machine-readable source code, which 231 | must be distributed under the terms of Sections 1 and 2 above on a 232 | medium customarily used for software interchange. 233 | 234 | If distribution of object code is made by offering access to copy 235 | from a designated place, then offering equivalent access to copy the 236 | source code from the same place satisfies the requirement to 237 | distribute the source code, even though third parties are not 238 | compelled to copy the source along with the object code. 239 | 240 | 5. A program that contains no derivative of any portion of the 241 | Library, but is designed to work with the Library by being compiled or 242 | linked with it, is called a "work that uses the Library". Such a 243 | work, in isolation, is not a derivative work of the Library, and 244 | therefore falls outside the scope of this License. 245 | 246 | However, linking a "work that uses the Library" with the Library 247 | creates an executable that is a derivative of the Library (because it 248 | contains portions of the Library), rather than a "work that uses the 249 | library". The executable is therefore covered by this License. 250 | Section 6 states terms for distribution of such executables. 251 | 252 | When a "work that uses the Library" uses material from a header file 253 | that is part of the Library, the object code for the work may be a 254 | derivative work of the Library even though the source code is not. 255 | Whether this is true is especially significant if the work can be 256 | linked without the Library, or if the work is itself a library. The 257 | threshold for this to be true is not precisely defined by law. 258 | 259 | If such an object file uses only numerical parameters, data 260 | structure layouts and accessors, and small macros and small inline 261 | functions (ten lines or less in length), then the use of the object 262 | file is unrestricted, regardless of whether it is legally a derivative 263 | work. (Executables containing this object code plus portions of the 264 | Library will still fall under Section 6.) 265 | 266 | Otherwise, if the work is a derivative of the Library, you may 267 | distribute the object code for the work under the terms of Section 6. 268 | Any executables containing that work also fall under Section 6, 269 | whether or not they are linked directly with the Library itself. 270 | 271 | 6. As an exception to the Sections above, you may also combine or 272 | link a "work that uses the Library" with the Library to produce a 273 | work containing portions of the Library, and distribute that work 274 | under terms of your choice, provided that the terms permit 275 | modification of the work for the customer's own use and reverse 276 | engineering for debugging such modifications. 277 | 278 | You must give prominent notice with each copy of the work that the 279 | Library is used in it and that the Library and its use are covered by 280 | this License. You must supply a copy of this License. If the work 281 | during execution displays copyright notices, you must include the 282 | copyright notice for the Library among them, as well as a reference 283 | directing the user to the copy of this License. Also, you must do one 284 | of these things: 285 | 286 | a) Accompany the work with the complete corresponding 287 | machine-readable source code for the Library including whatever 288 | changes were used in the work (which must be distributed under 289 | Sections 1 and 2 above); and, if the work is an executable linked 290 | with the Library, with the complete machine-readable "work that 291 | uses the Library", as object code and/or source code, so that the 292 | user can modify the Library and then relink to produce a modified 293 | executable containing the modified Library. (It is understood 294 | that the user who changes the contents of definitions files in the 295 | Library will not necessarily be able to recompile the application 296 | to use the modified definitions.) 297 | 298 | b) Use a suitable shared library mechanism for linking with the 299 | Library. A suitable mechanism is one that (1) uses at run time a 300 | copy of the library already present on the user's computer system, 301 | rather than copying library functions into the executable, and (2) 302 | will operate properly with a modified version of the library, if 303 | the user installs one, as long as the modified version is 304 | interface-compatible with the version that the work was made with. 305 | 306 | c) Accompany the work with a written offer, valid for at 307 | least three years, to give the same user the materials 308 | specified in Subsection 6a, above, for a charge no more 309 | than the cost of performing this distribution. 310 | 311 | d) If distribution of the work is made by offering access to copy 312 | from a designated place, offer equivalent access to copy the above 313 | specified materials from the same place. 314 | 315 | e) Verify that the user has already received a copy of these 316 | materials or that you have already sent this user a copy. 317 | 318 | For an executable, the required form of the "work that uses the 319 | Library" must include any data and utility programs needed for 320 | reproducing the executable from it. However, as a special exception, 321 | the materials to be distributed need not include anything that is 322 | normally distributed (in either source or binary form) with the major 323 | components (compiler, kernel, and so on) of the operating system on 324 | which the executable runs, unless that component itself accompanies 325 | the executable. 326 | 327 | It may happen that this requirement contradicts the license 328 | restrictions of other proprietary libraries that do not normally 329 | accompany the operating system. Such a contradiction means you cannot 330 | use both them and the Library together in an executable that you 331 | distribute. 332 | 333 | 7. You may place library facilities that are a work based on the 334 | Library side-by-side in a single library together with other library 335 | facilities not covered by this License, and distribute such a combined 336 | library, provided that the separate distribution of the work based on 337 | the Library and of the other library facilities is otherwise 338 | permitted, and provided that you do these two things: 339 | 340 | a) Accompany the combined library with a copy of the same work 341 | based on the Library, uncombined with any other library 342 | facilities. This must be distributed under the terms of the 343 | Sections above. 344 | 345 | b) Give prominent notice with the combined library of the fact 346 | that part of it is a work based on the Library, and explaining 347 | where to find the accompanying uncombined form of the same work. 348 | 349 | 8. You may not copy, modify, sublicense, link with, or distribute 350 | the Library except as expressly provided under this License. Any 351 | attempt otherwise to copy, modify, sublicense, link with, or 352 | distribute the Library is void, and will automatically terminate your 353 | rights under this License. However, parties who have received copies, 354 | or rights, from you under this License will not have their licenses 355 | terminated so long as such parties remain in full compliance. 356 | 357 | 9. You are not required to accept this License, since you have not 358 | signed it. However, nothing else grants you permission to modify or 359 | distribute the Library or its derivative works. These actions are 360 | prohibited by law if you do not accept this License. Therefore, by 361 | modifying or distributing the Library (or any work based on the 362 | Library), you indicate your acceptance of this License to do so, and 363 | all its terms and conditions for copying, distributing or modifying 364 | the Library or works based on it. 365 | 366 | 10. Each time you redistribute the Library (or any work based on the 367 | Library), the recipient automatically receives a license from the 368 | original licensor to copy, distribute, link with or modify the Library 369 | subject to these terms and conditions. You may not impose any further 370 | restrictions on the recipients' exercise of the rights granted herein. 371 | You are not responsible for enforcing compliance by third parties with 372 | this License. 373 | 374 | 11. If, as a consequence of a court judgment or allegation of patent 375 | infringement or for any other reason (not limited to patent issues), 376 | conditions are imposed on you (whether by court order, agreement or 377 | otherwise) that contradict the conditions of this License, they do not 378 | excuse you from the conditions of this License. If you cannot 379 | distribute so as to satisfy simultaneously your obligations under this 380 | License and any other pertinent obligations, then as a consequence you 381 | may not distribute the Library at all. For example, if a patent 382 | license would not permit royalty-free redistribution of the Library by 383 | all those who receive copies directly or indirectly through you, then 384 | the only way you could satisfy both it and this License would be to 385 | refrain entirely from distribution of the Library. 386 | 387 | If any portion of this section is held invalid or unenforceable under any 388 | particular circumstance, the balance of the section is intended to apply, 389 | and the section as a whole is intended to apply in other circumstances. 390 | 391 | It is not the purpose of this section to induce you to infringe any 392 | patents or other property right claims or to contest validity of any 393 | such claims; this section has the sole purpose of protecting the 394 | integrity of the free software distribution system which is 395 | implemented by public license practices. Many people have made 396 | generous contributions to the wide range of software distributed 397 | through that system in reliance on consistent application of that 398 | system; it is up to the author/donor to decide if he or she is willing 399 | to distribute software through any other system and a licensee cannot 400 | impose that choice. 401 | 402 | This section is intended to make thoroughly clear what is believed to 403 | be a consequence of the rest of this License. 404 | 405 | 12. If the distribution and/or use of the Library is restricted in 406 | certain countries either by patents or by copyrighted interfaces, the 407 | original copyright holder who places the Library under this License may add 408 | an explicit geographical distribution limitation excluding those countries, 409 | so that distribution is permitted only in or among countries not thus 410 | excluded. In such case, this License incorporates the limitation as if 411 | written in the body of this License. 412 | 413 | 13. The Free Software Foundation may publish revised and/or new 414 | versions of the Lesser General Public License from time to time. 415 | Such new versions will be similar in spirit to the present version, 416 | but may differ in detail to address new problems or concerns. 417 | 418 | Each version is given a distinguishing version number. If the Library 419 | specifies a version number of this License which applies to it and 420 | "any later version", you have the option of following the terms and 421 | conditions either of that version or of any later version published by 422 | the Free Software Foundation. If the Library does not specify a 423 | license version number, you may choose any version ever published by 424 | the Free Software Foundation. 425 | 426 | 14. If you wish to incorporate parts of the Library into other free 427 | programs whose distribution conditions are incompatible with these, 428 | write to the author to ask for permission. For software which is 429 | copyrighted by the Free Software Foundation, write to the Free 430 | Software Foundation; we sometimes make exceptions for this. Our 431 | decision will be guided by the two goals of preserving the free status 432 | of all derivatives of our free software and of promoting the sharing 433 | and reuse of software generally. 434 | 435 | NO WARRANTY 436 | 437 | 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO 438 | WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. 439 | EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR 440 | OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY 441 | KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE 442 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 443 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 444 | LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME 445 | THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 446 | 447 | 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN 448 | WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY 449 | AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU 450 | FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR 451 | CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE 452 | LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING 453 | RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A 454 | FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF 455 | SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 456 | DAMAGES. 457 | 458 | END OF TERMS AND CONDITIONS 459 | 460 | How to Apply These Terms to Your New Libraries 461 | 462 | If you develop a new library, and you want it to be of the greatest 463 | possible use to the public, we recommend making it free software that 464 | everyone can redistribute and change. You can do so by permitting 465 | redistribution under these terms (or, alternatively, under the terms of the 466 | ordinary General Public License). 467 | 468 | To apply these terms, attach the following notices to the library. It is 469 | safest to attach them to the start of each source file to most effectively 470 | convey the exclusion of warranty; and each file should have at least the 471 | "copyright" line and a pointer to where the full notice is found. 472 | 473 | 474 | Copyright (C) 475 | 476 | This library is free software; you can redistribute it and/or 477 | modify it under the terms of the GNU Lesser General Public 478 | License as published by the Free Software Foundation; either 479 | version 2.1 of the License, or (at your option) any later version. 480 | 481 | This library is distributed in the hope that it will be useful, 482 | but WITHOUT ANY WARRANTY; without even the implied warranty of 483 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 484 | Lesser General Public License for more details. 485 | 486 | You should have received a copy of the GNU Lesser General Public 487 | License along with this library; if not, write to the Free Software 488 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 489 | 490 | Also add information on how to contact you by electronic and paper mail. 491 | 492 | You should also get your employer (if you work as a programmer) or your 493 | school, if any, to sign a "copyright disclaimer" for the library, if 494 | necessary. Here is a sample; alter the names: 495 | 496 | Yoyodyne, Inc., hereby disclaims all copyright interest in the 497 | library `Frob' (a library for tweaking knobs) written by James Random Hacker. 498 | 499 | , 1 April 1990 500 | Ty Coon, President of Vice 501 | 502 | That's all there is to it! 503 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # electron-chromium-codecs 2 | This repository contains the necessary git patches to build a custom electron dist with bundled HEVC, AC3 and E-AC3 codecs support for chromium. 3 | #### TODO: More codecs such as MPEG-2 and DTS. 4 | ## Compiling Electron 5 | Follow the electron [build instructions](https://www.electronjs.org/docs/latest/development/build-instructions-gn). 6 | ### Linux 7 | On Ubuntu >= 20.04, install the following libraries: 8 | 9 | ```bash 10 | $ sudo apt-get install build-essential clang libdbus-1-dev libgtk-3-dev \ 11 | libnotify-dev libasound2-dev libcap-dev \ 12 | libcups2-dev libxtst-dev \ 13 | libxss1 libnss3-dev gcc-multilib g++-multilib curl \ 14 | gperf bison python3-dbusmock openjdk-8-jre \ 15 | git npm 16 | ``` 17 | 18 | Update node and npm to the latest version using your preferred method. 19 | 20 | Clone [depot_tools](https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) and add it to PATH. 21 | 22 | ```bash 23 | $ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git 24 | $ export PATH=/path/to/depot_tools:$PATH 25 | ``` 26 | Get Electron 27 | 28 | ```bash 29 | $ mkdir electron && cd electron 30 | $ gclient config --name "src/electron" --unmanaged https://github.com/electron/electron 31 | $ gclient sync --with_branch_heads --with_tags 32 | # This will take a while, go get a coffee. 33 | ``` 34 | 35 | Setup electron environment for pulling later 36 | 37 | ```bash 38 | $ cd src/electron 39 | $ git remote remove origin 40 | $ git remote add origin https://github.com/electron/electron 41 | $ git checkout main 42 | $ git branch --set-upstream-to=origin/main 43 | $ cd - 44 | ``` 45 | 46 | Choosing a stable electron version to build 47 | (Make sure you have the same node version as stated in your versions [DEPS file](https://github.com/electron/electron/blob/main/DEPS)) 48 | ```bash 49 | $ cd src/electron 50 | $ git checkout v20.1.1 51 | # You might want to force the checkout with git checkout -f 52 | # Change the node version now to the same node version as the electron tag you want to use 53 | $ gclient sync -f 54 | ``` 55 | 56 | Move patches to respective directories 57 | ```bash 58 | $ mv look_chromium_hevc_ac3.patch src/ 59 | $ mv look_electron_hevc_ac3.patch src/electron/ 60 | $ mv look_ffmpeg_hevc_ac3.patch src/third_party/ffmpeg/ 61 | ``` 62 | 63 | Apply the patches 64 | 65 | ```bash 66 | $ cd src/ && git apply look_chromium_hevc_ac3.patch 67 | $ cd src/electron/ && git apply look_electron_hevc_ac3.patch 68 | $ cd src/third_party/ffmpeg/ && git apply look_ffmpeg_hevc_ac3.patch 69 | ``` 70 | 71 | Build Electron (step 5) 72 | 73 | ```bash 74 | $ cd src 75 | $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools 76 | $ gn gen out/Release --args="import(\"//electron/build/args/release.gn\")" 77 | $ ninja -C out/Release electron 78 | ``` 79 | 80 | Strip the binaries and pack the distribution (step 6) 81 | 82 | ```bash 83 | $ electron/script/strip-binaries.py -d out/Release 84 | $ ninja -C out/Release electron:electron_dist_zip 85 | ``` 86 | Result dist will be inside src/out/Release/dist.zip 87 | 88 | ## Updating electron and rebuilding 89 | 90 | Updating electron repository (changing electron version) 91 | ```bash 92 | $ cd src/electron 93 | $ git fetch 94 | $ git checkout v20.1.1 95 | # Change the node version now to the same node version as the electron tag you want to use 96 | $ gclient sync -f 97 | ``` 98 | 99 | ## Removing all changes (everything! including HEAD added files and directories!!!!) 100 | To be honest you might as well clone everything again. 101 | ```bash 102 | $ cd src/ && git reset --hard HEAD && git clean -df 103 | $ cd src/electron/ && git reset --hard HEAD && git clean -df 104 | $ cd src/third_party/ffmpeg/ && git reset --hard HEAD && git clean -df 105 | ``` 106 | 107 | ## Windows fix for EOF 108 | ```bash 109 | cd src 110 | dos2unix electron/shell/common/extensions/api/resources_private.idl 111 | dos2unix electron/shell/common/extensions/api/cryptotoken_private.idl 112 | dos2unix chrome/common/extensions/api/resources_private.idl 113 | dos2unix chrome/common/extensions/api/cryptotoken_private.idl 114 | ``` 115 | 116 | ## Credits 117 | 118 | Thanks [ThaUnknown](https://github.com/ThaUnknown) for providing help with debugging and the final steps on ffmpeg chromium scripts in order make chromium point the correct codecs to ffmpeg demuxer for the AC3 audio. 119 | 120 | Thanks [Kirdow](https://github.com/Kirdow) for compiling and testing on Windows, as well as for the fix regarding EOF files on Windows that prevented people from linking. 121 | 122 | Thanks [henrypp](https://github.com/henrypp/chromium) for the initial patches on HEVC. 123 | 124 | Thanks [AAAhs](https://github.com/AAAhs/electron-hevc/commit/0f6eaeb7ded395d356aa3cd46bbe74ae315dd4be) for more up to date HEVC patches. 125 | 126 | https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/pull/33/commits/7ac9e95594765c60b207490d3c4512432e081d21 127 | -------------------------------------------------------------------------------- /v18.2.1/look_chromium_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/electron b/electron 2 | new file mode 160000 3 | index 0000000000000..3bc25c997d8b8 4 | --- /dev/null 5 | +++ b/electron 6 | @@ -0,0 +1 @@ 7 | +Subproject commit 3bc25c997d8b80f6f7f8e95e8d1e1f2d6bbfe543 8 | diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc 9 | index e45abab5c2d58..5f3c7c6c22045 100644 10 | --- a/media/base/supported_types.cc 11 | +++ b/media/base/supported_types.cc 12 | @@ -137,7 +137,6 @@ bool IsVideoCodecProprietary(VideoCodec codec) { 13 | case VideoCodec::kH264: 14 | case VideoCodec::kMPEG2: 15 | case VideoCodec::kMPEG4: 16 | - case VideoCodec::kHEVC: 17 | case VideoCodec::kDolbyVision: 18 | return true; 19 | case VideoCodec::kUnknown: 20 | @@ -145,6 +144,7 @@ bool IsVideoCodecProprietary(VideoCodec codec) { 21 | case VideoCodec::kVP8: 22 | case VideoCodec::kVP9: 23 | case VideoCodec::kAV1: 24 | + case VideoCodec::kHEVC: 25 | return false; 26 | } 27 | } 28 | @@ -152,8 +152,6 @@ bool IsVideoCodecProprietary(VideoCodec codec) { 29 | bool IsAudioCodecProprietary(AudioCodec codec) { 30 | switch (codec) { 31 | case AudioCodec::kAAC: 32 | - case AudioCodec::kAC3: 33 | - case AudioCodec::kEAC3: 34 | case AudioCodec::kAMR_NB: 35 | case AudioCodec::kAMR_WB: 36 | case AudioCodec::kGSM_MS: 37 | @@ -165,6 +163,8 @@ bool IsAudioCodecProprietary(AudioCodec codec) { 38 | 39 | case AudioCodec::kFLAC: 40 | case AudioCodec::kMP3: 41 | + case AudioCodec::kAC3: 42 | + case AudioCodec::kEAC3: 43 | case AudioCodec::kOpus: 44 | case AudioCodec::kVorbis: 45 | case AudioCodec::kPCM: 46 | @@ -178,33 +178,6 @@ bool IsAudioCodecProprietary(AudioCodec codec) { 47 | } 48 | #endif // !BUILDFLAG(USE_PROPRIETARY_CODECS) 49 | 50 | -bool IsHevcProfileSupported(const VideoType& type) { 51 | -#if BUILDFLAG(ENABLE_PLATFORM_ENCRYPTED_HEVC) 52 | - // Only encrypted HEVC content is supported, and normally MSE.isTypeSupported 53 | - // returns false for HEVC. The kEnableClearHevcForTesting flag allows it to 54 | - // return true to enable a wider array of test scenarios to function properly. 55 | - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 56 | - switches::kEnableClearHevcForTesting)) { 57 | - return false; 58 | - } 59 | - 60 | - // Color management required for HDR to not look terrible. 61 | - if (!IsColorSpaceSupported(type.color_space)) 62 | - return false; 63 | - 64 | - switch (type.profile) { 65 | - case HEVCPROFILE_MAIN: 66 | - case HEVCPROFILE_MAIN10: 67 | - return true; 68 | - case HEVCPROFILE_MAIN_STILL_PICTURE: 69 | - return false; 70 | - default: 71 | - NOTREACHED(); 72 | - } 73 | -#endif // BUILDFLAG(ENABLE_PLATFORM_ENCRYPTED_HEVC) 74 | - return false; 75 | -} 76 | - 77 | bool IsVp9ProfileSupported(const VideoType& type) { 78 | #if BUILDFLAG(ENABLE_LIBVPX) 79 | // High bit depth capabilities may be toggled via LibVPX config flags. 80 | @@ -308,13 +281,12 @@ bool IsDefaultSupportedVideoType(const VideoType& type) { 81 | case VideoCodec::kH264: 82 | case VideoCodec::kVP8: 83 | case VideoCodec::kTheora: 84 | + case VideoCodec::kHEVC: 85 | return true; 86 | case VideoCodec::kAV1: 87 | return IsAV1Supported(type); 88 | case VideoCodec::kVP9: 89 | return IsVp9ProfileSupported(type); 90 | - case VideoCodec::kHEVC: 91 | - return IsHevcProfileSupported(type); 92 | case VideoCodec::kMPEG4: 93 | return IsMPEG4Supported(); 94 | case VideoCodec::kUnknown: 95 | @@ -350,10 +322,10 @@ bool IsDefaultSupportedAudioType(const AudioType& type) { 96 | case AudioCodec::kPCM_S24BE: 97 | case AudioCodec::kPCM_ALAW: 98 | case AudioCodec::kVorbis: 99 | - return true; 100 | + case AudioCodec::kAC3: 101 | case AudioCodec::kEAC3: 102 | + return true; 103 | case AudioCodec::kALAC: 104 | - case AudioCodec::kAC3: 105 | case AudioCodec::kMpegHAudio: 106 | case AudioCodec::kDTS: 107 | case AudioCodec::kDTSXP2: 108 | diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc 109 | index be3707a880047..867086572d92a 100644 110 | --- a/media/ffmpeg/ffmpeg_common.cc 111 | +++ b/media/ffmpeg/ffmpeg_common.cc 112 | @@ -136,6 +136,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec audio_codec, 113 | switch (audio_codec) { 114 | case AudioCodec::kAAC: 115 | return AV_CODEC_ID_AAC; 116 | + case AudioCodec::kAC3: 117 | + return AV_CODEC_ID_AC3; 118 | + case AudioCodec::kEAC3: 119 | + return AV_CODEC_ID_EAC3; 120 | case AudioCodec::kALAC: 121 | return AV_CODEC_ID_ALAC; 122 | case AudioCodec::kMP3: 123 | diff --git a/media/media_options.gni b/media/media_options.gni 124 | index 18669bec32172..62ceb006c0442 100644 125 | --- a/media/media_options.gni 126 | +++ b/media/media_options.gni 127 | @@ -46,16 +46,15 @@ declare_args() { 128 | # Enables AC3/EAC3 audio demuxing. This is enabled only on Chromecast, since 129 | # it only provides demuxing, and is only useful for AC3/EAC3 audio 130 | # pass-through to HDMI sink on Chromecast. 131 | - enable_platform_ac3_eac3_audio = proprietary_codecs && is_chromecast 132 | + enable_platform_ac3_eac3_audio = true 133 | 134 | - enable_platform_mpeg_h_audio = proprietary_codecs && is_chromecast 135 | + enable_platform_mpeg_h_audio = true 136 | 137 | # Enables DTS/DTSX audio handling in chromium. This includes demuxing, 138 | # on-device decoding and bitstream passthrough as supported by device. 139 | enable_platform_dts_audio = false 140 | 141 | - enable_mse_mpeg2ts_stream_parser = 142 | - proprietary_codecs && (is_chromecast || is_fuchsia || use_fuzzing_engine) 143 | + enable_mse_mpeg2ts_stream_parser = true 144 | 145 | enable_platform_encrypted_hevc = 146 | proprietary_codecs && 147 | @@ -90,9 +89,7 @@ declare_args() { 148 | # Enable HEVC/H265 demuxing. Actual decoding must be provided by the 149 | # platform. Enabled by default for Chromecast, fuzzer builds and protected 150 | # video on ChromeOS and Windows. 151 | - enable_platform_hevc = 152 | - proprietary_codecs && 153 | - (is_chromecast || use_fuzzing_engine || enable_platform_encrypted_hevc) 154 | + enable_platform_hevc = true 155 | 156 | # Enable HEVC/H265 decoding with hardware acceleration assist. Enabled by 157 | # default for fuzzer builds and protected video on ChromeOS. It is also 158 | diff --git a/third_party/electron_node b/third_party/electron_node 159 | new file mode 160000 160 | index 0000000000000..2d3de24004cd6 161 | --- /dev/null 162 | +++ b/third_party/electron_node 163 | @@ -0,0 +1 @@ 164 | +Subproject commit 2d3de24004cd6831ac22f573f5cb6b417317562e 165 | diff --git a/third_party/nan b/third_party/nan 166 | new file mode 160000 167 | index 0000000000000..bb8bf24d8c7ab 168 | --- /dev/null 169 | +++ b/third_party/nan 170 | @@ -0,0 +1 @@ 171 | +Subproject commit bb8bf24d8c7ab3da122b762fce1856a00906488d 172 | diff --git a/third_party/squirrel.mac b/third_party/squirrel.mac 173 | new file mode 160000 174 | index 0000000000000..b5c37f19a11ff 175 | --- /dev/null 176 | +++ b/third_party/squirrel.mac 177 | @@ -0,0 +1 @@ 178 | +Subproject commit b5c37f19a11ff7c174ff699f6097a4dc35dcae5f 179 | -------------------------------------------------------------------------------- /v18.2.1/look_electron_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/build/args/release.gn b/build/args/release.gn 2 | index e5017f6e1..0b81bd95c 100644 3 | --- a/build/args/release.gn 4 | +++ b/build/args/release.gn 5 | @@ -2,6 +2,8 @@ import("all.gn") 6 | is_component_build = false 7 | is_official_build = true 8 | 9 | +proprietary_codecs=true 10 | + 11 | # This may be guarded behind is_chrome_branded alongside 12 | # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321, 13 | # explicitly override here to build OpenH264 encoder/FFmpeg decoder. 14 | -------------------------------------------------------------------------------- /v20.0.0/look_chromium_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/electron b/electron 2 | new file mode 160000 3 | index 0000000000000..ce562b6889004 4 | --- /dev/null 5 | +++ b/electron 6 | @@ -0,0 +1 @@ 7 | +Subproject commit ce562b68890043ae3404be27b088b20a91420c0e 8 | diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc 9 | index 41a4609a2a7a3..0bff985da2ad7 100644 10 | --- a/media/base/supported_types.cc 11 | +++ b/media/base/supported_types.cc 12 | @@ -201,30 +201,6 @@ bool IsAudioCodecProprietary(AudioCodec codec) { 13 | } 14 | #endif // !BUILDFLAG(USE_PROPRIETARY_CODECS) 15 | 16 | -bool IsHevcProfileSupported(const VideoType& type) { 17 | - if (!IsColorSpaceSupported(type.color_space)) 18 | - return false; 19 | - 20 | -#if BUILDFLAG(ENABLE_PLATFORM_HEVC) 21 | -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) 22 | - return GetSupplementalProfileCache()->IsProfileSupported(type.profile); 23 | -#else 24 | - return true; 25 | -#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) 26 | -#elif BUILDFLAG(ENABLE_PLATFORM_ENCRYPTED_HEVC) 27 | - // Only encrypted HEVC content is supported, and normally MSE.isTypeSupported 28 | - // returns false for HEVC. The kEnableClearHevcForTesting flag allows it to 29 | - // return true to enable a wider array of test scenarios to function properly. 30 | - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 31 | - switches::kEnableClearHevcForTesting)) { 32 | - return false; 33 | - } 34 | - return type.profile == HEVCPROFILE_MAIN || type.profile == HEVCPROFILE_MAIN10; 35 | -#else 36 | - return false; 37 | -#endif 38 | -} 39 | - 40 | bool IsVp9ProfileSupported(const VideoType& type) { 41 | #if BUILDFLAG(ENABLE_LIBVPX) 42 | // High bit depth capabilities may be toggled via LibVPX config flags. 43 | @@ -332,18 +308,17 @@ bool IsDefaultSupportedVideoType(const VideoType& type) { 44 | case VideoCodec::kH264: 45 | case VideoCodec::kVP8: 46 | case VideoCodec::kTheora: 47 | + case VideoCodec::kHEVC: 48 | + case VideoCodec::kMPEG2: 49 | return true; 50 | case VideoCodec::kAV1: 51 | return IsAV1Supported(type); 52 | case VideoCodec::kVP9: 53 | return IsVp9ProfileSupported(type); 54 | - case VideoCodec::kHEVC: 55 | - return IsHevcProfileSupported(type); 56 | case VideoCodec::kMPEG4: 57 | return IsMPEG4Supported(); 58 | case VideoCodec::kUnknown: 59 | case VideoCodec::kVC1: 60 | - case VideoCodec::kMPEG2: 61 | case VideoCodec::kDolbyVision: 62 | return false; 63 | } 64 | @@ -374,10 +349,10 @@ bool IsDefaultSupportedAudioType(const AudioType& type) { 65 | case AudioCodec::kPCM_S24BE: 66 | case AudioCodec::kPCM_ALAW: 67 | case AudioCodec::kVorbis: 68 | - return true; 69 | + case AudioCodec::kAC3: 70 | case AudioCodec::kEAC3: 71 | + return true; 72 | case AudioCodec::kALAC: 73 | - case AudioCodec::kAC3: 74 | case AudioCodec::kMpegHAudio: 75 | case AudioCodec::kUnknown: 76 | return false; 77 | diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc 78 | index 76f03d6608e57..75ab3118ffd47 100644 79 | --- a/media/ffmpeg/ffmpeg_common.cc 80 | +++ b/media/ffmpeg/ffmpeg_common.cc 81 | @@ -139,6 +139,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec audio_codec, 82 | switch (audio_codec) { 83 | case AudioCodec::kAAC: 84 | return AV_CODEC_ID_AAC; 85 | + case AudioCodec::kAC3: 86 | + return AV_CODEC_ID_AC3; 87 | + case AudioCodec::kEAC3: 88 | + return AV_CODEC_ID_EAC3; 89 | case AudioCodec::kALAC: 90 | return AV_CODEC_ID_ALAC; 91 | case AudioCodec::kMP3: 92 | diff --git a/media/media_options.gni b/media/media_options.gni 93 | index 5667cac61f3dd..7000f23a3781e 100644 94 | --- a/media/media_options.gni 95 | +++ b/media/media_options.gni 96 | @@ -46,16 +46,15 @@ declare_args() { 97 | # Enables AC3/EAC3 audio demuxing. This is enabled only on Chromecast, since 98 | # it only provides demuxing, and is only useful for AC3/EAC3 audio 99 | # pass-through to HDMI sink on Chromecast. 100 | - enable_platform_ac3_eac3_audio = proprietary_codecs && is_chromecast 101 | + enable_platform_ac3_eac3_audio = true 102 | 103 | - enable_platform_mpeg_h_audio = proprietary_codecs && is_chromecast 104 | + enable_platform_mpeg_h_audio = true 105 | 106 | # Enables DTS/DTSX audio handling in chromium. This includes demuxing, 107 | # on-device decoding and bitstream passthrough as supported by device. 108 | enable_platform_dts_audio = false 109 | 110 | - enable_mse_mpeg2ts_stream_parser = 111 | - proprietary_codecs && (is_chromecast || is_fuchsia || use_fuzzing_engine) 112 | + enable_mse_mpeg2ts_stream_parser = true 113 | 114 | enable_platform_encrypted_hevc = 115 | proprietary_codecs && 116 | @@ -90,9 +89,7 @@ declare_args() { 117 | # Enable HEVC/H265 demuxing. Actual decoding must be provided by the 118 | # platform. Enabled by default for Chromecast, fuzzer builds and protected 119 | # video on ChromeOS and Windows. 120 | - enable_platform_hevc = 121 | - proprietary_codecs && 122 | - (is_chromecast || use_fuzzing_engine || enable_platform_encrypted_hevc) 123 | + enable_platform_hevc = true 124 | 125 | # Enable HEVC/H265 decoding with hardware acceleration assist. Enabled by 126 | # default for fuzzer builds and protected video on ChromeOS. It is also 127 | diff --git a/third_party/electron_node b/third_party/electron_node 128 | new file mode 160000 129 | index 0000000000000..8c7695b8b6d50 130 | --- /dev/null 131 | +++ b/third_party/electron_node 132 | @@ -0,0 +1 @@ 133 | +Subproject commit 8c7695b8b6d508aef67d5f2d4c6b9f42ff0fb976 134 | diff --git a/third_party/nan b/third_party/nan 135 | new file mode 160000 136 | index 0000000000000..d9609bb2f14e3 137 | --- /dev/null 138 | +++ b/third_party/nan 139 | @@ -0,0 +1 @@ 140 | +Subproject commit d9609bb2f14e33a4d1d2f5ee1834eb4300eaf595 141 | diff --git a/third_party/squirrel.mac b/third_party/squirrel.mac 142 | new file mode 160000 143 | index 0000000000000..9b8ad9deb8308 144 | --- /dev/null 145 | +++ b/third_party/squirrel.mac 146 | @@ -0,0 +1 @@ 147 | +Subproject commit 9b8ad9deb830870a0da8d2bbf56cac6ea33eb9a4 148 | -------------------------------------------------------------------------------- /v20.0.0/look_electron_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/build/args/release.gn b/build/args/release.gn 2 | index e5017f6e1..ebfa714ed 100644 3 | --- a/build/args/release.gn 4 | +++ b/build/args/release.gn 5 | @@ -2,6 +2,10 @@ import("all.gn") 6 | is_component_build = false 7 | is_official_build = true 8 | 9 | +proprietary_codecs=true 10 | + 11 | +enable_mse_mpeg2ts_stream_parser=true 12 | + 13 | # This may be guarded behind is_chrome_branded alongside 14 | # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321, 15 | # explicitly override here to build OpenH264 encoder/FFmpeg decoder. 16 | @@ -14,3 +18,5 @@ rtc_use_h264 = proprietary_codecs 17 | # who have an LGPL requirement to ship ffmpeg as a dynamically linked library, 18 | # we build ffmpeg as a shared library. 19 | is_component_ffmpeg = true 20 | + 21 | + 22 | -------------------------------------------------------------------------------- /v20.1.1/look_chromium_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc 2 | index c2efcdbb74381..508c5d972e2e4 100644 3 | --- a/media/base/supported_types.cc 4 | +++ b/media/base/supported_types.cc 5 | @@ -200,44 +200,6 @@ bool IsAudioCodecProprietary(AudioCodec codec) { 6 | } 7 | #endif // !BUILDFLAG(USE_PROPRIETARY_CODECS) 8 | 9 | -bool IsHevcProfileSupported(const VideoType& type) { 10 | - if (!IsColorSpaceSupported(type.color_space)) 11 | - return false; 12 | - 13 | -#if BUILDFLAG(ENABLE_PLATFORM_HEVC) 14 | -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) 15 | -#if BUILDFLAG(IS_CHROMEOS_LACROS) 16 | - // TODO(b/171813538): For Lacros, the supplemental profile cache will be 17 | - // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the 18 | - // codec detection is plumbed through to ash-gpu we can do this extra check 19 | - // for HEVC support. 20 | - if (base::CommandLine::ForCurrentProcess()->HasSwitch( 21 | - switches::kLacrosEnablePlatformHevc)) { 22 | - return true; 23 | - } 24 | -#endif // BUILDFLAG(IS_CHROMEOS_LACROS) 25 | - return GetSupplementalProfileCache()->IsProfileSupported(type.profile); 26 | -#elif BUILDFLAG(IS_MAC) 27 | - if (__builtin_available(macOS 11.0, *)) 28 | - return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport) && 29 | - (type.profile == HEVCPROFILE_MAIN || 30 | - type.profile == HEVCPROFILE_MAIN10 || 31 | - type.profile == HEVCPROFILE_MAIN_STILL_PICTURE || 32 | - type.profile == HEVCPROFILE_REXT); 33 | - return false; 34 | -#elif BUILDFLAG(IS_ANDROID) 35 | - // Technically android 5.0 mandates support for only HEVC main profile, 36 | - // however some platforms (like chromecast) have had more profiles supported 37 | - // so we'll see what happens if we just enable them all. 38 | - return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport); 39 | -#else 40 | - return true; 41 | -#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) 42 | -#else 43 | - return false; 44 | -#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC) 45 | -} 46 | - 47 | bool IsVp9ProfileSupported(const VideoType& type) { 48 | #if BUILDFLAG(ENABLE_LIBVPX) 49 | // High bit depth capabilities may be toggled via LibVPX config flags. 50 | @@ -345,18 +307,17 @@ bool IsDefaultSupportedVideoType(const VideoType& type) { 51 | case VideoCodec::kH264: 52 | case VideoCodec::kVP8: 53 | case VideoCodec::kTheora: 54 | + case VideoCodec::kHEVC: 55 | + case VideoCodec::kMPEG2: 56 | return true; 57 | case VideoCodec::kAV1: 58 | return IsAV1Supported(type); 59 | case VideoCodec::kVP9: 60 | return IsVp9ProfileSupported(type); 61 | - case VideoCodec::kHEVC: 62 | - return IsHevcProfileSupported(type); 63 | case VideoCodec::kMPEG4: 64 | return IsMPEG4Supported(); 65 | case VideoCodec::kUnknown: 66 | case VideoCodec::kVC1: 67 | - case VideoCodec::kMPEG2: 68 | case VideoCodec::kDolbyVision: 69 | return false; 70 | } 71 | @@ -387,10 +348,10 @@ bool IsDefaultSupportedAudioType(const AudioType& type) { 72 | case AudioCodec::kPCM_S24BE: 73 | case AudioCodec::kPCM_ALAW: 74 | case AudioCodec::kVorbis: 75 | + case AudioCodec::kAC3: 76 | + case AudioCodec::kEAC3: 77 | return true; 78 | - case AudioCodec::kEAC3: 79 | case AudioCodec::kALAC: 80 | - case AudioCodec::kAC3: 81 | case AudioCodec::kMpegHAudio: 82 | case AudioCodec::kUnknown: 83 | return false; 84 | diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc 85 | index 9500983595f4d..279298069948b 100644 86 | --- a/media/ffmpeg/ffmpeg_common.cc 87 | +++ b/media/ffmpeg/ffmpeg_common.cc 88 | @@ -139,6 +139,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec audio_codec, 89 | switch (audio_codec) { 90 | case AudioCodec::kAAC: 91 | return AV_CODEC_ID_AAC; 92 | + case AudioCodec::kAC3: 93 | + return AV_CODEC_ID_AC3; 94 | + case AudioCodec::kEAC3: 95 | + return AV_CODEC_ID_EAC3; 96 | case AudioCodec::kALAC: 97 | return AV_CODEC_ID_ALAC; 98 | case AudioCodec::kMP3: 99 | diff --git a/media/media_options.gni b/media/media_options.gni 100 | index b3727203d40b9..ff6f6667f04e0 100644 101 | --- a/media/media_options.gni 102 | +++ b/media/media_options.gni 103 | @@ -46,16 +46,15 @@ declare_args() { 104 | # Enables AC3/EAC3 audio demuxing. This is enabled only on Chromecast, since 105 | # it only provides demuxing, and is only useful for AC3/EAC3 audio 106 | # pass-through to HDMI sink on Chromecast. 107 | - enable_platform_ac3_eac3_audio = proprietary_codecs && is_chromecast 108 | + enable_platform_ac3_eac3_audio = true 109 | 110 | - enable_platform_mpeg_h_audio = proprietary_codecs && is_chromecast 111 | + enable_platform_mpeg_h_audio = true 112 | 113 | # Enables DTS/DTSX audio handling in chromium. This includes demuxing, 114 | # on-device decoding and bitstream passthrough as supported by device. 115 | enable_platform_dts_audio = false 116 | 117 | - enable_mse_mpeg2ts_stream_parser = 118 | - proprietary_codecs && (is_chromecast || is_fuchsia || use_fuzzing_engine) 119 | + enable_mse_mpeg2ts_stream_parser = true 120 | 121 | # Enable Dolby Vision demuxing. Enable by default for Chromecast. Actual 122 | # decoding must be provided by the platform. Note some Dolby Vision profiles 123 | @@ -96,8 +95,7 @@ declare_args() { 124 | # Enable HEVC/H265 demuxing. Actual decoding must be provided by the 125 | # platform. 126 | # TODO(b/194429120): Enable this for Lacros builds. 127 | - enable_platform_hevc = 128 | - proprietary_codecs && (is_chromecast || enable_hevc_parser_and_hw_decoder) 129 | + enable_platform_hevc = true 130 | } 131 | 132 | assert( 133 | -------------------------------------------------------------------------------- /v20.1.1/look_electron_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/build/args/release.gn b/build/args/release.gn 2 | index e5017f6e16..09ec87fafd 100644 3 | --- a/build/args/release.gn 4 | +++ b/build/args/release.gn 5 | @@ -2,6 +2,18 @@ import("all.gn") 6 | is_component_build = false 7 | is_official_build = true 8 | 9 | +proprietary_codecs = true 10 | + 11 | +enable_platform_hevc = true 12 | + 13 | +enable_platform_dts_audio = true 14 | + 15 | +enable_hevc_parser_and_hw_decoder = true 16 | + 17 | +enable_mse_mpeg2ts_stream_parser = true 18 | + 19 | +enable_platform_mpeg_h_audio = true 20 | + 21 | # This may be guarded behind is_chrome_branded alongside 22 | # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321, 23 | # explicitly override here to build OpenH264 encoder/FFmpeg decoder. 24 | -------------------------------------------------------------------------------- /v20.1.1/look_ffmpeg_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/chromium/config/Chrome/linux/x64/config.asm b/chromium/config/Chrome/linux/x64/config.asm 2 | index b666ce1d64..a47ac4e34c 100644 3 | --- a/chromium/config/Chrome/linux/x64/config.asm 4 | +++ b/chromium/config/Chrome/linux/x64/config.asm 5 | @@ -625,25 +625,25 @@ 6 | %define CONFIG_MUXERS 0 7 | %define CONFIG_PROTOCOLS 0 8 | %define CONFIG_AANDCTTABLES 0 9 | -%define CONFIG_AC3DSP 0 10 | +%define CONFIG_AC3DSP 1 11 | %define CONFIG_ADTS_HEADER 1 12 | %define CONFIG_ATSC_A53 1 13 | %define CONFIG_AUDIO_FRAME_QUEUE 0 14 | %define CONFIG_AUDIODSP 0 15 | %define CONFIG_BLOCKDSP 0 16 | -%define CONFIG_BSWAPDSP 0 17 | +%define CONFIG_BSWAPDSP 1 18 | %define CONFIG_CABAC 1 19 | %define CONFIG_CBS 0 20 | %define CONFIG_CBS_AV1 0 21 | %define CONFIG_CBS_H264 0 22 | %define CONFIG_CBS_H265 0 23 | %define CONFIG_CBS_JPEG 0 24 | -%define CONFIG_CBS_MPEG2 0 25 | +%define CONFIG_CBS_MPEG2 1 26 | %define CONFIG_CBS_VP9 0 27 | %define CONFIG_DEFLATE_WRAPPER 0 28 | %define CONFIG_DIRAC_PARSE 1 29 | %define CONFIG_DNN 0 30 | -%define CONFIG_DOVI_RPU 0 31 | +%define CONFIG_DOVI_RPU 1 32 | %define CONFIG_DVPROFILE 0 33 | %define CONFIG_EXIF 0 34 | %define CONFIG_FAANDCT 0 35 | @@ -661,7 +661,7 @@ 36 | %define CONFIG_H264PARSE 1 37 | %define CONFIG_H264PRED 1 38 | %define CONFIG_H264QPEL 1 39 | -%define CONFIG_HEVCPARSE 0 40 | +%define CONFIG_HEVCPARSE 1 41 | %define CONFIG_HPELDSP 1 42 | %define CONFIG_HUFFMAN 0 43 | %define CONFIG_HUFFYUVDSP 0 44 | diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h 45 | index 0ee0e55a12..aeddf289c0 100644 46 | --- a/chromium/config/Chrome/linux/x64/config.h 47 | +++ b/chromium/config/Chrome/linux/x64/config.h 48 | @@ -641,7 +641,7 @@ 49 | #define CONFIG_MUXERS 0 50 | #define CONFIG_PROTOCOLS 0 51 | #define CONFIG_AANDCTTABLES 0 52 | -#define CONFIG_AC3DSP 0 53 | +#define CONFIG_AC3DSP 1 54 | #define CONFIG_ADTS_HEADER 1 55 | #define CONFIG_ATSC_A53 1 56 | #define CONFIG_AUDIO_FRAME_QUEUE 0 57 | @@ -677,7 +677,7 @@ 58 | #define CONFIG_H264PARSE 1 59 | #define CONFIG_H264PRED 1 60 | #define CONFIG_H264QPEL 1 61 | -#define CONFIG_HEVCPARSE 0 62 | +#define CONFIG_HEVCPARSE 1 63 | #define CONFIG_HPELDSP 1 64 | #define CONFIG_HUFFMAN 0 65 | #define CONFIG_HUFFYUVDSP 0 66 | diff --git a/chromium/config/Chrome/linux/x64/config_components.h b/chromium/config/Chrome/linux/x64/config_components.h 67 | index 0085d3f113..d54cafab7b 100644 68 | --- a/chromium/config/Chrome/linux/x64/config_components.h 69 | +++ b/chromium/config/Chrome/linux/x64/config_components.h 70 | @@ -9,7 +9,7 @@ 71 | #define CONFIG_DUMP_EXTRADATA_BSF 0 72 | #define CONFIG_DCA_CORE_BSF 0 73 | #define CONFIG_DV_ERROR_MARKER_BSF 0 74 | -#define CONFIG_EAC3_CORE_BSF 0 75 | +#define CONFIG_EAC3_CORE_BSF 1 76 | #define CONFIG_EXTRACT_EXTRADATA_BSF 0 77 | #define CONFIG_FILTER_UNITS_BSF 0 78 | #define CONFIG_H264_METADATA_BSF 0 79 | @@ -132,7 +132,7 @@ 80 | #define CONFIG_H264_QSV_DECODER 0 81 | #define CONFIG_H264_RKMPP_DECODER 0 82 | #define CONFIG_HAP_DECODER 0 83 | -#define CONFIG_HEVC_DECODER 0 84 | +#define CONFIG_HEVC_DECODER 1 85 | #define CONFIG_HEVC_QSV_DECODER 0 86 | #define CONFIG_HEVC_RKMPP_DECODER 0 87 | #define CONFIG_HEVC_V4L2M2M_DECODER 0 88 | @@ -329,8 +329,8 @@ 89 | #define CONFIG_AAC_DECODER 1 90 | #define CONFIG_AAC_FIXED_DECODER 0 91 | #define CONFIG_AAC_LATM_DECODER 0 92 | -#define CONFIG_AC3_DECODER 0 93 | -#define CONFIG_AC3_FIXED_DECODER 0 94 | +#define CONFIG_AC3_DECODER 1 95 | +#define CONFIG_AC3_FIXED_DECODER 1 96 | #define CONFIG_ACELP_KELVIN_DECODER 0 97 | #define CONFIG_ALAC_DECODER 0 98 | #define CONFIG_ALS_DECODER 0 99 | @@ -359,7 +359,7 @@ 100 | #define CONFIG_DSICINAUDIO_DECODER 0 101 | #define CONFIG_DSS_SP_DECODER 0 102 | #define CONFIG_DST_DECODER 0 103 | -#define CONFIG_EAC3_DECODER 0 104 | +#define CONFIG_EAC3_DECODER 1 105 | #define CONFIG_EVRC_DECODER 0 106 | #define CONFIG_FASTAUDIO_DECODER 0 107 | #define CONFIG_FFWAVESYNTH_DECODER 0 108 | @@ -539,11 +539,11 @@ 109 | #define CONFIG_WEBVTT_DECODER 0 110 | #define CONFIG_XSUB_DECODER 0 111 | #define CONFIG_AAC_AT_DECODER 0 112 | -#define CONFIG_AC3_AT_DECODER 0 113 | +#define CONFIG_AC3_AT_DECODER 1 114 | #define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 115 | #define CONFIG_ALAC_AT_DECODER 0 116 | #define CONFIG_AMR_NB_AT_DECODER 0 117 | -#define CONFIG_EAC3_AT_DECODER 0 118 | +#define CONFIG_EAC3_AT_DECODER 1 119 | #define CONFIG_GSM_MS_AT_DECODER 0 120 | #define CONFIG_ILBC_AT_DECODER 0 121 | #define CONFIG_MP1_AT_DECODER 0 122 | @@ -898,7 +898,7 @@ 123 | #define CONFIG_WMV3_VDPAU_HWACCEL 0 124 | #define CONFIG_AAC_PARSER 1 125 | #define CONFIG_AAC_LATM_PARSER 0 126 | -#define CONFIG_AC3_PARSER 0 127 | +#define CONFIG_AC3_PARSER 1 128 | #define CONFIG_ADX_PARSER 0 129 | #define CONFIG_AMR_PARSER 0 130 | #define CONFIG_AV1_PARSER 0 131 | @@ -925,7 +925,7 @@ 132 | #define CONFIG_H261_PARSER 0 133 | #define CONFIG_H263_PARSER 0 134 | #define CONFIG_H264_PARSER 1 135 | -#define CONFIG_HEVC_PARSER 0 136 | +#define CONFIG_HEVC_PARSER 1 137 | #define CONFIG_IPU_PARSER 0 138 | #define CONFIG_JPEG2000_PARSER 0 139 | #define CONFIG_MJPEG_PARSER 0 140 | @@ -1518,7 +1518,7 @@ 141 | #define CONFIG_AA_DEMUXER 0 142 | #define CONFIG_AAC_DEMUXER 1 143 | #define CONFIG_AAX_DEMUXER 0 144 | -#define CONFIG_AC3_DEMUXER 0 145 | +#define CONFIG_AC3_DEMUXER 1 146 | #define CONFIG_ACE_DEMUXER 0 147 | #define CONFIG_ACM_DEMUXER 0 148 | #define CONFIG_ACT_DEMUXER 0 149 | @@ -1598,7 +1598,7 @@ 150 | #define CONFIG_DXA_DEMUXER 0 151 | #define CONFIG_EA_DEMUXER 0 152 | #define CONFIG_EA_CDATA_DEMUXER 0 153 | -#define CONFIG_EAC3_DEMUXER 0 154 | +#define CONFIG_EAC3_DEMUXER 1 155 | #define CONFIG_EPAF_DEMUXER 0 156 | #define CONFIG_FFMETADATA_DEMUXER 0 157 | #define CONFIG_FILMSTRIP_DEMUXER 0 158 | @@ -1626,7 +1626,7 @@ 159 | #define CONFIG_H264_DEMUXER 0 160 | #define CONFIG_HCA_DEMUXER 0 161 | #define CONFIG_HCOM_DEMUXER 0 162 | -#define CONFIG_HEVC_DEMUXER 0 163 | +#define CONFIG_HEVC_DEMUXER 1 164 | #define CONFIG_HLS_DEMUXER 0 165 | #define CONFIG_HNM_DEMUXER 0 166 | #define CONFIG_ICO_DEMUXER 0 167 | diff --git a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 168 | index cbd7f3945a..7eec5f8ebc 100644 169 | --- a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 170 | +++ b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 171 | @@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { 172 | &ff_pcm_s32le_decoder, 173 | &ff_pcm_u8_decoder, 174 | &ff_libopus_decoder, 175 | + &ff_hevc_decoder, 176 | + &ff_ac3_decoder, 177 | + &ff_eac3_decoder, 178 | + &ff_ac3_fixed_decoder, 179 | NULL }; 180 | diff --git a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 181 | index 50acddb28e..38dee0da60 100644 182 | --- a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 183 | +++ b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 184 | @@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { 185 | &ff_vp3_parser, 186 | &ff_vp8_parser, 187 | &ff_vp9_parser, 188 | + &ff_hevc_parser, 189 | + &ff_ac3_parser, 190 | NULL }; 191 | diff --git a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 192 | index 920b22bfa7..7cdfef3522 100644 193 | --- a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 194 | +++ b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 195 | @@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { 196 | &ff_mp3_demuxer, 197 | &ff_ogg_demuxer, 198 | &ff_wav_demuxer, 199 | + &ff_ac3_demuxer, 200 | + &ff_eac3_demuxer, 201 | NULL }; 202 | diff --git a/chromium/config/Chrome/win/x64/config.asm b/chromium/config/Chrome/win/x64/config.asm 203 | index 73dffff49f..d87d02f07a 100644 204 | --- a/chromium/config/Chrome/win/x64/config.asm 205 | +++ b/chromium/config/Chrome/win/x64/config.asm 206 | @@ -625,25 +625,25 @@ 207 | %define CONFIG_MUXERS 0 208 | %define CONFIG_PROTOCOLS 0 209 | %define CONFIG_AANDCTTABLES 0 210 | -%define CONFIG_AC3DSP 0 211 | +%define CONFIG_AC3DSP 1 212 | %define CONFIG_ADTS_HEADER 1 213 | %define CONFIG_ATSC_A53 1 214 | %define CONFIG_AUDIO_FRAME_QUEUE 0 215 | %define CONFIG_AUDIODSP 0 216 | %define CONFIG_BLOCKDSP 0 217 | -%define CONFIG_BSWAPDSP 0 218 | +%define CONFIG_BSWAPDSP 1 219 | %define CONFIG_CABAC 1 220 | %define CONFIG_CBS 0 221 | %define CONFIG_CBS_AV1 0 222 | %define CONFIG_CBS_H264 0 223 | %define CONFIG_CBS_H265 0 224 | %define CONFIG_CBS_JPEG 0 225 | -%define CONFIG_CBS_MPEG2 0 226 | +%define CONFIG_CBS_MPEG2 1 227 | %define CONFIG_CBS_VP9 0 228 | %define CONFIG_DEFLATE_WRAPPER 0 229 | %define CONFIG_DIRAC_PARSE 1 230 | %define CONFIG_DNN 0 231 | -%define CONFIG_DOVI_RPU 0 232 | +%define CONFIG_DOVI_RPU 1 233 | %define CONFIG_DVPROFILE 0 234 | %define CONFIG_EXIF 0 235 | %define CONFIG_FAANDCT 0 236 | @@ -661,7 +661,7 @@ 237 | %define CONFIG_H264PARSE 1 238 | %define CONFIG_H264PRED 1 239 | %define CONFIG_H264QPEL 1 240 | -%define CONFIG_HEVCPARSE 0 241 | +%define CONFIG_HEVCPARSE 1 242 | %define CONFIG_HPELDSP 1 243 | %define CONFIG_HUFFMAN 0 244 | %define CONFIG_HUFFYUVDSP 0 245 | diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h 246 | index 1d2092d0d6..5128ad6763 100644 247 | --- a/chromium/config/Chrome/win/x64/config.h 248 | +++ b/chromium/config/Chrome/win/x64/config.h 249 | @@ -641,7 +641,7 @@ 250 | #define CONFIG_MUXERS 0 251 | #define CONFIG_PROTOCOLS 0 252 | #define CONFIG_AANDCTTABLES 0 253 | -#define CONFIG_AC3DSP 0 254 | +#define CONFIG_AC3DSP 1 255 | #define CONFIG_ADTS_HEADER 1 256 | #define CONFIG_ATSC_A53 1 257 | #define CONFIG_AUDIO_FRAME_QUEUE 0 258 | @@ -677,7 +677,7 @@ 259 | #define CONFIG_H264PARSE 1 260 | #define CONFIG_H264PRED 1 261 | #define CONFIG_H264QPEL 1 262 | -#define CONFIG_HEVCPARSE 0 263 | +#define CONFIG_HEVCPARSE 1 264 | #define CONFIG_HPELDSP 1 265 | #define CONFIG_HUFFMAN 0 266 | #define CONFIG_HUFFYUVDSP 0 267 | diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h 268 | index 0085d3f113..d54cafab7b 100644 269 | --- a/chromium/config/Chrome/win/x64/config_components.h 270 | +++ b/chromium/config/Chrome/win/x64/config_components.h 271 | @@ -9,7 +9,7 @@ 272 | #define CONFIG_DUMP_EXTRADATA_BSF 0 273 | #define CONFIG_DCA_CORE_BSF 0 274 | #define CONFIG_DV_ERROR_MARKER_BSF 0 275 | -#define CONFIG_EAC3_CORE_BSF 0 276 | +#define CONFIG_EAC3_CORE_BSF 1 277 | #define CONFIG_EXTRACT_EXTRADATA_BSF 0 278 | #define CONFIG_FILTER_UNITS_BSF 0 279 | #define CONFIG_H264_METADATA_BSF 0 280 | @@ -132,7 +132,7 @@ 281 | #define CONFIG_H264_QSV_DECODER 0 282 | #define CONFIG_H264_RKMPP_DECODER 0 283 | #define CONFIG_HAP_DECODER 0 284 | -#define CONFIG_HEVC_DECODER 0 285 | +#define CONFIG_HEVC_DECODER 1 286 | #define CONFIG_HEVC_QSV_DECODER 0 287 | #define CONFIG_HEVC_RKMPP_DECODER 0 288 | #define CONFIG_HEVC_V4L2M2M_DECODER 0 289 | @@ -329,8 +329,8 @@ 290 | #define CONFIG_AAC_DECODER 1 291 | #define CONFIG_AAC_FIXED_DECODER 0 292 | #define CONFIG_AAC_LATM_DECODER 0 293 | -#define CONFIG_AC3_DECODER 0 294 | -#define CONFIG_AC3_FIXED_DECODER 0 295 | +#define CONFIG_AC3_DECODER 1 296 | +#define CONFIG_AC3_FIXED_DECODER 1 297 | #define CONFIG_ACELP_KELVIN_DECODER 0 298 | #define CONFIG_ALAC_DECODER 0 299 | #define CONFIG_ALS_DECODER 0 300 | @@ -359,7 +359,7 @@ 301 | #define CONFIG_DSICINAUDIO_DECODER 0 302 | #define CONFIG_DSS_SP_DECODER 0 303 | #define CONFIG_DST_DECODER 0 304 | -#define CONFIG_EAC3_DECODER 0 305 | +#define CONFIG_EAC3_DECODER 1 306 | #define CONFIG_EVRC_DECODER 0 307 | #define CONFIG_FASTAUDIO_DECODER 0 308 | #define CONFIG_FFWAVESYNTH_DECODER 0 309 | @@ -539,11 +539,11 @@ 310 | #define CONFIG_WEBVTT_DECODER 0 311 | #define CONFIG_XSUB_DECODER 0 312 | #define CONFIG_AAC_AT_DECODER 0 313 | -#define CONFIG_AC3_AT_DECODER 0 314 | +#define CONFIG_AC3_AT_DECODER 1 315 | #define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 316 | #define CONFIG_ALAC_AT_DECODER 0 317 | #define CONFIG_AMR_NB_AT_DECODER 0 318 | -#define CONFIG_EAC3_AT_DECODER 0 319 | +#define CONFIG_EAC3_AT_DECODER 1 320 | #define CONFIG_GSM_MS_AT_DECODER 0 321 | #define CONFIG_ILBC_AT_DECODER 0 322 | #define CONFIG_MP1_AT_DECODER 0 323 | @@ -898,7 +898,7 @@ 324 | #define CONFIG_WMV3_VDPAU_HWACCEL 0 325 | #define CONFIG_AAC_PARSER 1 326 | #define CONFIG_AAC_LATM_PARSER 0 327 | -#define CONFIG_AC3_PARSER 0 328 | +#define CONFIG_AC3_PARSER 1 329 | #define CONFIG_ADX_PARSER 0 330 | #define CONFIG_AMR_PARSER 0 331 | #define CONFIG_AV1_PARSER 0 332 | @@ -925,7 +925,7 @@ 333 | #define CONFIG_H261_PARSER 0 334 | #define CONFIG_H263_PARSER 0 335 | #define CONFIG_H264_PARSER 1 336 | -#define CONFIG_HEVC_PARSER 0 337 | +#define CONFIG_HEVC_PARSER 1 338 | #define CONFIG_IPU_PARSER 0 339 | #define CONFIG_JPEG2000_PARSER 0 340 | #define CONFIG_MJPEG_PARSER 0 341 | @@ -1518,7 +1518,7 @@ 342 | #define CONFIG_AA_DEMUXER 0 343 | #define CONFIG_AAC_DEMUXER 1 344 | #define CONFIG_AAX_DEMUXER 0 345 | -#define CONFIG_AC3_DEMUXER 0 346 | +#define CONFIG_AC3_DEMUXER 1 347 | #define CONFIG_ACE_DEMUXER 0 348 | #define CONFIG_ACM_DEMUXER 0 349 | #define CONFIG_ACT_DEMUXER 0 350 | @@ -1598,7 +1598,7 @@ 351 | #define CONFIG_DXA_DEMUXER 0 352 | #define CONFIG_EA_DEMUXER 0 353 | #define CONFIG_EA_CDATA_DEMUXER 0 354 | -#define CONFIG_EAC3_DEMUXER 0 355 | +#define CONFIG_EAC3_DEMUXER 1 356 | #define CONFIG_EPAF_DEMUXER 0 357 | #define CONFIG_FFMETADATA_DEMUXER 0 358 | #define CONFIG_FILMSTRIP_DEMUXER 0 359 | @@ -1626,7 +1626,7 @@ 360 | #define CONFIG_H264_DEMUXER 0 361 | #define CONFIG_HCA_DEMUXER 0 362 | #define CONFIG_HCOM_DEMUXER 0 363 | -#define CONFIG_HEVC_DEMUXER 0 364 | +#define CONFIG_HEVC_DEMUXER 1 365 | #define CONFIG_HLS_DEMUXER 0 366 | #define CONFIG_HNM_DEMUXER 0 367 | #define CONFIG_ICO_DEMUXER 0 368 | diff --git a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 369 | index cbd7f3945a..7eec5f8ebc 100644 370 | --- a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 371 | +++ b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 372 | @@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { 373 | &ff_pcm_s32le_decoder, 374 | &ff_pcm_u8_decoder, 375 | &ff_libopus_decoder, 376 | + &ff_hevc_decoder, 377 | + &ff_ac3_decoder, 378 | + &ff_eac3_decoder, 379 | + &ff_ac3_fixed_decoder, 380 | NULL }; 381 | diff --git a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 382 | index 50acddb28e..38dee0da60 100644 383 | --- a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 384 | +++ b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 385 | @@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { 386 | &ff_vp3_parser, 387 | &ff_vp8_parser, 388 | &ff_vp9_parser, 389 | + &ff_hevc_parser, 390 | + &ff_ac3_parser, 391 | NULL }; 392 | diff --git a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 393 | index 920b22bfa7..7cdfef3522 100644 394 | --- a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 395 | +++ b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 396 | @@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { 397 | &ff_mp3_demuxer, 398 | &ff_ogg_demuxer, 399 | &ff_wav_demuxer, 400 | + &ff_ac3_demuxer, 401 | + &ff_eac3_demuxer, 402 | NULL }; 403 | diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py 404 | index 423e867101..dc2c9e7c11 100755 405 | --- a/chromium/scripts/build_ffmpeg.py 406 | +++ b/chromium/scripts/build_ffmpeg.py 407 | @@ -985,9 +985,9 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, 408 | 409 | # Google Chrome & ChromeOS specific configuration. 410 | configure_flags['Chrome'].extend([ 411 | - '--enable-decoder=aac,h264', 412 | - '--enable-demuxer=aac', 413 | - '--enable-parser=aac,h264', 414 | + '--enable-decoder=aac,h264,mp3,eac3,ac3,hevc,mpeg4,mpegvideo,mp2,mp1,flac', 415 | + '--enable-demuxer=aac,mp3,mov,dtshd,dts,avi,mpegvideo,m4v,h264,vc1,flac', 416 | + '--enable-parser=aac,h264,mpegaudio,mpeg4video,mpegvideo,ac3,h261,vc1,h263,flac', 417 | ]) 418 | 419 | # Google ChromeOS specific configuration. 420 | diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni 421 | index b2a99969d8..85579eca04 100644 422 | --- a/ffmpeg_generated.gni 423 | +++ b/ffmpeg_generated.gni 424 | @@ -508,7 +508,50 @@ if ((is_mac) || (is_win) || (use_linux_config)) { 425 | "libavcodec/vp8.c", 426 | "libavcodec/vp8_parser.c", 427 | "libavcodec/vp8dsp.c", 428 | - ] 429 | + "libavcodec/bswapdsp.c", 430 | + "libavcodec/dynamic_hdr_vivid.c", 431 | + "libavcodec/dynamic_hdr10_plus.c", 432 | + "libavcodec/dovi_rpu.c", 433 | + "libavcodec/hevc_cabac.c", 434 | + "libavcodec/hevc_data.c", 435 | + "libavcodec/hevc_filter.c", 436 | + "libavcodec/hevc_mvs.c", 437 | + "libavcodec/hevc_parse.c", 438 | + "libavcodec/hevc_parser.c", 439 | + "libavcodec/hevc_ps.c", 440 | + "libavcodec/hevc_refs.c", 441 | + "libavcodec/hevc_sei.c", 442 | + "libavcodec/hevcdsp.c", 443 | + "libavcodec/hevcpred.c", 444 | + "libavcodec/x86/bswapdsp_init.c", 445 | + "libavcodec/x86/hevcdsp_init.c", 446 | + "libavformat/avc.c", 447 | + "libavcodec/hevcdec.c", 448 | + "libavcodec/x86/ac3dsp_init.c", 449 | + "libavcodec/ac3dsp.c", 450 | + "libavcodec/fmtconvert.c", 451 | + "libavcodec/ac3tab.c", 452 | + "libavcodec/ac3dec_float.c", 453 | + "libavcodec/ac3.c", 454 | + "libavcodec/x86/fmtconvert_init.c", 455 | + "libavcodec/ac3dec_data.c", 456 | + "libavcodec/eac3dec.c", 457 | + "libavcodec/eac3_data.c", 458 | + "libavcodec/ac3dec_fixed.c", 459 | + "libavformat/ac3dec.c", 460 | + ] 461 | + ffmpeg_asm_sources += [ 462 | + "libavcodec/x86/bswapdsp.asm", 463 | + "libavcodec/x86/hevc_deblock.asm", 464 | + "libavcodec/x86/hevc_idct.asm", 465 | + "libavcodec/x86/hevc_mc.asm", 466 | + "libavcodec/x86/hevc_add_res.asm", 467 | + "libavcodec/x86/hevc_sao.asm", 468 | + "libavcodec/x86/hevc_sao_10bit.asm", 469 | + "libavcodec/x86/ac3dsp.asm", 470 | + "libavcodec/x86/ac3dsp_downmix.asm", 471 | + "libavcodec/x86/fmtconvert.asm", 472 | + ] 473 | } 474 | 475 | if ((is_mac && current_cpu == "arm64") || (is_win && current_cpu == "arm64") || (use_linux_config && current_cpu == "arm64")) { 476 | -------------------------------------------------------------------------------- /v25.1.0/look_chromium_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc 2 | index 07b991932aad5..ce458ba45e494 100644 3 | --- a/media/base/supported_types.cc 4 | +++ b/media/base/supported_types.cc 5 | @@ -209,33 +209,7 @@ bool IsAudioCodecProprietary(AudioCodec codec) { 6 | #endif // !BUILDFLAG(USE_PROPRIETARY_CODECS) 7 | 8 | bool IsHevcProfileSupported(const VideoType& type) { 9 | - if (!IsColorSpaceSupported(type.color_space)) 10 | - return false; 11 | - 12 | -#if BUILDFLAG(ENABLE_PLATFORM_HEVC) 13 | -#if BUILDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT) 14 | -#if BUILDFLAG(IS_CHROMEOS_LACROS) 15 | - // TODO(b/171813538): For Lacros, the supplemental profile cache will be 16 | - // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the 17 | - // codec detection is plumbed through to ash-gpu we can do this extra check 18 | - // for HEVC support. 19 | - if (base::CommandLine::ForCurrentProcess()->HasSwitch( 20 | - switches::kLacrosEnablePlatformHevc)) { 21 | - return true; 22 | - } 23 | -#endif // BUILDFLAG(IS_CHROMEOS_LACROS) 24 | -#if BUILDFLAG(IS_CHROMEOS_ASH) 25 | - if (!base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport)) { 26 | - return false; 27 | - } 28 | -#endif // BUILDFLAG(IS_CHROMEOS_ASH) 29 | - return GetSupplementalProfileCache()->IsProfileSupported(type.profile); 30 | -#else 31 | - return true; 32 | -#endif // BUIDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT) 33 | -#else 34 | - return false; 35 | -#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC) 36 | + return true; 37 | } 38 | 39 | bool IsVp9ProfileSupported(const VideoType& type) { 40 | @@ -410,7 +384,7 @@ bool IsBuiltInVideoCodec(VideoCodec codec) { 41 | if (codec == VideoCodec::kVP8) 42 | return true; 43 | #if BUILDFLAG(USE_PROPRIETARY_CODECS) 44 | - if (codec == VideoCodec::kH264) 45 | + if (codec == VideoCodec::kH264 || codec == VideoCodec::kHEVC) 46 | return true; 47 | #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 48 | #endif // BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) 49 | diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc 50 | index 65c7a4958bd95..c1ea63c18ee87 100644 51 | --- a/media/ffmpeg/ffmpeg_common.cc 52 | +++ b/media/ffmpeg/ffmpeg_common.cc 53 | @@ -136,6 +136,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec audio_codec, 54 | switch (audio_codec) { 55 | case AudioCodec::kAAC: 56 | return AV_CODEC_ID_AAC; 57 | + case AudioCodec::kAC3: 58 | + return AV_CODEC_ID_AC3; 59 | + case AudioCodec::kEAC3: 60 | + return AV_CODEC_ID_EAC3; 61 | case AudioCodec::kALAC: 62 | return AV_CODEC_ID_ALAC; 63 | case AudioCodec::kMP3: 64 | -------------------------------------------------------------------------------- /v25.1.0/look_electron_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/build/args/release.gn b/build/args/release.gn 2 | index e5017f6e16..692ec76f92 100644 3 | --- a/build/args/release.gn 4 | +++ b/build/args/release.gn 5 | @@ -14,3 +14,5 @@ rtc_use_h264 = proprietary_codecs 6 | # who have an LGPL requirement to ship ffmpeg as a dynamically linked library, 7 | # we build ffmpeg as a shared library. 8 | is_component_ffmpeg = true 9 | +proprietary_codecs = true 10 | +enable_platform_ac3_eac3_audio = true 11 | -------------------------------------------------------------------------------- /v25.1.0/look_ffmpeg_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h 2 | index 2dc833e597..c8d0ce3c96 100644 3 | --- a/chromium/config/Chrome/linux/x64/config.h 4 | +++ b/chromium/config/Chrome/linux/x64/config.h 5 | @@ -650,13 +650,13 @@ 6 | #define CONFIG_MUXERS 0 7 | #define CONFIG_PROTOCOLS 0 8 | #define CONFIG_AANDCTTABLES 0 9 | -#define CONFIG_AC3DSP 0 10 | +#define CONFIG_AC3DSP 1 11 | #define CONFIG_ADTS_HEADER 1 12 | #define CONFIG_ATSC_A53 1 13 | #define CONFIG_AUDIO_FRAME_QUEUE 0 14 | #define CONFIG_AUDIODSP 0 15 | #define CONFIG_BLOCKDSP 0 16 | -#define CONFIG_BSWAPDSP 0 17 | +#define CONFIG_BSWAPDSP 1 18 | #define CONFIG_CABAC 1 19 | #define CONFIG_CBS 0 20 | #define CONFIG_CBS_AV1 0 21 | @@ -668,7 +668,7 @@ 22 | #define CONFIG_DEFLATE_WRAPPER 0 23 | #define CONFIG_DIRAC_PARSE 1 24 | #define CONFIG_DNN 0 25 | -#define CONFIG_DOVI_RPU 0 26 | +#define CONFIG_DOVI_RPU 1 27 | #define CONFIG_DVPROFILE 0 28 | #define CONFIG_EXIF 0 29 | #define CONFIG_FAANDCT 0 30 | @@ -686,8 +686,8 @@ 31 | #define CONFIG_H264PRED 1 32 | #define CONFIG_H264QPEL 1 33 | #define CONFIG_H264_SEI 1 34 | -#define CONFIG_HEVCPARSE 0 35 | -#define CONFIG_HEVC_SEI 0 36 | +#define CONFIG_HEVCPARSE 1 37 | +#define CONFIG_HEVC_SEI 1 38 | #define CONFIG_HPELDSP 1 39 | #define CONFIG_HUFFMAN 0 40 | #define CONFIG_HUFFYUVDSP 0 41 | diff --git a/chromium/config/Chrome/linux/x64/config_components.h b/chromium/config/Chrome/linux/x64/config_components.h 42 | index 3604442a32..0074bb0c77 100644 43 | --- a/chromium/config/Chrome/linux/x64/config_components.h 44 | +++ b/chromium/config/Chrome/linux/x64/config_components.h 45 | @@ -10,7 +10,7 @@ 46 | #define CONFIG_DCA_CORE_BSF 0 47 | #define CONFIG_DTS2PTS_BSF 0 48 | #define CONFIG_DV_ERROR_MARKER_BSF 0 49 | -#define CONFIG_EAC3_CORE_BSF 0 50 | +#define CONFIG_EAC3_CORE_BSF 1 51 | #define CONFIG_EXTRACT_EXTRADATA_BSF 0 52 | #define CONFIG_FILTER_UNITS_BSF 0 53 | #define CONFIG_H264_METADATA_BSF 0 54 | @@ -134,7 +134,7 @@ 55 | #define CONFIG_H264_QSV_DECODER 0 56 | #define CONFIG_H264_RKMPP_DECODER 0 57 | #define CONFIG_HAP_DECODER 0 58 | -#define CONFIG_HEVC_DECODER 0 59 | +#define CONFIG_HEVC_DECODER 1 60 | #define CONFIG_HEVC_QSV_DECODER 0 61 | #define CONFIG_HEVC_RKMPP_DECODER 0 62 | #define CONFIG_HEVC_V4L2M2M_DECODER 0 63 | @@ -337,8 +337,8 @@ 64 | #define CONFIG_AAC_DECODER 1 65 | #define CONFIG_AAC_FIXED_DECODER 0 66 | #define CONFIG_AAC_LATM_DECODER 0 67 | -#define CONFIG_AC3_DECODER 0 68 | -#define CONFIG_AC3_FIXED_DECODER 0 69 | +#define CONFIG_AC3_DECODER 1 70 | +#define CONFIG_AC3_FIXED_DECODER 1 71 | #define CONFIG_ACELP_KELVIN_DECODER 0 72 | #define CONFIG_ALAC_DECODER 0 73 | #define CONFIG_ALS_DECODER 0 74 | @@ -369,7 +369,7 @@ 75 | #define CONFIG_DSICINAUDIO_DECODER 0 76 | #define CONFIG_DSS_SP_DECODER 0 77 | #define CONFIG_DST_DECODER 0 78 | -#define CONFIG_EAC3_DECODER 0 79 | +#define CONFIG_EAC3_DECODER 1 80 | #define CONFIG_EVRC_DECODER 0 81 | #define CONFIG_FASTAUDIO_DECODER 0 82 | #define CONFIG_FFWAVESYNTH_DECODER 0 83 | @@ -556,11 +556,11 @@ 84 | #define CONFIG_WEBVTT_DECODER 0 85 | #define CONFIG_XSUB_DECODER 0 86 | #define CONFIG_AAC_AT_DECODER 0 87 | -#define CONFIG_AC3_AT_DECODER 0 88 | +#define CONFIG_AC3_AT_DECODER 1 89 | #define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 90 | #define CONFIG_ALAC_AT_DECODER 0 91 | #define CONFIG_AMR_NB_AT_DECODER 0 92 | -#define CONFIG_EAC3_AT_DECODER 0 93 | +#define CONFIG_EAC3_AT_DECODER 1 94 | #define CONFIG_GSM_MS_AT_DECODER 0 95 | #define CONFIG_ILBC_AT_DECODER 0 96 | #define CONFIG_MP1_AT_DECODER 0 97 | @@ -931,7 +931,7 @@ 98 | #define CONFIG_WMV3_VDPAU_HWACCEL 0 99 | #define CONFIG_AAC_PARSER 1 100 | #define CONFIG_AAC_LATM_PARSER 0 101 | -#define CONFIG_AC3_PARSER 0 102 | +#define CONFIG_AC3_PARSER 1 103 | #define CONFIG_ADX_PARSER 0 104 | #define CONFIG_AMR_PARSER 0 105 | #define CONFIG_AV1_PARSER 0 106 | @@ -959,7 +959,7 @@ 107 | #define CONFIG_H261_PARSER 0 108 | #define CONFIG_H263_PARSER 0 109 | #define CONFIG_H264_PARSER 1 110 | -#define CONFIG_HEVC_PARSER 0 111 | +#define CONFIG_HEVC_PARSER 1 112 | #define CONFIG_HDR_PARSER 0 113 | #define CONFIG_IPU_PARSER 0 114 | #define CONFIG_JPEG2000_PARSER 0 115 | @@ -1577,7 +1577,7 @@ 116 | #define CONFIG_AA_DEMUXER 0 117 | #define CONFIG_AAC_DEMUXER 1 118 | #define CONFIG_AAX_DEMUXER 0 119 | -#define CONFIG_AC3_DEMUXER 0 120 | +#define CONFIG_AC3_DEMUXER 1 121 | #define CONFIG_ACE_DEMUXER 0 122 | #define CONFIG_ACM_DEMUXER 0 123 | #define CONFIG_ACT_DEMUXER 0 124 | @@ -1659,7 +1659,7 @@ 125 | #define CONFIG_DXA_DEMUXER 0 126 | #define CONFIG_EA_DEMUXER 0 127 | #define CONFIG_EA_CDATA_DEMUXER 0 128 | -#define CONFIG_EAC3_DEMUXER 0 129 | +#define CONFIG_EAC3_DEMUXER 1 130 | #define CONFIG_EPAF_DEMUXER 0 131 | #define CONFIG_FFMETADATA_DEMUXER 0 132 | #define CONFIG_FILMSTRIP_DEMUXER 0 133 | diff --git a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 134 | index cbd7f3945a..1bc1adaf63 100644 135 | --- a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 136 | +++ b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 137 | @@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { 138 | &ff_pcm_s32le_decoder, 139 | &ff_pcm_u8_decoder, 140 | &ff_libopus_decoder, 141 | + &ff_hevc_decoder, 142 | + &ff_ac3_decoder, 143 | + &ff_eac3_decoder, 144 | + &ff_ac3_fixed_decoder, 145 | NULL }; 146 | diff --git a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 147 | index 50acddb28e..3cade58c41 100644 148 | --- a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 149 | +++ b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 150 | @@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { 151 | &ff_vp3_parser, 152 | &ff_vp8_parser, 153 | &ff_vp9_parser, 154 | + &ff_hevc_parser, 155 | + &ff_ac3_parser, 156 | NULL }; 157 | diff --git a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 158 | index 920b22bfa7..d6d293dc60 100644 159 | --- a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 160 | +++ b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 161 | @@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { 162 | &ff_mp3_demuxer, 163 | &ff_ogg_demuxer, 164 | &ff_wav_demuxer, 165 | + &ff_ac3_demuxer, 166 | + &ff_eac3_demuxer, 167 | NULL }; 168 | diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h 169 | index 02d074b823..4cfcf51810 100644 170 | --- a/chromium/config/Chrome/win/x64/config.h 171 | +++ b/chromium/config/Chrome/win/x64/config.h 172 | @@ -650,13 +650,13 @@ 173 | #define CONFIG_MUXERS 0 174 | #define CONFIG_PROTOCOLS 0 175 | #define CONFIG_AANDCTTABLES 0 176 | -#define CONFIG_AC3DSP 0 177 | +#define CONFIG_AC3DSP 1 178 | #define CONFIG_ADTS_HEADER 1 179 | #define CONFIG_ATSC_A53 1 180 | #define CONFIG_AUDIO_FRAME_QUEUE 0 181 | #define CONFIG_AUDIODSP 0 182 | #define CONFIG_BLOCKDSP 0 183 | -#define CONFIG_BSWAPDSP 0 184 | +#define CONFIG_BSWAPDSP 1 185 | #define CONFIG_CABAC 1 186 | #define CONFIG_CBS 0 187 | #define CONFIG_CBS_AV1 0 188 | @@ -668,7 +668,7 @@ 189 | #define CONFIG_DEFLATE_WRAPPER 0 190 | #define CONFIG_DIRAC_PARSE 1 191 | #define CONFIG_DNN 0 192 | -#define CONFIG_DOVI_RPU 0 193 | +#define CONFIG_DOVI_RPU 1 194 | #define CONFIG_DVPROFILE 0 195 | #define CONFIG_EXIF 0 196 | #define CONFIG_FAANDCT 0 197 | @@ -686,8 +686,8 @@ 198 | #define CONFIG_H264PRED 1 199 | #define CONFIG_H264QPEL 1 200 | #define CONFIG_H264_SEI 1 201 | -#define CONFIG_HEVCPARSE 0 202 | -#define CONFIG_HEVC_SEI 0 203 | +#define CONFIG_HEVCPARSE 1 204 | +#define CONFIG_HEVC_SEI 1 205 | #define CONFIG_HPELDSP 1 206 | #define CONFIG_HUFFMAN 0 207 | #define CONFIG_HUFFYUVDSP 0 208 | diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h 209 | index 3604442a32..0074bb0c77 100644 210 | --- a/chromium/config/Chrome/win/x64/config_components.h 211 | +++ b/chromium/config/Chrome/win/x64/config_components.h 212 | @@ -10,7 +10,7 @@ 213 | #define CONFIG_DCA_CORE_BSF 0 214 | #define CONFIG_DTS2PTS_BSF 0 215 | #define CONFIG_DV_ERROR_MARKER_BSF 0 216 | -#define CONFIG_EAC3_CORE_BSF 0 217 | +#define CONFIG_EAC3_CORE_BSF 1 218 | #define CONFIG_EXTRACT_EXTRADATA_BSF 0 219 | #define CONFIG_FILTER_UNITS_BSF 0 220 | #define CONFIG_H264_METADATA_BSF 0 221 | @@ -134,7 +134,7 @@ 222 | #define CONFIG_H264_QSV_DECODER 0 223 | #define CONFIG_H264_RKMPP_DECODER 0 224 | #define CONFIG_HAP_DECODER 0 225 | -#define CONFIG_HEVC_DECODER 0 226 | +#define CONFIG_HEVC_DECODER 1 227 | #define CONFIG_HEVC_QSV_DECODER 0 228 | #define CONFIG_HEVC_RKMPP_DECODER 0 229 | #define CONFIG_HEVC_V4L2M2M_DECODER 0 230 | @@ -337,8 +337,8 @@ 231 | #define CONFIG_AAC_DECODER 1 232 | #define CONFIG_AAC_FIXED_DECODER 0 233 | #define CONFIG_AAC_LATM_DECODER 0 234 | -#define CONFIG_AC3_DECODER 0 235 | -#define CONFIG_AC3_FIXED_DECODER 0 236 | +#define CONFIG_AC3_DECODER 1 237 | +#define CONFIG_AC3_FIXED_DECODER 1 238 | #define CONFIG_ACELP_KELVIN_DECODER 0 239 | #define CONFIG_ALAC_DECODER 0 240 | #define CONFIG_ALS_DECODER 0 241 | @@ -369,7 +369,7 @@ 242 | #define CONFIG_DSICINAUDIO_DECODER 0 243 | #define CONFIG_DSS_SP_DECODER 0 244 | #define CONFIG_DST_DECODER 0 245 | -#define CONFIG_EAC3_DECODER 0 246 | +#define CONFIG_EAC3_DECODER 1 247 | #define CONFIG_EVRC_DECODER 0 248 | #define CONFIG_FASTAUDIO_DECODER 0 249 | #define CONFIG_FFWAVESYNTH_DECODER 0 250 | @@ -556,11 +556,11 @@ 251 | #define CONFIG_WEBVTT_DECODER 0 252 | #define CONFIG_XSUB_DECODER 0 253 | #define CONFIG_AAC_AT_DECODER 0 254 | -#define CONFIG_AC3_AT_DECODER 0 255 | +#define CONFIG_AC3_AT_DECODER 1 256 | #define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 257 | #define CONFIG_ALAC_AT_DECODER 0 258 | #define CONFIG_AMR_NB_AT_DECODER 0 259 | -#define CONFIG_EAC3_AT_DECODER 0 260 | +#define CONFIG_EAC3_AT_DECODER 1 261 | #define CONFIG_GSM_MS_AT_DECODER 0 262 | #define CONFIG_ILBC_AT_DECODER 0 263 | #define CONFIG_MP1_AT_DECODER 0 264 | @@ -931,7 +931,7 @@ 265 | #define CONFIG_WMV3_VDPAU_HWACCEL 0 266 | #define CONFIG_AAC_PARSER 1 267 | #define CONFIG_AAC_LATM_PARSER 0 268 | -#define CONFIG_AC3_PARSER 0 269 | +#define CONFIG_AC3_PARSER 1 270 | #define CONFIG_ADX_PARSER 0 271 | #define CONFIG_AMR_PARSER 0 272 | #define CONFIG_AV1_PARSER 0 273 | @@ -959,7 +959,7 @@ 274 | #define CONFIG_H261_PARSER 0 275 | #define CONFIG_H263_PARSER 0 276 | #define CONFIG_H264_PARSER 1 277 | -#define CONFIG_HEVC_PARSER 0 278 | +#define CONFIG_HEVC_PARSER 1 279 | #define CONFIG_HDR_PARSER 0 280 | #define CONFIG_IPU_PARSER 0 281 | #define CONFIG_JPEG2000_PARSER 0 282 | @@ -1577,7 +1577,7 @@ 283 | #define CONFIG_AA_DEMUXER 0 284 | #define CONFIG_AAC_DEMUXER 1 285 | #define CONFIG_AAX_DEMUXER 0 286 | -#define CONFIG_AC3_DEMUXER 0 287 | +#define CONFIG_AC3_DEMUXER 1 288 | #define CONFIG_ACE_DEMUXER 0 289 | #define CONFIG_ACM_DEMUXER 0 290 | #define CONFIG_ACT_DEMUXER 0 291 | @@ -1659,7 +1659,7 @@ 292 | #define CONFIG_DXA_DEMUXER 0 293 | #define CONFIG_EA_DEMUXER 0 294 | #define CONFIG_EA_CDATA_DEMUXER 0 295 | -#define CONFIG_EAC3_DEMUXER 0 296 | +#define CONFIG_EAC3_DEMUXER 1 297 | #define CONFIG_EPAF_DEMUXER 0 298 | #define CONFIG_FFMETADATA_DEMUXER 0 299 | #define CONFIG_FILMSTRIP_DEMUXER 0 300 | diff --git a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 301 | index cbd7f3945a..1bc1adaf63 100644 302 | --- a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 303 | +++ b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 304 | @@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { 305 | &ff_pcm_s32le_decoder, 306 | &ff_pcm_u8_decoder, 307 | &ff_libopus_decoder, 308 | + &ff_hevc_decoder, 309 | + &ff_ac3_decoder, 310 | + &ff_eac3_decoder, 311 | + &ff_ac3_fixed_decoder, 312 | NULL }; 313 | diff --git a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 314 | index 50acddb28e..3cade58c41 100644 315 | --- a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 316 | +++ b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 317 | @@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { 318 | &ff_vp3_parser, 319 | &ff_vp8_parser, 320 | &ff_vp9_parser, 321 | + &ff_hevc_parser, 322 | + &ff_ac3_parser, 323 | NULL }; 324 | diff --git a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 325 | index 920b22bfa7..d6d293dc60 100644 326 | --- a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 327 | +++ b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 328 | @@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { 329 | &ff_mp3_demuxer, 330 | &ff_ogg_demuxer, 331 | &ff_wav_demuxer, 332 | + &ff_ac3_demuxer, 333 | + &ff_eac3_demuxer, 334 | NULL }; 335 | diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py 336 | index 19d0a0f7bc..5f2107cf32 100755 337 | --- a/chromium/scripts/build_ffmpeg.py 338 | +++ b/chromium/scripts/build_ffmpeg.py 339 | @@ -1003,9 +1003,9 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, 340 | 341 | # Google Chrome & ChromeOS specific configuration. 342 | configure_flags['Chrome'].extend([ 343 | - '--enable-decoder=aac,h264', 344 | - '--enable-demuxer=aac', 345 | - '--enable-parser=aac,h264', 346 | + '--enable-decoder=aac,h264,mp3,eac3,ac3,hevc,mpeg4,mpegvideo,mp2,mp1,flac', 347 | + '--enable-demuxer=aac,mp3,mov,dtshd,dts,avi,mpegvideo,m4v,h264,vc1,flac', 348 | + '--enable-parser=aac,h264,mpegaudio,mpeg4video,mpegvideo,ac3,h261,vc1,h263,flac', 349 | ]) 350 | 351 | # Google ChromeOS specific configuration. 352 | diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni 353 | index f0b5c66668..48a0685588 100644 354 | --- a/ffmpeg_generated.gni 355 | +++ b/ffmpeg_generated.gni 356 | @@ -485,6 +485,53 @@ if ((is_apple) || (is_win) || (use_linux_config)) { 357 | "libavcodec/vp8dsp.c", 358 | "libavcodec/vpx_rac.c", 359 | ] 360 | + ffmpeg_c_sources += [ 361 | + "libavcodec/autorename_libavcodec_bswapdsp.c", 362 | + "libavcodec/dovi_rpu.c", 363 | + "libavcodec/dynamic_hdr_vivid.c", 364 | + "libavcodec/hevc_cabac.c", 365 | + "libavcodec/hevc_data.c", 366 | + "libavcodec/hevc_filter.c", 367 | + "libavcodec/hevc_mvs.c", 368 | + "libavcodec/hevc_parse.c", 369 | + "libavcodec/hevc_parser.c", 370 | + "libavcodec/hevc_ps.c", 371 | + "libavcodec/hevc_refs.c", 372 | + "libavcodec/hevc_sei.c", 373 | + "libavcodec/hevcdec.c", 374 | + "libavcodec/hevcdsp.c", 375 | + "libavcodec/hevcpred.c", 376 | + "libavcodec/x86/ac3dsp_init.c", 377 | + "libavcodec/ac3dsp.c", 378 | + "libavcodec/fmtconvert.c", 379 | + "libavcodec/ac3tab.c", 380 | + "libavcodec/ac3dec_float.c", 381 | + "libavcodec/ac3.c", 382 | + "libavcodec/x86/fmtconvert_init.c", 383 | + "libavcodec/ac3dec_data.c", 384 | + "libavcodec/eac3dec.c", 385 | + "libavcodec/eac3_data.c", 386 | + "libavcodec/ac3dec_fixed.c", 387 | + "libavformat/ac3dec.c", 388 | + ] 389 | + 390 | + ffmpeg_c_sources += [ 391 | + "libavcodec/x86/bswapdsp_init.c", 392 | + "libavcodec/x86/hevcdsp_init.c" 393 | + ] 394 | + 395 | + ffmpeg_asm_sources += [ 396 | + "libavcodec/x86/bswapdsp.asm", 397 | + "libavcodec/x86/hevc_add_res.asm", 398 | + "libavcodec/x86/hevc_deblock.asm", 399 | + "libavcodec/x86/hevc_idct.asm", 400 | + "libavcodec/x86/hevc_mc.asm", 401 | + "libavcodec/x86/hevc_sao.asm", 402 | + "libavcodec/x86/hevc_sao_10bit.asm", 403 | + "libavcodec/x86/ac3dsp.asm", 404 | + "libavcodec/x86/ac3dsp_downmix.asm", 405 | + "libavcodec/x86/fmtconvert.asm", 406 | + ] 407 | } 408 | 409 | if ((is_apple && current_cpu == "arm64") || (is_win && current_cpu == "arm64") || (use_linux_config && current_cpu == "arm64")) { 410 | -------------------------------------------------------------------------------- /v29.1.4/look_chromium_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc 2 | index 9bc06a1c73f7e..c1a72a49bcfc8 100644 3 | --- a/media/base/supported_types.cc 4 | +++ b/media/base/supported_types.cc 5 | @@ -222,33 +222,7 @@ bool IsAudioCodecProprietary(AudioCodec codec) { 6 | #endif // !BUILDFLAG(USE_PROPRIETARY_CODECS) 7 | 8 | bool IsHevcProfileSupported(const VideoType& type) { 9 | - if (!IsColorSpaceSupported(type.color_space)) 10 | - return false; 11 | - 12 | -#if BUILDFLAG(ENABLE_PLATFORM_HEVC) 13 | -#if BUILDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT) 14 | -#if BUILDFLAG(IS_CHROMEOS_LACROS) 15 | - // TODO(b/171813538): For Lacros, the supplemental profile cache will be 16 | - // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the 17 | - // codec detection is plumbed through to ash-gpu we can do this extra check 18 | - // for HEVC support. 19 | - if (base::CommandLine::ForCurrentProcess()->HasSwitch( 20 | - switches::kLacrosEnablePlatformHevc)) { 21 | - return true; 22 | - } 23 | -#endif // BUILDFLAG(IS_CHROMEOS_LACROS) 24 | -#if BUILDFLAG(IS_CHROMEOS_ASH) 25 | - if (!base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport)) { 26 | - return false; 27 | - } 28 | -#endif // BUILDFLAG(IS_CHROMEOS_ASH) 29 | - return GetSupplementalProfileCache()->IsProfileSupported(type.profile); 30 | -#else 31 | return true; 32 | -#endif // BUIDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT) 33 | -#else 34 | - return false; 35 | -#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC) 36 | } 37 | 38 | bool IsVp9ProfileSupported(const VideoType& type) { 39 | @@ -429,7 +403,7 @@ bool IsBuiltInVideoCodec(VideoCodec codec) { 40 | if (codec == VideoCodec::kVP8) 41 | return true; 42 | #if BUILDFLAG(USE_PROPRIETARY_CODECS) 43 | - if (codec == VideoCodec::kH264) 44 | + if (codec == VideoCodec::kH264 || codec == VideoCodec::kHEVC) 45 | return true; 46 | #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 47 | #endif // BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) 48 | diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc 49 | index 2b8839c47dcec..1ce4ede55743f 100644 50 | --- a/media/ffmpeg/ffmpeg_common.cc 51 | +++ b/media/ffmpeg/ffmpeg_common.cc 52 | @@ -129,6 +129,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec audio_codec, 53 | switch (audio_codec) { 54 | case AudioCodec::kAAC: 55 | return AV_CODEC_ID_AAC; 56 | + case AudioCodec::kAC3: 57 | + return AV_CODEC_ID_AC3; 58 | + case AudioCodec::kEAC3: 59 | + return AV_CODEC_ID_EAC3; 60 | case AudioCodec::kALAC: 61 | return AV_CODEC_ID_ALAC; 62 | case AudioCodec::kMP3: 63 | diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc 64 | index af52aeb5173af..8e822a20353ca 100644 65 | --- a/media/filters/ffmpeg_glue.cc 66 | +++ b/media/filters/ffmpeg_glue.cc 67 | @@ -146,6 +146,8 @@ const char* FFmpegGlue::GetAllowedAudioDecoders() { 68 | "mp3,pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw"); 69 | #if BUILDFLAG(USE_PROPRIETARY_CODECS) 70 | allowed_decoders += ",aac"; 71 | + allowed_decoders += ",ac3"; 72 | + allowed_decoders += ",eac3"; 73 | #endif 74 | return allowed_decoders; 75 | }()); 76 | @@ -166,6 +168,9 @@ const char* FFmpegGlue::GetAllowedVideoDecoders() { 77 | } 78 | #if BUILDFLAG(USE_PROPRIETARY_CODECS) 79 | allowed_decoders.push_back("h264"); 80 | +#if BUILDFLAG(ENABLE_PLATFORM_HEVC) 81 | + allowed_decoders.push_back("hevc"); 82 | +#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC) 83 | #if BUILDFLAG(IS_CHROMEOS) 84 | if (base::FeatureList::IsEnabled(kCrOSLegacyMediaFormats)) { 85 | allowed_decoders.push_back("mpeg4"); 86 | diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc 87 | index aaab17bdc3b9c..de4dc5000332a 100644 88 | --- a/media/filters/ffmpeg_video_decoder.cc 89 | +++ b/media/filters/ffmpeg_video_decoder.cc 90 | @@ -74,12 +74,6 @@ static int GetFFmpegVideoDecoderThreadCount(const VideoDecoderConfig& config) { 91 | // Only add more threads for those codecs that we know will benefit. 92 | switch (config.codec()) { 93 | case VideoCodec::kUnknown: 94 | - case VideoCodec::kVC1: 95 | - case VideoCodec::kMPEG2: 96 | - case VideoCodec::kHEVC: 97 | - case VideoCodec::kVP9: 98 | - case VideoCodec::kAV1: 99 | - case VideoCodec::kDolbyVision: 100 | // We do not compile ffmpeg with support for any of these codecs. 101 | break; 102 | 103 | @@ -89,6 +83,12 @@ static int GetFFmpegVideoDecoderThreadCount(const VideoDecoderConfig& config) { 104 | break; 105 | 106 | case VideoCodec::kH264: 107 | + case VideoCodec::kVC1: 108 | + case VideoCodec::kMPEG2: 109 | + case VideoCodec::kHEVC: 110 | + case VideoCodec::kVP9: 111 | + case VideoCodec::kAV1: 112 | + case VideoCodec::kDolbyVision: 113 | case VideoCodec::kVP8: 114 | // Normalize to three threads for 1080p content, then scale linearly 115 | // with number of pixels. 116 | -------------------------------------------------------------------------------- /v29.1.4/look_electron_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/build/args/release.gn b/build/args/release.gn 2 | index e5017f6e16..8fdfb71a12 100644 3 | --- a/build/args/release.gn 4 | +++ b/build/args/release.gn 5 | @@ -2,6 +2,20 @@ import("all.gn") 6 | is_component_build = false 7 | is_official_build = true 8 | 9 | +enable_nacl=false 10 | +symbol_level=0 11 | +blink_symbol_level=0 12 | +v8_symbol_level=0 13 | +proprietary_codecs=true 14 | +enable_hevc_parser_and_hw_decoder=true 15 | +enable_platform_hevc=true 16 | +platform_has_optional_hevc_support=true 17 | +enable_platform_ac3_eac3_audio=true 18 | +enable_platform_dolby_vision=true 19 | +enable_platform_ac4_audio=true 20 | +enable_platform_dts_audio=true 21 | +enable_platform_mpeg_h_audio=true 22 | + 23 | # This may be guarded behind is_chrome_branded alongside 24 | # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321, 25 | # explicitly override here to build OpenH264 encoder/FFmpeg decoder. 26 | -------------------------------------------------------------------------------- /v29.1.4/look_ffmpeg_hevc_ac3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h 2 | index 946a48be7d..7bb9724cc5 100644 3 | --- a/chromium/config/Chrome/linux/x64/config.h 4 | +++ b/chromium/config/Chrome/linux/x64/config.h 5 | @@ -1,7 +1,7 @@ 6 | /* Automatically generated by configure - do not modify! */ 7 | #ifndef FFMPEG_CONFIG_H 8 | #define FFMPEG_CONFIG_H 9 | -/* #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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ 10 | +/* #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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- elide long configuration string from binary */ 11 | #define FFMPEG_LICENSE "LGPL version 2.1 or later" 12 | #define CONFIG_THIS_YEAR 2023 13 | #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" 14 | @@ -659,13 +659,13 @@ 15 | #define CONFIG_MUXERS 0 16 | #define CONFIG_PROTOCOLS 0 17 | #define CONFIG_AANDCTTABLES 0 18 | -#define CONFIG_AC3DSP 0 19 | +#define CONFIG_AC3DSP 1 20 | #define CONFIG_ADTS_HEADER 1 21 | #define CONFIG_ATSC_A53 1 22 | #define CONFIG_AUDIO_FRAME_QUEUE 0 23 | #define CONFIG_AUDIODSP 0 24 | #define CONFIG_BLOCKDSP 0 25 | -#define CONFIG_BSWAPDSP 0 26 | +#define CONFIG_BSWAPDSP 1 27 | #define CONFIG_CABAC 1 28 | #define CONFIG_CBS 0 29 | #define CONFIG_CBS_AV1 0 30 | @@ -679,7 +679,7 @@ 31 | #define CONFIG_DEFLATE_WRAPPER 0 32 | #define CONFIG_DIRAC_PARSE 1 33 | #define CONFIG_DNN 0 34 | -#define CONFIG_DOVI_RPU 0 35 | +#define CONFIG_DOVI_RPU 1 36 | #define CONFIG_DVPROFILE 0 37 | #define CONFIG_EVCPARSE 0 38 | #define CONFIG_EXIF 0 39 | @@ -698,8 +698,8 @@ 40 | #define CONFIG_H264PRED 1 41 | #define CONFIG_H264QPEL 1 42 | #define CONFIG_H264_SEI 1 43 | -#define CONFIG_HEVCPARSE 0 44 | -#define CONFIG_HEVC_SEI 0 45 | +#define CONFIG_HEVCPARSE 1 46 | +#define CONFIG_HEVC_SEI 1 47 | #define CONFIG_HPELDSP 1 48 | #define CONFIG_HUFFMAN 0 49 | #define CONFIG_HUFFYUVDSP 0 50 | diff --git a/chromium/config/Chrome/linux/x64/config_components.h b/chromium/config/Chrome/linux/x64/config_components.h 51 | index 132d279fcf..92e1ac0fff 100644 52 | --- a/chromium/config/Chrome/linux/x64/config_components.h 53 | +++ b/chromium/config/Chrome/linux/x64/config_components.h 54 | @@ -10,7 +10,7 @@ 55 | #define CONFIG_DCA_CORE_BSF 0 56 | #define CONFIG_DTS2PTS_BSF 0 57 | #define CONFIG_DV_ERROR_MARKER_BSF 0 58 | -#define CONFIG_EAC3_CORE_BSF 0 59 | +#define CONFIG_EAC3_CORE_BSF 1 60 | #define CONFIG_EXTRACT_EXTRADATA_BSF 0 61 | #define CONFIG_FILTER_UNITS_BSF 0 62 | #define CONFIG_H264_METADATA_BSF 0 63 | @@ -137,7 +137,7 @@ 64 | #define CONFIG_H264_QSV_DECODER 0 65 | #define CONFIG_H264_RKMPP_DECODER 0 66 | #define CONFIG_HAP_DECODER 0 67 | -#define CONFIG_HEVC_DECODER 0 68 | +#define CONFIG_HEVC_DECODER 1 69 | #define CONFIG_HEVC_QSV_DECODER 0 70 | #define CONFIG_HEVC_RKMPP_DECODER 0 71 | #define CONFIG_HEVC_V4L2M2M_DECODER 0 72 | @@ -344,8 +344,8 @@ 73 | #define CONFIG_AAC_DECODER 1 74 | #define CONFIG_AAC_FIXED_DECODER 0 75 | #define CONFIG_AAC_LATM_DECODER 0 76 | -#define CONFIG_AC3_DECODER 0 77 | -#define CONFIG_AC3_FIXED_DECODER 0 78 | +#define CONFIG_AC3_DECODER 1 79 | +#define CONFIG_AC3_FIXED_DECODER 1 80 | #define CONFIG_ACELP_KELVIN_DECODER 0 81 | #define CONFIG_ALAC_DECODER 0 82 | #define CONFIG_ALS_DECODER 0 83 | @@ -376,7 +376,7 @@ 84 | #define CONFIG_DSICINAUDIO_DECODER 0 85 | #define CONFIG_DSS_SP_DECODER 0 86 | #define CONFIG_DST_DECODER 0 87 | -#define CONFIG_EAC3_DECODER 0 88 | +#define CONFIG_EAC3_DECODER 1 89 | #define CONFIG_EVRC_DECODER 0 90 | #define CONFIG_FASTAUDIO_DECODER 0 91 | #define CONFIG_FFWAVESYNTH_DECODER 0 92 | @@ -564,11 +564,11 @@ 93 | #define CONFIG_WEBVTT_DECODER 0 94 | #define CONFIG_XSUB_DECODER 0 95 | #define CONFIG_AAC_AT_DECODER 0 96 | -#define CONFIG_AC3_AT_DECODER 0 97 | +#define CONFIG_AC3_AT_DECODER 1 98 | #define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 99 | #define CONFIG_ALAC_AT_DECODER 0 100 | #define CONFIG_AMR_NB_AT_DECODER 0 101 | -#define CONFIG_EAC3_AT_DECODER 0 102 | +#define CONFIG_EAC3_AT_DECODER 1 103 | #define CONFIG_GSM_MS_AT_DECODER 0 104 | #define CONFIG_ILBC_AT_DECODER 0 105 | #define CONFIG_MP1_AT_DECODER 0 106 | @@ -949,7 +949,7 @@ 107 | #define CONFIG_WMV3_VDPAU_HWACCEL 0 108 | #define CONFIG_AAC_PARSER 1 109 | #define CONFIG_AAC_LATM_PARSER 0 110 | -#define CONFIG_AC3_PARSER 0 111 | +#define CONFIG_AC3_PARSER 1 112 | #define CONFIG_ADX_PARSER 0 113 | #define CONFIG_AMR_PARSER 0 114 | #define CONFIG_AV1_PARSER 0 115 | @@ -978,7 +978,7 @@ 116 | #define CONFIG_H261_PARSER 0 117 | #define CONFIG_H263_PARSER 0 118 | #define CONFIG_H264_PARSER 1 119 | -#define CONFIG_HEVC_PARSER 0 120 | +#define CONFIG_HEVC_PARSER 1 121 | #define CONFIG_HDR_PARSER 0 122 | #define CONFIG_IPU_PARSER 0 123 | #define CONFIG_JPEG2000_PARSER 0 124 | @@ -1611,7 +1611,7 @@ 125 | #define CONFIG_AA_DEMUXER 0 126 | #define CONFIG_AAC_DEMUXER 1 127 | #define CONFIG_AAX_DEMUXER 0 128 | -#define CONFIG_AC3_DEMUXER 0 129 | +#define CONFIG_AC3_DEMUXER 1 130 | #define CONFIG_AC4_DEMUXER 0 131 | #define CONFIG_ACE_DEMUXER 0 132 | #define CONFIG_ACM_DEMUXER 0 133 | @@ -1694,7 +1694,7 @@ 134 | #define CONFIG_DXA_DEMUXER 0 135 | #define CONFIG_EA_DEMUXER 0 136 | #define CONFIG_EA_CDATA_DEMUXER 0 137 | -#define CONFIG_EAC3_DEMUXER 0 138 | +#define CONFIG_EAC3_DEMUXER 1 139 | #define CONFIG_EPAF_DEMUXER 0 140 | #define CONFIG_EVC_DEMUXER 0 141 | #define CONFIG_FFMETADATA_DEMUXER 0 142 | diff --git a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 143 | index cbd7f3945a..1bc1adaf63 100644 144 | --- a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 145 | +++ b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c 146 | @@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { 147 | &ff_pcm_s32le_decoder, 148 | &ff_pcm_u8_decoder, 149 | &ff_libopus_decoder, 150 | + &ff_hevc_decoder, 151 | + &ff_ac3_decoder, 152 | + &ff_eac3_decoder, 153 | + &ff_ac3_fixed_decoder, 154 | NULL }; 155 | diff --git a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 156 | index 50acddb28e..3cade58c41 100644 157 | --- a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 158 | +++ b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c 159 | @@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { 160 | &ff_vp3_parser, 161 | &ff_vp8_parser, 162 | &ff_vp9_parser, 163 | + &ff_hevc_parser, 164 | + &ff_ac3_parser, 165 | NULL }; 166 | diff --git a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 167 | index 920b22bfa7..d6d293dc60 100644 168 | --- a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 169 | +++ b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c 170 | @@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { 171 | &ff_mp3_demuxer, 172 | &ff_ogg_demuxer, 173 | &ff_wav_demuxer, 174 | + &ff_ac3_demuxer, 175 | + &ff_eac3_demuxer, 176 | NULL }; 177 | diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h 178 | index 673e04ac5f..cd1335c2a6 100644 179 | --- a/chromium/config/Chrome/win/x64/config.h 180 | +++ b/chromium/config/Chrome/win/x64/config.h 181 | @@ -1,7 +1,7 @@ 182 | /* Automatically generated by configure - do not modify! */ 183 | #ifndef FFMPEG_CONFIG_H 184 | #define FFMPEG_CONFIG_H 185 | -/* #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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/ffmpeg/chromium/include/win --target-os=win64 --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/27370823e7 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/27370823e7' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ 186 | +/* #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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/ffmpeg/chromium/include/win --target-os=win64 --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/27370823e7 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/27370823e7' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- elide long configuration string from binary */ 187 | #define FFMPEG_LICENSE "LGPL version 2.1 or later" 188 | #define CONFIG_THIS_YEAR 2023 189 | #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" 190 | @@ -659,13 +659,13 @@ 191 | #define CONFIG_MUXERS 0 192 | #define CONFIG_PROTOCOLS 0 193 | #define CONFIG_AANDCTTABLES 0 194 | -#define CONFIG_AC3DSP 0 195 | +#define CONFIG_AC3DSP 1 196 | #define CONFIG_ADTS_HEADER 1 197 | #define CONFIG_ATSC_A53 1 198 | #define CONFIG_AUDIO_FRAME_QUEUE 0 199 | #define CONFIG_AUDIODSP 0 200 | #define CONFIG_BLOCKDSP 0 201 | -#define CONFIG_BSWAPDSP 0 202 | +#define CONFIG_BSWAPDSP 1 203 | #define CONFIG_CABAC 1 204 | #define CONFIG_CBS 0 205 | #define CONFIG_CBS_AV1 0 206 | @@ -679,7 +679,7 @@ 207 | #define CONFIG_DEFLATE_WRAPPER 0 208 | #define CONFIG_DIRAC_PARSE 1 209 | #define CONFIG_DNN 0 210 | -#define CONFIG_DOVI_RPU 0 211 | +#define CONFIG_DOVI_RPU 1 212 | #define CONFIG_DVPROFILE 0 213 | #define CONFIG_EVCPARSE 0 214 | #define CONFIG_EXIF 0 215 | @@ -698,8 +698,8 @@ 216 | #define CONFIG_H264PRED 1 217 | #define CONFIG_H264QPEL 1 218 | #define CONFIG_H264_SEI 1 219 | -#define CONFIG_HEVCPARSE 0 220 | -#define CONFIG_HEVC_SEI 0 221 | +#define CONFIG_HEVCPARSE 1 222 | +#define CONFIG_HEVC_SEI 1 223 | #define CONFIG_HPELDSP 1 224 | #define CONFIG_HUFFMAN 0 225 | #define CONFIG_HUFFYUVDSP 0 226 | diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h 227 | index 132d279fcf..92e1ac0fff 100644 228 | --- a/chromium/config/Chrome/win/x64/config_components.h 229 | +++ b/chromium/config/Chrome/win/x64/config_components.h 230 | @@ -10,7 +10,7 @@ 231 | #define CONFIG_DCA_CORE_BSF 0 232 | #define CONFIG_DTS2PTS_BSF 0 233 | #define CONFIG_DV_ERROR_MARKER_BSF 0 234 | -#define CONFIG_EAC3_CORE_BSF 0 235 | +#define CONFIG_EAC3_CORE_BSF 1 236 | #define CONFIG_EXTRACT_EXTRADATA_BSF 0 237 | #define CONFIG_FILTER_UNITS_BSF 0 238 | #define CONFIG_H264_METADATA_BSF 0 239 | @@ -137,7 +137,7 @@ 240 | #define CONFIG_H264_QSV_DECODER 0 241 | #define CONFIG_H264_RKMPP_DECODER 0 242 | #define CONFIG_HAP_DECODER 0 243 | -#define CONFIG_HEVC_DECODER 0 244 | +#define CONFIG_HEVC_DECODER 1 245 | #define CONFIG_HEVC_QSV_DECODER 0 246 | #define CONFIG_HEVC_RKMPP_DECODER 0 247 | #define CONFIG_HEVC_V4L2M2M_DECODER 0 248 | @@ -344,8 +344,8 @@ 249 | #define CONFIG_AAC_DECODER 1 250 | #define CONFIG_AAC_FIXED_DECODER 0 251 | #define CONFIG_AAC_LATM_DECODER 0 252 | -#define CONFIG_AC3_DECODER 0 253 | -#define CONFIG_AC3_FIXED_DECODER 0 254 | +#define CONFIG_AC3_DECODER 1 255 | +#define CONFIG_AC3_FIXED_DECODER 1 256 | #define CONFIG_ACELP_KELVIN_DECODER 0 257 | #define CONFIG_ALAC_DECODER 0 258 | #define CONFIG_ALS_DECODER 0 259 | @@ -376,7 +376,7 @@ 260 | #define CONFIG_DSICINAUDIO_DECODER 0 261 | #define CONFIG_DSS_SP_DECODER 0 262 | #define CONFIG_DST_DECODER 0 263 | -#define CONFIG_EAC3_DECODER 0 264 | +#define CONFIG_EAC3_DECODER 1 265 | #define CONFIG_EVRC_DECODER 0 266 | #define CONFIG_FASTAUDIO_DECODER 0 267 | #define CONFIG_FFWAVESYNTH_DECODER 0 268 | @@ -564,11 +564,11 @@ 269 | #define CONFIG_WEBVTT_DECODER 0 270 | #define CONFIG_XSUB_DECODER 0 271 | #define CONFIG_AAC_AT_DECODER 0 272 | -#define CONFIG_AC3_AT_DECODER 0 273 | +#define CONFIG_AC3_AT_DECODER 1 274 | #define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 275 | #define CONFIG_ALAC_AT_DECODER 0 276 | #define CONFIG_AMR_NB_AT_DECODER 0 277 | -#define CONFIG_EAC3_AT_DECODER 0 278 | +#define CONFIG_EAC3_AT_DECODER 1 279 | #define CONFIG_GSM_MS_AT_DECODER 0 280 | #define CONFIG_ILBC_AT_DECODER 0 281 | #define CONFIG_MP1_AT_DECODER 0 282 | @@ -949,7 +949,7 @@ 283 | #define CONFIG_WMV3_VDPAU_HWACCEL 0 284 | #define CONFIG_AAC_PARSER 1 285 | #define CONFIG_AAC_LATM_PARSER 0 286 | -#define CONFIG_AC3_PARSER 0 287 | +#define CONFIG_AC3_PARSER 1 288 | #define CONFIG_ADX_PARSER 0 289 | #define CONFIG_AMR_PARSER 0 290 | #define CONFIG_AV1_PARSER 0 291 | @@ -978,7 +978,7 @@ 292 | #define CONFIG_H261_PARSER 0 293 | #define CONFIG_H263_PARSER 0 294 | #define CONFIG_H264_PARSER 1 295 | -#define CONFIG_HEVC_PARSER 0 296 | +#define CONFIG_HEVC_PARSER 1 297 | #define CONFIG_HDR_PARSER 0 298 | #define CONFIG_IPU_PARSER 0 299 | #define CONFIG_JPEG2000_PARSER 0 300 | @@ -1611,7 +1611,7 @@ 301 | #define CONFIG_AA_DEMUXER 0 302 | #define CONFIG_AAC_DEMUXER 1 303 | #define CONFIG_AAX_DEMUXER 0 304 | -#define CONFIG_AC3_DEMUXER 0 305 | +#define CONFIG_AC3_DEMUXER 1 306 | #define CONFIG_AC4_DEMUXER 0 307 | #define CONFIG_ACE_DEMUXER 0 308 | #define CONFIG_ACM_DEMUXER 0 309 | @@ -1694,7 +1694,7 @@ 310 | #define CONFIG_DXA_DEMUXER 0 311 | #define CONFIG_EA_DEMUXER 0 312 | #define CONFIG_EA_CDATA_DEMUXER 0 313 | -#define CONFIG_EAC3_DEMUXER 0 314 | +#define CONFIG_EAC3_DEMUXER 1 315 | #define CONFIG_EPAF_DEMUXER 0 316 | #define CONFIG_EVC_DEMUXER 0 317 | #define CONFIG_FFMETADATA_DEMUXER 0 318 | diff --git a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 319 | index cbd7f3945a..1bc1adaf63 100644 320 | --- a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 321 | +++ b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c 322 | @@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { 323 | &ff_pcm_s32le_decoder, 324 | &ff_pcm_u8_decoder, 325 | &ff_libopus_decoder, 326 | + &ff_hevc_decoder, 327 | + &ff_ac3_decoder, 328 | + &ff_eac3_decoder, 329 | + &ff_ac3_fixed_decoder, 330 | NULL }; 331 | diff --git a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 332 | index 50acddb28e..3cade58c41 100644 333 | --- a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 334 | +++ b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c 335 | @@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { 336 | &ff_vp3_parser, 337 | &ff_vp8_parser, 338 | &ff_vp9_parser, 339 | + &ff_hevc_parser, 340 | + &ff_ac3_parser, 341 | NULL }; 342 | diff --git a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 343 | index 920b22bfa7..d6d293dc60 100644 344 | --- a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 345 | +++ b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c 346 | @@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { 347 | &ff_mp3_demuxer, 348 | &ff_ogg_demuxer, 349 | &ff_wav_demuxer, 350 | + &ff_ac3_demuxer, 351 | + &ff_eac3_demuxer, 352 | NULL }; 353 | diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py 354 | index f1ed4ce144..ae99363826 100755 355 | --- a/chromium/scripts/build_ffmpeg.py 356 | +++ b/chromium/scripts/build_ffmpeg.py 357 | @@ -1013,9 +1013,9 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, 358 | 359 | # Google Chrome & ChromeOS specific configuration. 360 | configure_flags['Chrome'].extend([ 361 | - '--enable-decoder=aac,h264', 362 | - '--enable-demuxer=aac', 363 | - '--enable-parser=aac,h264', 364 | + '--enable-decoder=aac,h264,mp3,eac3,ac3,hevc,mpeg4,mpegvideo,mp2,mp1,flac', 365 | + '--enable-demuxer=aac,mp3,mov,dtshd,dts,avi,mpegvideo,m4v,h264,vc1,flac', 366 | + '--enable-parser=aac,h264,mpegaudio,mpeg4video,mpegvideo,ac3,h261,vc1,h263,flac', 367 | ]) 368 | 369 | # Google ChromeOS specific configuration. 370 | diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni 371 | index ce648b73f8..6064f8d302 100644 372 | --- a/ffmpeg_generated.gni 373 | +++ b/ffmpeg_generated.gni 374 | @@ -397,6 +397,54 @@ if ((use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_con 375 | } 376 | 377 | if ((is_apple) || (is_win) || (use_linux_config)) { 378 | + ## HERE!!!! 379 | + ffmpeg_c_sources += [ 380 | + "libavcodec/autorename_libavcodec_bswapdsp.c", 381 | + "libavcodec/dovi_rpu.c", 382 | + "libavcodec/dynamic_hdr_vivid.c", 383 | + "libavcodec/hevc_cabac.c", 384 | + "libavcodec/hevc_data.c", 385 | + "libavcodec/hevc_filter.c", 386 | + "libavcodec/hevc_mvs.c", 387 | + "libavcodec/hevc_parse.c", 388 | + "libavcodec/hevc_parser.c", 389 | + "libavcodec/hevc_ps.c", 390 | + "libavcodec/hevc_refs.c", 391 | + "libavcodec/hevc_sei.c", 392 | + "libavcodec/hevcdec.c", 393 | + "libavcodec/hevcdsp.c", 394 | + "libavcodec/hevcpred.c", 395 | + "libavcodec/x86/ac3dsp_init.c", 396 | + "libavcodec/ac3dsp.c", 397 | + "libavcodec/fmtconvert.c", 398 | + "libavcodec/ac3tab.c", 399 | + "libavcodec/ac3dec_float.c", 400 | + "libavcodec/ac3.c", 401 | + "libavcodec/x86/fmtconvert_init.c", 402 | + "libavcodec/ac3dec_data.c", 403 | + "libavcodec/eac3dec.c", 404 | + "libavcodec/eac3_data.c", 405 | + "libavcodec/ac3dec_fixed.c", 406 | + "libavformat/ac3dec.c", 407 | + ] 408 | + 409 | + ffmpeg_c_sources += [ 410 | + "libavcodec/x86/bswapdsp_init.c", 411 | + "libavcodec/x86/hevcdsp_init.c" 412 | + ] 413 | + 414 | + ffmpeg_asm_sources += [ 415 | + "libavcodec/x86/bswapdsp.asm", 416 | + "libavcodec/x86/hevc_add_res.asm", 417 | + "libavcodec/x86/hevc_deblock.asm", 418 | + "libavcodec/x86/hevc_idct.asm", 419 | + "libavcodec/x86/hevc_mc.asm", 420 | + "libavcodec/x86/hevc_sao.asm", 421 | + "libavcodec/x86/hevc_sao_10bit.asm", 422 | + "libavcodec/x86/ac3dsp.asm", 423 | + "libavcodec/x86/ac3dsp_downmix.asm", 424 | + "libavcodec/x86/fmtconvert.asm", 425 | + ] 426 | ffmpeg_c_sources += [ 427 | "libavcodec/autorename_libavcodec_videodsp.c", 428 | "libavcodec/h264pred.c", 429 | --------------------------------------------------------------------------------