Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits: 074ba6e7 by Tristan Matthews at 2021-10-21T11:44:14+00:00 contrib: aom: update to 3.2.0 - - - - - 0f9bb18b by Tristan Matthews at 2021-10-21T11:44:14+00:00 codec: aom: update cpu-used range for 3.2.0 - - - - - 3 changed files: - contrib/src/aom/SHA512SUMS - contrib/src/aom/rules.mak - modules/codec/aom.c Changes: ===================================== contrib/src/aom/SHA512SUMS ===================================== @@ -1 +1 @@ -80db4807a1551c50b55189c42e07495fe801faf4b42a197cfb922a6bebf2f72a01d974f4b3fb07f1d718278804618cf4aebca8719526b2c501e65f18e9d1038d libaom-3.1.3.tar.gz +649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19 libaom-3.2.0.tar.gz ===================================== contrib/src/aom/rules.mak ===================================== @@ -1,5 +1,5 @@ # aom -AOM_VERSION := 3.1.3 +AOM_VERSION := 3.2.0 AOM_URL := https://storage.googleapis.com/aom-releases/libaom-$(AOM_VERSION).tar.gz PKGS += aom ===================================== modules/codec/aom.c ===================================== @@ -60,6 +60,12 @@ static const char *const ppsz_enc_bitdepth_text [] = { N_("8 bpp"), N_("10 bpp"), N_("12 bpp") }; #endif +/* Range of values for cpu-used was increased to 10 in libaom 3.2.0 */ +static bool aom_has_max_speed_10() +{ + return aom_codec_version() >= 197120; +} + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -86,7 +92,7 @@ vlc_module_begin () add_integer( SOUT_CFG_PREFIX "tile-columns", 0, "Tile Columns (in log2 units)", NULL ) change_integer_range( 0, 6 ) /* 1 << 6 == MAX_TILE_COLS */ add_integer( SOUT_CFG_PREFIX "cpu-used", 1, "Speed setting", NULL ) - change_integer_range( 0, 8 ) /* good: 0-5, realtime: 6-8 */ + change_integer_range( 0, aom_has_max_speed_10() ? 10 : 8 ) /* good: 0-5, realtime: 6-8 (or 10 for libaom >= 3.2.0) */ add_integer( SOUT_CFG_PREFIX "lag-in-frames", 16, "Maximum number of lookahead frames", NULL ) change_integer_range(0, 70 /* MAX_LAG_BUFFERS + MAX_LAP_BUFFERS */ ) add_integer( SOUT_CFG_PREFIX "usage", 0, "Usage (0: good, 1: realtime)", NULL ) @@ -540,6 +546,12 @@ static int OpenEncoder(vlc_object_t *p_this) #endif int i_cpu_used = var_InheritInteger( p_enc, SOUT_CFG_PREFIX "cpu-used" ); + if( aom_has_max_speed_10() && i_cpu_used == 10 && enccfg.g_usage != AOM_USAGE_REALTIME ) + { + msg_Warn( p_enc, "CPU speed 10 only valid for realtime, clamping to 9" ); + i_cpu_used = 9; + } + if (aom_codec_control(ctx, AOME_SET_CPUUSED, i_cpu_used)) { AOM_ERR(p_this, ctx, "Failed to set cpu-used"); View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e2c81a8afa8f80fb9db8bdf2a2db775e6cf49fb9...0f9bb18bc93423ff1775b0b2f9060c9ffe246277 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e2c81a8afa8f80fb9db8bdf2a2db775e6cf49fb9...0f9bb18bc93423ff1775b0b2f9060c9ffe246277 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
