LineageOS/android_external_libvpx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "vp9 svc example: use CONFIG_VP9_DECODER guarding decoding."

Browse Source
This commit is contained in:
Jerome Jiang
2019-03-05 22:50:39 +00:00
committed by Gerrit Code Review
parent a8a6f86e58 269b36ef43
commit d64e328624
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/vp9_spatial_svc_encoder.c
View File

@@ -749,7 +749,7 @@ static void set_frame_flags_bypass_mode_ex1(
} }
} }
#if CONFIG_DECODERS #if CONFIG_VP9_DECODER
static void test_decode(vpx_codec_ctx_t *encoder, vpx_codec_ctx_t *decoder, static void test_decode(vpx_codec_ctx_t *encoder, vpx_codec_ctx_t *decoder,
const int frames_out, int *mismatch_seen) { const int frames_out, int *mismatch_seen) {
vpx_image_t enc_img, dec_img; vpx_image_t enc_img, dec_img;
@@ -924,7 +924,7 @@ int main(int argc, const char **argv) {
#if CONFIG_INTERNAL_STATS #if CONFIG_INTERNAL_STATS
FILE *f = fopen("opsnr.stt", "a"); FILE *f = fopen("opsnr.stt", "a");
#endif #endif
#if CONFIG_DECODERS #if CONFIG_VP9_DECODER
int mismatch_seen = 0; int mismatch_seen = 0;
vpx_codec_ctx_t decoder; vpx_codec_ctx_t decoder;
#endif #endif
@@ -964,7 +964,7 @@ int main(int argc, const char **argv) {
if (vpx_svc_init(&svc_ctx, &encoder, vpx_codec_vp9_cx(), &enc_cfg) != if (vpx_svc_init(&svc_ctx, &encoder, vpx_codec_vp9_cx(), &enc_cfg) !=
VPX_CODEC_OK) VPX_CODEC_OK)
die("Failed to initialize encoder\n"); die("Failed to initialize encoder\n");
#if CONFIG_DECODERS #if CONFIG_VP9_DECODER
if (vpx_codec_dec_init( if (vpx_codec_dec_init(
&decoder, get_vpx_decoder_by_name("vp9")->codec_interface(), NULL, 0)) &decoder, get_vpx_decoder_by_name("vp9")->codec_interface(), NULL, 0))
die("Failed to initialize decoder\n"); die("Failed to initialize decoder\n");
@@ -1163,7 +1163,7 @@ int main(int argc, const char **argv) {
if (enc_cfg.ss_number_layers == 1 && enc_cfg.ts_number_layers == 1) if (enc_cfg.ss_number_layers == 1 && enc_cfg.ts_number_layers == 1)
si->bytes_sum[0] += (int)cx_pkt->data.frame.sz; si->bytes_sum[0] += (int)cx_pkt->data.frame.sz;
++frames_received; ++frames_received;
#if CONFIG_DECODERS #if CONFIG_VP9_DECODER
if (vpx_codec_decode(&decoder, cx_pkt->data.frame.buf, if (vpx_codec_decode(&decoder, cx_pkt->data.frame.buf,
(unsigned int)cx_pkt->data.frame.sz, NULL, 0)) (unsigned int)cx_pkt->data.frame.sz, NULL, 0))
die_codec(&decoder, "Failed to decode frame."); die_codec(&decoder, "Failed to decode frame.");
@@ -1178,7 +1178,7 @@ int main(int argc, const char **argv) {
default: { break; } default: { break; }
} }
#if CONFIG_DECODERS #if CONFIG_VP9_DECODER
vpx_codec_control(&encoder, VP9E_GET_SVC_LAYER_ID, &layer_id); vpx_codec_control(&encoder, VP9E_GET_SVC_LAYER_ID, &layer_id);
// Don't look for mismatch on top spatial and top temporal layers as they // Don't look for mismatch on top spatial and top temporal layers as they
// are non reference frames. // are non reference frames.