Add return to vp9_extrc_update_encodeframe_result

Angie Chiang committed 5 years ago

Commit d49700e1 parent d8905792 files · +20 −14Browse files

Unified · Split

2 files

   return VPX_CODEC_OK;
 }
-void vp9_extrc_update_encodeframe_result(EXT_RATECTRL *ext_ratectrl,
+vpx_codec_err_t vp9_extrc_update_encodeframe_result(
-                                         int64_t bit_count,
+    EXT_RATECTRL *ext_ratectrl, int64_t bit_count,
-                                         const YV12_BUFFER_CONFIG *source_frame,
+    const YV12_BUFFER_CONFIG *source_frame,
-                                         const YV12_BUFFER_CONFIG *coded_frame,
+    const YV12_BUFFER_CONFIG *coded_frame, uint32_t bit_depth,
-                                         uint32_t bit_depth,
+    uint32_t input_bit_depth) {
-                                         uint32_t input_bit_depth) {
+  if (ext_ratectrl == NULL) {
+    return VPX_CODEC_ERROR;
+  }
   if (ext_ratectrl->ready) {
     PSNR_STATS psnr;
+    vpx_rc_status_t rc_status;
     vpx_rc_encodeframe_result_t encode_frame_result;
     encode_frame_result.bit_count = bit_count;
     encode_frame_result.pixel_count =
     vpx_calc_psnr(source_frame, coded_frame, &psnr);
 #endif
     encode_frame_result.sse = psnr.sse[0];
-    ext_ratectrl->funcs.update_encodeframe_result(ext_ratectrl->model,
+    rc_status = ext_ratectrl->funcs.update_encodeframe_result(
-                                                  &encode_frame_result);
+        ext_ratectrl->model, &encode_frame_result);
+    if (rc_status == VPX_RC_ERROR) {
+      return VPX_CODEC_ERROR;
+    }
   }
+  return VPX_CODEC_OK;
 }

@@ -39,11 +39,10 @@ vpx_codec_err_t vp9_extrc_get_encodeframe_decision( · 38 unmodified lines
39	RefCntBuffer *ref_frame_bufs[MAX_INTER_REF_FRAMES], int ref_frame_flags,	39	RefCntBuffer *ref_frame_bufs[MAX_INTER_REF_FRAMES], int ref_frame_flags,
40	vpx_rc_encodeframe_decision_t *encode_frame_decision);	40	vpx_rc_encodeframe_decision_t *encode_frame_decision);
41		41
42	void vp9_extrc_update_encodeframe_result(EXT_RATECTRL *ext_ratectrl,	42	vpx_codec_err_t vp9_extrc_update_encodeframe_result(
43	int64_t bit_count,	43	EXT_RATECTRL *ext_ratectrl, int64_t bit_count,
44	const YV12_BUFFER_CONFIG *source_frame,	44	const YV12_BUFFER_CONFIG *source_frame,
45	const YV12_BUFFER_CONFIG *coded_frame,	45	const YV12_BUFFER_CONFIG *coded_frame, uint32_t bit_depth,
46	uint32_t bit_depth,	46	uint32_t input_bit_depth);
47	uint32_t input_bit_depth);
48		47
49	#endif // VPX_VP9_ENCODER_VP9_EXT_RATECTRL_H_	48	#endif // VPX_VP9_ENCODER_VP9_EXT_RATECTRL_H_

Keyboard shortcuts