Only bug fixes and upstream merges are allowed. If you would like to fix the source code that would benefit upstream as well, please consider sending your patch to WebRTC first.
Try
git remote add upstream https://chromium.googlesource.com/external/webrtc
git fetch upstream
git merge upstream/lkgr
# LKGR = latest known good revision
# https://chromium.googlesource.com/chromiumos/docs/+/master/glossary.md
Delete all directories other than
- common_audio/signal_processing/
- modules/audio_coding/codecs/ilbc/
Cherry pick what's needed from rtc_base/. Update the abseil-cpp submodule.
Always check git status
before committing the merge to make sure
nothing unneeded is added!!!
We try to keep the overlaid changes to a minimum. However, here are a few changes we had to make:
- Add the
ILBC_EXPORT
annotation to various functions in headers - Make the following files #include their header:
- modules/audio_coding/codecs/ilbc/decode.c
- modules/audio_coding/codecs/ilbc/encode.c
- Support a few more platforms in rtc_base/system/arch.h
This packaged library exposes a single header: ilbc.h. Past versions of upstream WebRTC have this header directly, but starting from version 3.0.0 we maintain our own copy of it. Here are some instructions for updating it:
- Start with modules/audio_coding/codecs/ilbc/ilbc.h.
- Add in the macros and structs from modules/audio_coding/codecs/ilbc/defines.h. Delete all macros and structs that were not already previously exposed (e.g., all macros under the "PLC" heading and the iLBC_bits structure).
- Add in the function prototypes from
- modules/audio_coding/codecs/ilbc/init_decode.h
- modules/audio_coding/codecs/ilbc/init_encode.h
- modules/audio_coding/codecs/ilbc/decode.h
- modules/audio_coding/codecs/ilbc/encode.h
- Add a few deprecated typedefs for backwards compatibility.