Commit 750549e1 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Resolve function name conflict (media/filters)

When building using jumbo, files merged and functions with
the same name may end up in the same namespace/scope. This
happens for the function OnError() that gets called by Bind().
OnError() is defined in:
media/filters/audio_video_metadata_extractor.cc
media/filters/media_file_checker.cc

This commit solves the issue by renaming one of the functions
to something more file specific.

Bug: 867350
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I1b762e4f1c4b11751df2302874af53106889d085
Reviewed-on: https://chromium-review.googlesource.com/1151316
Commit-Queue: Chrome Cunningham (In Paris) <chcunningham@chromium.org>
Reviewed-by: default avatarChrome Cunningham (In Paris) <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578592}
parent 69f37c87
...@@ -23,7 +23,7 @@ namespace media { ...@@ -23,7 +23,7 @@ namespace media {
static const int64_t kMaxCheckTimeInSeconds = 5; static const int64_t kMaxCheckTimeInSeconds = 5;
static void OnError(bool* called) { static void OnMediaFileCheckerError(bool* called) {
*called = false; *called = false;
} }
...@@ -39,7 +39,8 @@ MediaFileChecker::~MediaFileChecker() = default; ...@@ -39,7 +39,8 @@ MediaFileChecker::~MediaFileChecker() = default;
bool MediaFileChecker::Start(base::TimeDelta check_time) { bool MediaFileChecker::Start(base::TimeDelta check_time) {
media::FileDataSource source(std::move(file_)); media::FileDataSource source(std::move(file_));
bool read_ok = true; bool read_ok = true;
media::BlockingUrlProtocol protocol(&source, base::Bind(&OnError, &read_ok)); media::BlockingUrlProtocol protocol(
&source, base::Bind(&OnMediaFileCheckerError, &read_ok));
media::FFmpegGlue glue(&protocol); media::FFmpegGlue glue(&protocol);
AVFormatContext* format_context = glue.format_context(); AVFormatContext* format_context = glue.format_context();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment