Yunqing Wang | 8d139f1 | 2020-05-13 17:00:36 -0700 | [diff] [blame] | 1 | README.md {#LREADME} |
| 2 | ========= |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 3 | # AV1 Codec Library |
| 4 | |
Tom Finegan | bca03fc | 2017-12-08 07:47:06 -0800 | [diff] [blame] | 5 | ## Contents |
| 6 | 1. [Building the lib and applications](#building-the-library-and-applications) |
| 7 | - [Prerequisites](#prerequisites) |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 8 | - [Get the code](#get-the-code) |
Tom Finegan | bca03fc | 2017-12-08 07:47:06 -0800 | [diff] [blame] | 9 | - [Basics](#basic-build) |
| 10 | - [Configuration options](#configuration-options) |
| 11 | - [Dylib builds](#dylib-builds) |
| 12 | - [Debugging](#debugging) |
| 13 | - [Cross compiling](#cross-compiling) |
| 14 | - [Sanitizer support](#sanitizers) |
| 15 | - [MSVC builds](#microsoft-visual-studio-builds) |
| 16 | - [Xcode builds](#xcode-builds) |
| 17 | - [Emscripten builds](#emscripten-builds) |
Tom Finegan | aa71f07 | 2018-01-31 06:54:01 -0800 | [diff] [blame] | 18 | - [Extra Build Flags](#extra-build-flags) |
sdeng | 29c6215 | 2019-12-09 12:44:18 -0800 | [diff] [blame] | 19 | - [Build with VMAF support](#build-with-vmaf) |
Tom Finegan | bca03fc | 2017-12-08 07:47:06 -0800 | [diff] [blame] | 20 | 2. [Testing the library](#testing-the-av1-codec) |
| 21 | - [Basics](#testing-basics) |
| 22 | - [Unit tests](#1_unit-tests) |
| 23 | - [Example tests](#2_example-tests) |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 24 | - [Encoder tests](#3_encoder-tests) |
Tom Finegan | bca03fc | 2017-12-08 07:47:06 -0800 | [diff] [blame] | 25 | - [IDE hosted tests](#ide-hosted-tests) |
| 26 | - [Downloading test data](#downloading-the-test-data) |
Wan-Teh Chang | cbf8a79 | 2018-05-11 11:22:06 -0700 | [diff] [blame] | 27 | - [Adding a new test data file](#adding-a-new-test-data-file) |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 28 | - [Additional test data](#additional-test-data) |
Tom Finegan | bca03fc | 2017-12-08 07:47:06 -0800 | [diff] [blame] | 29 | - [Sharded testing](#sharded-testing) |
| 30 | - [Running tests directly](#1_running-test_libaom-directly) |
| 31 | - [Running tests via CMake](#2_running-the-tests-via-the-cmake-build) |
| 32 | 3. [Coding style](#coding-style) |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 33 | 4. [Submitting patches](#submitting-patches) |
| 34 | - [Login cookie](#login-cookie) |
| 35 | - [Contributor agreement](#contributor-agreement) |
| 36 | - [Testing your code](#testing-your-code) |
| 37 | - [Commit message hook](#commit-message-hook) |
| 38 | - [Upload your change](#upload-your-change) |
| 39 | - [Incorporating Reviewer Comments](#incorporating-reviewer-comments) |
| 40 | - [Submitting your change](#submitting-your-change) |
| 41 | - [Viewing change status](#viewing-the-status-of-uploaded-changes) |
| 42 | 5. [Support](#support) |
| 43 | 6. [Bug reports](#bug-reports) |
Tom Finegan | bca03fc | 2017-12-08 07:47:06 -0800 | [diff] [blame] | 44 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 45 | ## Building the library and applications {#building-the-library-and-applications} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 46 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 47 | ### Prerequisites {#prerequisites} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 48 | |
| 49 | 1. [CMake](https://cmake.org) version 3.5 or higher. |
| 50 | 2. [Git](https://git-scm.com/). |
| 51 | 3. [Perl](https://www.perl.org/). |
| 52 | 4. For x86 targets, [yasm](http://yasm.tortall.net/), which is preferred, or a |
Yaowu Xu | 5fc83f3 | 2019-11-05 15:41:05 -0800 | [diff] [blame] | 53 | recent version of [nasm](http://www.nasm.us/). If you download yasm with |
| 54 | the intention to work with Visual Studio, please download win32.exe or |
| 55 | win64.exe and rename it into yasm.exe. DO NOT download or use vsyasm.exe. |
Yunqing Wang | c7c0f27 | 2020-05-08 14:15:09 -0700 | [diff] [blame] | 56 | 5. Building the documentation requires |
| 57 | [doxygen version 1.8.10 or newer](http://doxygen.org). |
Tom Finegan | ff766cd | 2017-06-20 14:18:03 -0700 | [diff] [blame] | 58 | 6. Building the unit tests requires [Python](https://www.python.org/). |
Tom Finegan | 84d3599 | 2017-07-07 10:38:01 -0700 | [diff] [blame] | 59 | 7. Emscripten builds require the portable |
| 60 | [EMSDK](https://kripken.github.io/emscripten-site/index.html). |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 61 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 62 | ### Get the code {#get-the-code} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 63 | |
| 64 | The AV1 library source code is stored in the Alliance for Open Media Git |
| 65 | repository: |
| 66 | |
| 67 | ~~~ |
| 68 | $ git clone https://aomedia.googlesource.com/aom |
| 69 | # By default, the above command stores the source in the aom directory: |
| 70 | $ cd aom |
| 71 | ~~~ |
| 72 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 73 | ### Basic build {#basic-build} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 74 | |
| 75 | CMake replaces the configure step typical of many projects. Running CMake will |
| 76 | produce configuration and build files for the currently selected CMake |
| 77 | generator. For most systems the default generator is Unix Makefiles. The basic |
| 78 | form of a makefile build is the following: |
| 79 | |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 80 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 81 | $ cmake path/to/aom |
| 82 | $ make |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 83 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 84 | |
| 85 | The above will generate a makefile build that produces the AV1 library and |
| 86 | applications for the current host system after the make step completes |
| 87 | successfully. The compiler chosen varies by host platform, but a general rule |
| 88 | applies: On systems where cc and c++ are present in $PATH at the time CMake is |
| 89 | run the generated build will use cc and c++ by default. |
| 90 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 91 | ### Configuration options {#configuration-options} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 92 | |
| 93 | The AV1 codec library has a great many configuration options. These come in two |
| 94 | varieties: |
| 95 | |
| 96 | 1. Build system configuration options. These have the form `ENABLE_FEATURE`. |
| 97 | 2. AV1 codec configuration options. These have the form `CONFIG_FEATURE`. |
| 98 | |
| 99 | Both types of options are set at the time CMake is run. The following example |
Sebastien Alaiwan | 7c524d4 | 2018-01-02 10:10:55 +0100 | [diff] [blame] | 100 | enables ccache and disables the AV1 encoder: |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 101 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 102 | ~~~ |
Sebastien Alaiwan | 7c524d4 | 2018-01-02 10:10:55 +0100 | [diff] [blame] | 103 | $ cmake path/to/aom -DENABLE_CCACHE=1 -DCONFIG_AV1_ENCODER=0 |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 104 | $ make |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 105 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 106 | |
| 107 | The available configuration options are too numerous to list here. Build system |
| 108 | configuration options can be found at the top of the CMakeLists.txt file found |
| 109 | in the root of the AV1 repository, and AV1 codec configuration options can |
| 110 | currently be found in the file `build/cmake/aom_config_defaults.cmake`. |
| 111 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 112 | ### Dylib builds {#dylib-builds} |
Tom Finegan | 84f2d79 | 2017-06-15 23:06:44 -0700 | [diff] [blame] | 113 | |
| 114 | A dylib (shared object) build of the AV1 codec library can be enabled via the |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 115 | CMake built in variable `BUILD_SHARED_LIBS`: |
Tom Finegan | 84f2d79 | 2017-06-15 23:06:44 -0700 | [diff] [blame] | 116 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 117 | ~~~ |
| 118 | $ cmake path/to/aom -DBUILD_SHARED_LIBS=1 |
Tom Finegan | 84f2d79 | 2017-06-15 23:06:44 -0700 | [diff] [blame] | 119 | $ make |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 120 | ~~~ |
Tom Finegan | 84f2d79 | 2017-06-15 23:06:44 -0700 | [diff] [blame] | 121 | |
| 122 | This is currently only supported on non-Windows targets. |
| 123 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 124 | ### Debugging {#debugging} |
Tom Finegan | fe809bd | 2017-09-27 11:54:24 -0700 | [diff] [blame] | 125 | |
| 126 | Depending on the generator used there are multiple ways of going about |
| 127 | debugging AV1 components. For single configuration generators like the Unix |
| 128 | Makefiles generator, setting `CMAKE_BUILD_TYPE` to Debug is sufficient: |
| 129 | |
| 130 | ~~~ |
| 131 | $ cmake path/to/aom -DCMAKE_BUILD_TYPE=Debug |
| 132 | ~~~ |
| 133 | |
| 134 | For Xcode, mainly because configuration controls for Xcode builds are buried two |
Tom Finegan | d77323d | 2017-09-29 09:41:43 -0700 | [diff] [blame] | 135 | configuration windows deep and must be set for each subproject within the Xcode |
| 136 | IDE individually, `CMAKE_CONFIGURATION_TYPES` should be set to Debug: |
Tom Finegan | fe809bd | 2017-09-27 11:54:24 -0700 | [diff] [blame] | 137 | |
| 138 | ~~~ |
| 139 | $ cmake path/to/aom -G Xcode -DCMAKE_CONFIGURATION_TYPES=Debug |
| 140 | ~~~ |
| 141 | |
| 142 | For Visual Studio the in-IDE configuration controls should be used. Simply set |
| 143 | the IDE project configuration to Debug to allow for stepping through the code. |
| 144 | |
| 145 | In addition to the above it can sometimes be useful to debug only C and C++ |
Tom Finegan | d77323d | 2017-09-29 09:41:43 -0700 | [diff] [blame] | 146 | code. To disable all assembly code and intrinsics set `AOM_TARGET_CPU` to |
Tom Finegan | fe809bd | 2017-09-27 11:54:24 -0700 | [diff] [blame] | 147 | generic at generation time: |
| 148 | |
| 149 | ~~~ |
| 150 | $ cmake path/to/aom -DAOM_TARGET_CPU=generic |
| 151 | ~~~ |
| 152 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 153 | ### Cross compiling {#cross-compiling} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 154 | |
| 155 | For the purposes of building the AV1 codec and applications and relative to the |
| 156 | scope of this guide, all builds for architectures differing from the native host |
| 157 | architecture will be considered cross compiles. The AV1 CMake build handles |
| 158 | cross compiling via the use of toolchain files included in the AV1 repository. |
| 159 | The toolchain files available at the time of this writing are: |
| 160 | |
| 161 | - arm64-ios.cmake |
| 162 | - arm64-linux-gcc.cmake |
Martin Storsjo | 6a124ba | 2018-04-13 00:23:38 +0300 | [diff] [blame] | 163 | - arm64-mingw-gcc.cmake |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 164 | - armv7-ios.cmake |
| 165 | - armv7-linux-gcc.cmake |
Martin Storsjo | 6a124ba | 2018-04-13 00:23:38 +0300 | [diff] [blame] | 166 | - armv7-mingw-gcc.cmake |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 167 | - armv7s-ios.cmake |
| 168 | - mips32-linux-gcc.cmake |
| 169 | - mips64-linux-gcc.cmake |
| 170 | - x86-ios-simulator.cmake |
| 171 | - x86-linux.cmake |
| 172 | - x86-macos.cmake |
Tom Finegan | d77323d | 2017-09-29 09:41:43 -0700 | [diff] [blame] | 173 | - x86-mingw-gcc.cmake |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 174 | - x86\_64-ios-simulator.cmake |
Tom Finegan | d77323d | 2017-09-29 09:41:43 -0700 | [diff] [blame] | 175 | - x86\_64-mingw-gcc.cmake |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 176 | |
| 177 | The following example demonstrates use of the x86-macos.cmake toolchain file on |
| 178 | a x86\_64 MacOS host: |
| 179 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 180 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 181 | $ cmake path/to/aom \ |
| 182 | -DCMAKE_TOOLCHAIN_FILE=path/to/aom/build/cmake/toolchains/x86-macos.cmake |
| 183 | $ make |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 184 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 185 | |
| 186 | To build for an unlisted target creation of a new toolchain file is the best |
| 187 | solution. The existing toolchain files can be used a starting point for a new |
| 188 | toolchain file since each one exposes the basic requirements for toolchain files |
| 189 | as used in the AV1 codec build. |
| 190 | |
| 191 | As a temporary work around an unoptimized AV1 configuration that builds only C |
| 192 | and C++ sources can be produced using the following commands: |
| 193 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 194 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 195 | $ cmake path/to/aom -DAOM_TARGET_CPU=generic |
| 196 | $ make |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 197 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 198 | |
| 199 | In addition to the above it's important to note that the toolchain files |
| 200 | suffixed with gcc behave differently than the others. These toolchain files |
| 201 | attempt to obey the $CROSS environment variable. |
| 202 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 203 | ### Sanitizers {#sanitizers} |
Tom Finegan | 8a30baf | 2017-09-13 11:35:34 -0700 | [diff] [blame] | 204 | |
| 205 | Sanitizer integration is built-in to the CMake build system. To enable a |
| 206 | sanitizer, add `-DSANITIZE=<type>` to the CMake command line. For example, to |
| 207 | enable address sanitizer: |
| 208 | |
| 209 | ~~~ |
| 210 | $ cmake path/to/aom -DSANITIZE=address |
| 211 | $ make |
| 212 | ~~~ |
| 213 | |
| 214 | Sanitizers available vary by platform, target, and compiler. Consult your |
| 215 | compiler documentation to determine which, if any, are available. |
| 216 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 217 | ### Microsoft Visual Studio builds {#microsoft-visual-studio-builds} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 218 | |
Wan-Teh Chang | 64545cb | 2018-11-14 08:47:44 -0800 | [diff] [blame] | 219 | Building the AV1 codec library in Microsoft Visual Studio is supported. Visual |
Wan-Teh Chang | 758ac37 | 2020-01-31 15:43:51 -0800 | [diff] [blame] | 220 | Studio 2017 (15.0) or later is required. The following example demonstrates |
Wan-Teh Chang | 64545cb | 2018-11-14 08:47:44 -0800 | [diff] [blame] | 221 | generating projects and a solution for the Microsoft IDE: |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 222 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 223 | ~~~ |
Wan-Teh Chang | 758ac37 | 2020-01-31 15:43:51 -0800 | [diff] [blame] | 224 | # This does not require a bash shell; Command Prompt (cmd.exe) is fine. |
Wan-Teh Chang | d352715 | 2020-03-31 15:48:31 -0700 | [diff] [blame] | 225 | # This assumes the build host is a Windows x64 computer. |
| 226 | |
| 227 | # To build with Visual Studio 2019 for the x64 target: |
Wan-Teh Chang | 758ac37 | 2020-01-31 15:43:51 -0800 | [diff] [blame] | 228 | $ cmake path/to/aom -G "Visual Studio 16 2019" |
| 229 | $ cmake --build . |
Wan-Teh Chang | d352715 | 2020-03-31 15:48:31 -0700 | [diff] [blame] | 230 | |
| 231 | # To build with Visual Studio 2019 for the 32-bit x86 target: |
| 232 | $ cmake path/to/aom -G "Visual Studio 16 2019" -A Win32 |
| 233 | $ cmake --build . |
| 234 | |
| 235 | # To build with Visual Studio 2017 for the x64 target: |
| 236 | $ cmake path/to/aom -G "Visual Studio 15 2017" -T host=x64 -A x64 |
| 237 | $ cmake --build . |
| 238 | |
| 239 | # To build with Visual Studio 2017 for the 32-bit x86 target: |
| 240 | $ cmake path/to/aom -G "Visual Studio 15 2017" -T host=x64 |
| 241 | $ cmake --build . |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 242 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 243 | |
Wan-Teh Chang | 64545cb | 2018-11-14 08:47:44 -0800 | [diff] [blame] | 244 | NOTE: The build system targets Windows 7 or later by compiling files with |
| 245 | `-D_WIN32_WINNT=0x0601`. |
| 246 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 247 | ### Xcode builds {#xcode-builds} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 248 | |
| 249 | Building the AV1 codec library in Xcode is supported. The following example |
| 250 | demonstrates generating an Xcode project: |
| 251 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 252 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 253 | $ cmake path/to/aom -G Xcode |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 254 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 255 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 256 | ### Emscripten builds {#emscripten-builds} |
Tom Finegan | 84d3599 | 2017-07-07 10:38:01 -0700 | [diff] [blame] | 257 | |
| 258 | Building the AV1 codec library with Emscripten is supported. Typically this is |
| 259 | used to hook into the AOMAnalyzer GUI application. These instructions focus on |
| 260 | using the inspector with AOMAnalyzer, but all tools can be built with |
| 261 | Emscripten. |
| 262 | |
| 263 | It is assumed here that you have already downloaded and installed the EMSDK, |
| 264 | installed and activated at least one toolchain, and setup your environment |
| 265 | appropriately using the emsdk\_env script. |
| 266 | |
| 267 | 1. Download [AOMAnalyzer](https://people.xiph.org/~mbebenita/analyzer/). |
| 268 | |
| 269 | 2. Configure the build: |
| 270 | |
| 271 | ~~~ |
| 272 | $ cmake path/to/aom \ |
| 273 | -DENABLE_CCACHE=1 \ |
| 274 | -DAOM_TARGET_CPU=generic \ |
| 275 | -DENABLE_DOCS=0 \ |
Tom Finegan | d9647f2 | 2018-06-19 13:27:57 -0700 | [diff] [blame] | 276 | -DENABLE_TESTS=0 \ |
Tom Finegan | 84d3599 | 2017-07-07 10:38:01 -0700 | [diff] [blame] | 277 | -DCONFIG_ACCOUNTING=1 \ |
| 278 | -DCONFIG_INSPECTION=1 \ |
| 279 | -DCONFIG_MULTITHREAD=0 \ |
| 280 | -DCONFIG_RUNTIME_CPU_DETECT=0 \ |
Tom Finegan | 84d3599 | 2017-07-07 10:38:01 -0700 | [diff] [blame] | 281 | -DCONFIG_WEBM_IO=0 \ |
| 282 | -DCMAKE_TOOLCHAIN_FILE=path/to/emsdk-portable/.../Emscripten.cmake |
| 283 | ~~~ |
| 284 | |
| 285 | 3. Build it: run make if that's your generator of choice: |
| 286 | |
| 287 | ~~~ |
| 288 | $ make inspect |
| 289 | ~~~ |
| 290 | |
| 291 | 4. Run the analyzer: |
| 292 | |
| 293 | ~~~ |
| 294 | # inspect.js is in the examples sub directory of the directory in which you |
| 295 | # executed cmake. |
| 296 | $ path/to/AOMAnalyzer path/to/examples/inspect.js path/to/av1/input/file |
| 297 | ~~~ |
| 298 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 299 | ### Extra build flags {#extra-build-flags} |
Tom Finegan | aa71f07 | 2018-01-31 06:54:01 -0800 | [diff] [blame] | 300 | |
| 301 | Three variables allow for passing of additional flags to the build system. |
| 302 | |
| 303 | - AOM\_EXTRA\_C\_FLAGS |
| 304 | - AOM\_EXTRA\_CXX\_FLAGS |
| 305 | - AOM\_EXTRA\_EXE\_LINKER\_FLAGS |
| 306 | |
| 307 | The build system attempts to ensure the flags passed through the above variables |
| 308 | are passed to tools last in order to allow for override of default behavior. |
| 309 | These flags can be used, for example, to enable asserts in a release build: |
| 310 | |
| 311 | ~~~ |
| 312 | $ cmake path/to/aom \ |
| 313 | -DCMAKE_BUILD_TYPE=Release \ |
| 314 | -DAOM_EXTRA_C_FLAGS=-UNDEBUG \ |
| 315 | -DAOM_EXTRA_CXX_FLAGS=-UNDEBUG |
| 316 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 317 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 318 | ### Build with VMAF support {#build-with-vmaf} |
sdeng | 29c6215 | 2019-12-09 12:44:18 -0800 | [diff] [blame] | 319 | |
| 320 | After installing |
sdeng@google.com | f13555b | 2020-11-30 15:15:54 -0800 | [diff] [blame] | 321 | [libvmaf.a](https://github.com/Netflix/vmaf/tree/master/libvmaf), |
sdeng | 29c6215 | 2019-12-09 12:44:18 -0800 | [diff] [blame] | 322 | you can use it with the encoder: |
| 323 | |
| 324 | ~~~ |
| 325 | $ cmake path/to/aom -DCONFIG_TUNE_VMAF=1 |
| 326 | ~~~ |
| 327 | |
| 328 | Please note that the default VMAF model |
Sai Deng | b53a4d7 | 2021-03-17 15:15:10 -0700 | [diff] [blame] | 329 | ("/usr/local/share/model/vmaf_v0.6.1.json") |
sdeng | 29c6215 | 2019-12-09 12:44:18 -0800 | [diff] [blame] | 330 | will be used unless you set the following flag when running the encoder: |
| 331 | |
| 332 | ~~~ |
| 333 | # --vmaf-model-path=path/to/model |
| 334 | ~~~ |
| 335 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 336 | ## Testing the AV1 codec {#testing-the-av1-codec} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 337 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 338 | ### Testing basics {#testing-basics} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 339 | |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 340 | There are several methods of testing the AV1 codec. All of these methods require |
| 341 | the presence of the AV1 source code and a working build of the AV1 library and |
| 342 | applications. |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 343 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 344 | #### 1. Unit tests: {#1_unit-tests} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 345 | |
| 346 | The unit tests can be run at build time: |
| 347 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 348 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 349 | # Before running the make command the LIBAOM_TEST_DATA_PATH environment |
| 350 | # variable should be set to avoid downloading the test files to the |
| 351 | # cmake build configuration directory. |
| 352 | $ cmake path/to/aom |
| 353 | # Note: The AV1 CMake build creates many test targets. Running make |
| 354 | # with multiple jobs will speed up the test run significantly. |
| 355 | $ make runtests |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 356 | ~~~ |
| 357 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 358 | #### 2. Example tests: {#2_example-tests} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 359 | |
| 360 | The example tests require a bash shell and can be run in the following manner: |
| 361 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 362 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 363 | # See the note above about LIBAOM_TEST_DATA_PATH above. |
| 364 | $ cmake path/to/aom |
| 365 | $ make |
| 366 | # It's best to build the testdata target using many make jobs. |
| 367 | # Running it like this will verify and download (if necessary) |
| 368 | # one at a time, which takes a while. |
| 369 | $ make testdata |
| 370 | $ path/to/aom/test/examples.sh --bin-path examples |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 371 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 372 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 373 | #### 3. Encoder tests: {#3_encoder-tests} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 374 | |
| 375 | When making a change to the encoder run encoder tests to confirm that your |
| 376 | change has a positive or negligible impact on encode quality. When running these |
| 377 | tests the build configuration should be changed to enable internal encoder |
| 378 | statistics: |
| 379 | |
| 380 | ~~~ |
| 381 | $ cmake path/to/aom -DCONFIG_INTERNAL_STATS=1 |
| 382 | $ make |
| 383 | ~~~ |
| 384 | |
| 385 | The repository contains scripts intended to make running these tests as simple |
| 386 | as possible. The following example demonstrates creating a set of baseline clips |
| 387 | for comparison to results produced after making your change to libaom: |
| 388 | |
| 389 | ~~~ |
| 390 | # This will encode all Y4M files in the current directory using the |
| 391 | # settings specified to create the encoder baseline statistical data: |
| 392 | $ cd path/to/test/inputs |
| 393 | # This command line assumes that run_encodes.sh, its helper script |
| 394 | # best_encode.sh, and the aomenc you intend to test are all within a |
| 395 | # directory in your PATH. |
| 396 | $ run_encodes.sh 200 500 50 baseline |
| 397 | ~~~ |
| 398 | |
| 399 | After making your change and creating the baseline clips, you'll need to run |
| 400 | encodes that include your change(s) to confirm that things are working as |
| 401 | intended: |
| 402 | |
| 403 | ~~~ |
| 404 | # This will encode all Y4M files in the current directory using the |
| 405 | # settings specified to create the statistical data for your change: |
| 406 | $ cd path/to/test/inputs |
| 407 | # This command line assumes that run_encodes.sh, its helper script |
| 408 | # best_encode.sh, and the aomenc you intend to test are all within a |
| 409 | # directory in your PATH. |
| 410 | $ run_encodes.sh 200 500 50 mytweak |
| 411 | ~~~ |
| 412 | |
| 413 | After creating both data sets you can use `test/visual_metrics.py` to generate a |
| 414 | report that can be viewed in a web browser: |
| 415 | |
| 416 | ~~~ |
| 417 | $ visual_metrics.py metrics_template.html "*stt" baseline mytweak \ |
| 418 | > mytweak.html |
| 419 | ~~~ |
| 420 | |
| 421 | You can view the report by opening mytweak.html in a web browser. |
| 422 | |
| 423 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 424 | ### IDE hosted tests {#ide-hosted-tests} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 425 | |
| 426 | By default the generated projects files created by CMake will not include the |
| 427 | runtests and testdata rules when generating for IDEs like Microsoft Visual |
| 428 | Studio and Xcode. This is done to avoid intolerably long build cycles in the |
| 429 | IDEs-- IDE behavior is to build all targets when selecting the build project |
| 430 | options in MSVS and Xcode. To enable the test rules in IDEs the |
| 431 | `ENABLE_IDE_TEST_HOSTING` variable must be enabled at CMake generation time: |
| 432 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 433 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 434 | # This example uses Xcode. To get a list of the generators |
| 435 | # available, run cmake with the -G argument missing its |
| 436 | # value. |
| 437 | $ cmake path/to/aom -DENABLE_IDE_TEST_HOSTING=1 -G Xcode |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 438 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 439 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 440 | ### Downloading the test data {#downloading-the-test-data} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 441 | |
| 442 | The fastest and easiest way to obtain the test data is to use CMake to generate |
| 443 | a build using the Unix Makefiles generator, and then to build only the testdata |
| 444 | rule: |
| 445 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 446 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 447 | $ cmake path/to/aom -G "Unix Makefiles" |
| 448 | # 28 is used because there are 28 test files as of this writing. |
| 449 | $ make -j28 testdata |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 450 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 451 | |
| 452 | The above make command will only download and verify the test data. |
| 453 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 454 | ### Adding a new test data file {#adding-a-new-test-data-file} |
Wan-Teh Chang | cbf8a79 | 2018-05-11 11:22:06 -0700 | [diff] [blame] | 455 | |
| 456 | First, add the new test data file to the `aom-test-data` bucket of the |
| 457 | `aomedia-testing` project on Google Cloud Platform. You may need to ask someone |
| 458 | with the necessary access permissions to do this for you. |
| 459 | |
Wan-Teh Chang | ec81dee | 2018-07-24 16:05:39 -0700 | [diff] [blame] | 460 | NOTE: When a new test data file is added to the `aom-test-data` bucket, its |
| 461 | "Public access" is initially "Not public". We need to change its |
Wan-Teh Chang | 4f21f69 | 2018-08-06 14:08:19 -0700 | [diff] [blame] | 462 | "Public access" to "Public" by using the following |
| 463 | [`gsutil`](https://cloud.google.com/storage/docs/gsutil_install) command: |
| 464 | ~~~ |
| 465 | $ gsutil acl ch -g all:R gs://aom-test-data/test-data-file-name |
| 466 | ~~~ |
| 467 | This command grants the `AllUsers` group READ access to the file named |
| 468 | "test-data-file-name" in the `aom-test-data` bucket. |
Wan-Teh Chang | ec81dee | 2018-07-24 16:05:39 -0700 | [diff] [blame] | 469 | |
Wan-Teh Chang | cbf8a79 | 2018-05-11 11:22:06 -0700 | [diff] [blame] | 470 | Once the new test data file has been added to `aom-test-data`, create a CL to |
| 471 | add the name of the new test data file to `test/test_data_util.cmake` and add |
| 472 | the SHA1 checksum of the new test data file to `test/test-data.sha1`. (The SHA1 |
| 473 | checksum of a file can be calculated by running the `sha1sum` command on the |
| 474 | file.) |
| 475 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 476 | ### Additional test data {#additional-test-data} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 477 | |
| 478 | The test data mentioned above is strictly intended for unit testing. |
| 479 | |
| 480 | Additional input data for testing the encoder can be obtained from: |
| 481 | https://media.xiph.org/video/derf/ |
| 482 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 483 | ### Sharded testing {#sharded-testing} |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 484 | |
| 485 | The AV1 codec library unit tests are built upon gtest which supports sharding of |
| 486 | test jobs. Sharded test runs can be achieved in a couple of ways. |
| 487 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 488 | #### 1. Running test\_libaom directly: {#1_running-test_libaom-directly} |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 489 | |
| 490 | ~~~ |
James Zern | 47cd7be | 2018-03-16 18:12:10 -0700 | [diff] [blame] | 491 | # Set the environment variable GTEST_TOTAL_SHARDS to control the number of |
| 492 | # shards. |
| 493 | $ export GTEST_TOTAL_SHARDS=10 |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 494 | # (GTEST shard indexing is 0 based). |
James Zern | 515c869 | 2017-08-30 16:32:28 -0700 | [diff] [blame] | 495 | $ seq 0 $(( $GTEST_TOTAL_SHARDS - 1 )) \ |
| 496 | | xargs -n 1 -P 0 -I{} env GTEST_SHARD_INDEX={} ./test_libaom |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 497 | ~~~ |
| 498 | |
| 499 | To create a test shard for each CPU core available on the current system set |
| 500 | `GTEST_TOTAL_SHARDS` to the number of CPU cores on your system minus one. |
| 501 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 502 | #### 2. Running the tests via the CMake build: {#2_running-the-tests-via-the-cmake-build} |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 503 | |
| 504 | ~~~ |
| 505 | # For IDE based builds, ENABLE_IDE_TEST_HOSTING must be enabled. See |
| 506 | # the IDE hosted tests section above for more information. If the IDE |
| 507 | # supports building targets concurrently tests will be sharded by default. |
| 508 | |
| 509 | # For make and ninja builds the -j parameter controls the number of shards |
| 510 | # at test run time. This example will run the tests using 10 shards via |
| 511 | # make. |
| 512 | $ make -j10 runtests |
| 513 | ~~~ |
| 514 | |
| 515 | The maximum number of test targets that can run concurrently is determined by |
| 516 | the number of CPUs on the system where the build is configured as detected by |
| 517 | CMake. A system with 24 cores can run 24 test shards using a value of 24 with |
| 518 | the `-j` parameter. When CMake is unable to detect the number of cores 10 shards |
| 519 | is the default maximum value. |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 520 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 521 | ## Coding style {#coding-style} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 522 | |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 523 | We are using the Google C Coding Style defined by the |
| 524 | [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html). |
| 525 | |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 526 | The coding style used by this project is enforced with clang-format using the |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 527 | configuration contained in the |
| 528 | [.clang-format](https://chromium.googlesource.com/webm/aom/+/master/.clang-format) |
| 529 | file in the root of the repository. |
| 530 | |
| 531 | You can download clang-format using your system's package manager, or directly |
| 532 | from [llvm.org](http://llvm.org/releases/download.html). You can also view the |
| 533 | [documentation](https://clang.llvm.org/docs/ClangFormat.html) on llvm.org. |
| 534 | Output from clang-format varies by clang-format version, for best results your |
| 535 | version should match the one used on Jenkins. You can find the clang-format |
| 536 | version by reading the comment in the `.clang-format` file linked above. |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 537 | |
| 538 | Before pushing changes for review you can format your code with: |
| 539 | |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 540 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 541 | # Apply clang-format to modified .c, .h and .cc files |
| 542 | $ clang-format -i --style=file \ |
| 543 | $(git diff --name-only --diff-filter=ACMR '*.[hc]' '*.cc') |
Tom Finegan | 007b2ee | 2017-07-11 14:47:06 -0700 | [diff] [blame] | 544 | ~~~ |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 545 | |
| 546 | Check the .clang-format file for the version used to generate it if there is any |
| 547 | difference between your local formatting and the review system. |
| 548 | |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 549 | Some Git installations have clang-format integration. Here are some examples: |
| 550 | |
| 551 | ~~~ |
| 552 | # Apply clang-format to all staged changes: |
| 553 | $ git clang-format |
| 554 | |
| 555 | # Clang format all staged and unstaged changes: |
| 556 | $ git clang-format -f |
| 557 | |
| 558 | # Clang format all staged and unstaged changes interactively: |
| 559 | $ git clang-format -f -p |
| 560 | ~~~ |
| 561 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 562 | ## Submitting patches {#submitting-patches} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 563 | |
| 564 | We manage the submission of patches using the |
| 565 | [Gerrit](https://www.gerritcodereview.com/) code review tool. This tool |
| 566 | implements a workflow on top of the Git version control system to ensure that |
| 567 | all changes get peer reviewed and tested prior to their distribution. |
| 568 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 569 | ### Login cookie {#login-cookie} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 570 | |
| 571 | Browse to [AOMedia Git index](https://aomedia.googlesource.com/) and login with |
| 572 | your account (Gmail credentials, for example). Next, follow the |
| 573 | `Generate Password` Password link at the top of the page. You’ll be given |
| 574 | instructions for creating a cookie to use with our Git repos. |
| 575 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 576 | ### Contributor agreement {#contributor-agreement} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 577 | |
| 578 | You will be required to execute a |
| 579 | [contributor agreement](http://aomedia.org/license) to ensure that the AOMedia |
| 580 | Project has the right to distribute your changes. |
| 581 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 582 | ### Testing your code {#testing-your-code} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 583 | |
| 584 | The testing basics are covered in the [testing section](#testing-the-av1-codec) |
| 585 | above. |
| 586 | |
| 587 | In addition to the local tests, many more (e.g. asan, tsan, valgrind) will run |
| 588 | through Jenkins instances upon upload to gerrit. |
| 589 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 590 | ### Commit message hook {#commit-message-hook} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 591 | |
| 592 | Gerrit requires that each submission include a unique Change-Id. You can assign |
| 593 | one manually using git commit --amend, but it’s easier to automate it with the |
| 594 | commit-msg hook provided by Gerrit. |
| 595 | |
| 596 | Copy commit-msg to the `.git/hooks` directory of your local repo. Here's an |
| 597 | example: |
| 598 | |
| 599 | ~~~ |
| 600 | $ curl -Lo aom/.git/hooks/commit-msg https://chromium-review.googlesource.com/tools/hooks/commit-msg |
| 601 | |
| 602 | # Next, ensure that the downloaded commit-msg script is executable: |
| 603 | $ chmod u+x aom/.git/hooks/commit-msg |
| 604 | ~~~ |
| 605 | |
| 606 | See the Gerrit |
| 607 | [documentation](https://gerrit-review.googlesource.com/Documentation/user-changeid.html) |
| 608 | for more information. |
| 609 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 610 | ### Upload your change {#upload-your-change} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 611 | |
| 612 | The command line to upload your patch looks like this: |
| 613 | |
| 614 | ~~~ |
| 615 | $ git push https://aomedia-review.googlesource.com/aom HEAD:refs/for/master |
| 616 | ~~~ |
| 617 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 618 | ### Incorporating reviewer comments {#incorporating-reviewer-comments} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 619 | |
| 620 | If you previously uploaded a change to Gerrit and the Approver has asked for |
| 621 | changes, follow these steps: |
| 622 | |
| 623 | 1. Edit the files to make the changes the reviewer has requested. |
| 624 | 2. Recommit your edits using the --amend flag, for example: |
| 625 | |
| 626 | ~~~ |
| 627 | $ git commit -a --amend |
| 628 | ~~~ |
| 629 | |
| 630 | 3. Use the same git push command as above to upload to Gerrit again for another |
| 631 | review cycle. |
| 632 | |
| 633 | In general, you should not rebase your changes when doing updates in response to |
| 634 | review. Doing so can make it harder to follow the evolution of your change in |
| 635 | the diff view. |
| 636 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 637 | ### Submitting your change {#submitting-your-change} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 638 | |
| 639 | Once your change has been Approved and Verified, you can “submit” it through the |
| 640 | Gerrit UI. This will usually automatically rebase your change onto the branch |
| 641 | specified. |
| 642 | |
| 643 | Sometimes this can’t be done automatically. If you run into this problem, you |
| 644 | must rebase your changes manually: |
| 645 | |
| 646 | ~~~ |
| 647 | $ git fetch |
| 648 | $ git rebase origin/branchname |
| 649 | ~~~ |
| 650 | |
| 651 | If there are any conflicts, resolve them as you normally would with Git. When |
| 652 | you’re done, reupload your change. |
| 653 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 654 | ### Viewing the status of uploaded changes {#viewing-the-status-of-uploaded-changes} |
Tom Finegan | 9007d34 | 2017-12-14 07:47:13 -0800 | [diff] [blame] | 655 | |
| 656 | To check the status of a change that you uploaded, open |
| 657 | [Gerrit](https://aomedia-review.googlesource.com/), sign in, and click My > |
| 658 | Changes. |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 659 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 660 | ## Support {#support} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 661 | |
| 662 | This library is an open source project supported by its community. Please |
| 663 | please email aomediacodec@jointdevelopment.kavi.com for help. |
| 664 | |
Yunqing Wang | 04caf8b | 2020-05-11 20:52:17 -0700 | [diff] [blame] | 665 | ## Bug reports {#bug-reports} |
Tom Finegan | 9e57db2 | 2017-06-07 07:22:37 -0700 | [diff] [blame] | 666 | |
| 667 | Bug reports can be filed in the Alliance for Open Media |
| 668 | [issue tracker](https://bugs.chromium.org/p/aomedia/issues/list). |