Closed Bug 1744644 Opened 3 years ago Closed 3 years ago

Cleanup commented out usage of kIsLibaomAv1{En|De}coderSupported in third_party/libwebrtc/media/engine/internal_{en|de}coder_factory.cc

Categories

(Core :: WebRTC, task, P2)

task

Tracking

()

RESOLVED FIXED
97 Branch
Tracking Status
firefox97 --- fixed

People

(Reporter: mjf, Assigned: mjf)

References

Details

Attachments

(5 files)

In ef548d7758c7 Disable creating av1 encoder and decoder third_party/libwebrtc/media/engine/internal_decoder_factory.cc kIsLibaomAv1DecoderSupported usage is commented out.
In third_party/libwebrtc/media/engine/internal_encoder_factory.cc kIsLibaomAv1EncoderSupported usage is commented out.

If we properly set enable_libaom here it will instead us
libaom_av1_decoder_absent.cc and libaom_av1_encoder_absent.cc. Each of these returns null, preserving the current behavior of internal_{en|de}coder_factory.cc.

Assignee: nobody → mfroman
Severity: -- → S3
Priority: -- → P2
Blocks: 1738923

For some reason, third_party/libwebrtc/rtc_base/timeutils_gn/moz.build was
in an odd state after our final merge where each of the platforms contained
DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
instead of having that define at the top level across all platforms. After
re-running the generation on each platform (macOS/Linux/Win), all platforms
ended with this file in the same state with the define at the top.

This restores the contents of these 2 files to match moz_libwebrtc
versions. The changes we're reverting were made simply to help
get the project compiling, but there is a more official way to
accomplish the same thing (see the next patch).

Depends on D133405

This change results in using libaom_av1_decoder_absent.cc and
libaom_av1_encoder_absent.cc.

When using the libaom_av1_{en|de}coder_absent.cc files, we don't
need scalable_video_controller as a dependency.

Both of these changes should be upstreamable.

Depends on D133406

Depends on D133407

Depends on D133408

Pushed by mfroman@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/6eed9b1dfa1d
regenerate build files in third_party/libwebrtc as baseline. r=ng
https://hg.mozilla.org/integration/autoland/rev/1c31dce53dff
restore 2 files to match moz_libwebrtc versions. r=ng
https://hg.mozilla.org/integration/autoland/rev/4424fcfae2bf
set enable_liboam to false for mozilla builds. r=ng
https://hg.mozilla.org/integration/autoland/rev/724151aa470d
json file updates. r=ng
https://hg.mozilla.org/integration/autoland/rev/38c455e19287
moz.build updates. r=ng
Regressions: 1747862
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: