|
Line
Link Here
|
| 0 |
-- /media/base/media.cc |
0 |
++ /media/base/media.cc |
|
Lines 2-7
Link Here
|
| 2 |
// Use of this source code is governed by a BSD-style license that can be |
2 |
// Use of this source code is governed by a BSD-style license that can be |
| 3 |
// found in the LICENSE file. |
3 |
// found in the LICENSE file. |
| 4 |
|
4 |
|
|
|
5 |
#include <limits> |
| 6 |
|
| 5 |
#include "media/base/media.h" |
7 |
#include "media/base/media.h" |
| 6 |
|
8 |
|
| 7 |
#include "base/allocator/buildflags.h" |
9 |
#include "base/allocator/buildflags.h" |
|
Lines 41-47
Link Here
|
| 41 |
|
43 |
|
| 42 |
#if BUILDFLAG(USE_ALLOCATOR_SHIM) |
44 |
#if BUILDFLAG(USE_ALLOCATOR_SHIM) |
| 43 |
// Remove allocation limit from ffmpeg, so calls go down to shim layer. |
45 |
// Remove allocation limit from ffmpeg, so calls go down to shim layer. |
| 44 |
av_max_alloc(0); |
46 |
av_max_alloc(std::numeric_limits<size_t>::max()); |
| 45 |
#endif // BUILDFLAG(USE_ALLOCATOR_SHIM) |
47 |
#endif // BUILDFLAG(USE_ALLOCATOR_SHIM) |
| 46 |
|
48 |
|
| 47 |
#endif // BUILDFLAG(ENABLE_FFMPEG) |
49 |
#endif // BUILDFLAG(ENABLE_FFMPEG) |
| 48 |
-- /third_party/ffmpeg/chromium/dllmain.cc |
50 |
++ /third_party/ffmpeg/chromium/dllmain.cc |
|
Lines 3-8
Link Here
|
| 3 |
// found in the LICENSE file. |
3 |
// found in the LICENSE file. |
| 4 |
|
4 |
|
| 5 |
#include <intrin.h> |
5 |
#include <intrin.h> |
|
|
6 |
#include <limits> |
| 6 |
#include <new.h> |
7 |
#include <new.h> |
| 7 |
#include <stdlib.h> |
8 |
#include <stdlib.h> |
| 8 |
#include <windows.h> |
9 |
#include <windows.h> |
|
Lines 28-34
Link Here
|
| 28 |
if (reason == DLL_PROCESS_ATTACH) { |
29 |
if (reason == DLL_PROCESS_ATTACH) { |
| 29 |
DisableThreadLibraryCalls(instance); |
30 |
DisableThreadLibraryCalls(instance); |
| 30 |
// Remove allocation limit from ffmpeg, so calls go down to shim layer. |
31 |
// Remove allocation limit from ffmpeg, so calls go down to shim layer. |
| 31 |
av_max_alloc(0); |
32 |
av_max_alloc(std::numeric_limits<size_t>::max()); |
| 32 |
// Enable OOM crashes in the shim for all malloc calls that fail. |
33 |
// Enable OOM crashes in the shim for all malloc calls that fail. |
| 33 |
_set_new_mode(1); |
34 |
_set_new_mode(1); |
| 34 |
_set_new_handler(&OnNoMemory); |
35 |
_set_new_handler(&OnNoMemory); |
