generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vpx_codec_enc_init_multi: fix segfault w/vp9

Browse Source 
vp9 does not support multi-res encoding, the request should not crash.

+ encode_api_test: unconditionally expose multi-res test

vpx_codec_enc_init_multi should fail independent of
CONFIG_MULTI_RES_ENCODING if not for the same reason.

Change-Id: I44fc58ef70ee4e0e482cb6a5736885f4cb2a8517
This commit is contained in:
James Zern 2018-01-23 13:01:23 -08:00
parent 8fd648c78a
commit 004fb91416
2 changed files with 68 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/encode_api_test.cc
View File

@ -106,17 +106,28 @@ TEST(EncodeAPI, ImageSizeSetting) {
} }
#endif #endif
#if CONFIG_MULTI_RES_ENCODING
// Set up 2 spatial streams with 2 temporal layers per stream, and generate // Set up 2 spatial streams with 2 temporal layers per stream, and generate
// invalid configuration by setting the temporal layer rate allocation // invalid configuration by setting the temporal layer rate allocation
// (ts_target_bitrate[]) to 0 for both layers. // (ts_target_bitrate[]) to 0 for both layers. This should fail independent of
TEST(EncodeAPI, VP8MultiResEncode) { // CONFIG_MULTI_RES_ENCODING.
TEST(EncodeAPI, MultiResEncode) {
static const vpx_codec_iface_t *kCodecs[] = {
#if CONFIG_VP8_ENCODER
&vpx_codec_vp8_cx_algo,
#endif
#if CONFIG_VP9_ENCODER
&vpx_codec_vp9_cx_algo,
#endif
};
const int width = 1280; const int width = 1280;
const int height = 720; const int height = 720;
const int width_down = width / 2; const int width_down = width / 2;
const int height_down = height / 2; const int height_down = height / 2;
const int target_bitrate = 1000; const int target_bitrate = 1000;
const int framerate = 30; const int framerate = 30;
for (int c = 0; c < NELEMENTS(kCodecs); ++c) {
const vpx_codec_iface_t *const iface = kCodecs[c];
vpx_codec_ctx_t enc[2]; vpx_codec_ctx_t enc[2];
vpx_codec_enc_cfg_t cfg[2]; vpx_codec_enc_cfg_t cfg[2];
vpx_rational_t dsf[2] = { { 2, 1 }, { 2, 1 } }; vpx_rational_t dsf[2] = { { 2, 1 }, { 2, 1 } };
@ -124,7 +135,7 @@ TEST(EncodeAPI, VP8MultiResEncode) {
memset(enc, 0, sizeof(enc)); memset(enc, 0, sizeof(enc));
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
vpx_codec_enc_config_default(vpx_codec_vp8_cx(), &cfg[i], 0); vpx_codec_enc_config_default(iface, &cfg[i], 0);
} }
/* Highest-resolution encoder settings */ /* Highest-resolution encoder settings */
@ -168,14 +179,17 @@ TEST(EncodeAPI, VP8MultiResEncode) {
cfg[i].ts_target_bitrate[1] = 0; cfg[i].ts_target_bitrate[1] = 0;
} }
EXPECT_EQ(VPX_CODEC_INVALID_PARAM, // VP9 should report incapable, VP8 invalid for all configurations.
vpx_codec_enc_init_multi(&enc[0], vpx_codec_vp8_cx(), &cfg[0], 2, 0, const char kVP9Name[] = "WebM Project VP9";
&dsf[0])); const bool is_vp9 = strncmp(kVP9Name, vpx_codec_iface_name(iface),
sizeof(kVP9Name) - 1) == 0;
EXPECT_EQ(is_vp9 ? VPX_CODEC_INCAPABLE : VPX_CODEC_INVALID_PARAM,
vpx_codec_enc_init_multi(&enc[0], iface, &cfg[0], 2, 0, &dsf[0]));
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
vpx_codec_destroy(&enc[i]); vpx_codec_destroy(&enc[i]);
} }
}
} }
#endif
} // namespace } // namespace

2
vpx/src/vpx_encoder.c
View File

@ -84,6 +84,8 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver(
int i; int i;
void *mem_loc = NULL; void *mem_loc = NULL;
if (iface->enc.mr_get_mem_loc == NULL) return VPX_CODEC_INCAPABLE;
if (!(res = iface->enc.mr_get_mem_loc(cfg, &mem_loc))) { if (!(res = iface->enc.mr_get_mem_loc(cfg, &mem_loc))) {
for (i = 0; i < num_enc; i++) { for (i = 0; i < num_enc; i++) {
vpx_codec_priv_enc_mr_cfg_t mr_cfg; vpx_codec_priv_enc_mr_cfg_t mr_cfg;