Add status in vp9_extrc_get_encodeframe_decision

Angie Chiang committed 5 years ago

Commit d8905791 parent 27f18382 files · +11 −3Browse files

Unified · Split

2 files

   }
 }
-void vp9_extrc_get_encodeframe_decision(
+vpx_codec_err_t vp9_extrc_get_encodeframe_decision(
     EXT_RATECTRL *ext_ratectrl, int show_index, int coding_index, int gop_index,
     FRAME_UPDATE_TYPE update_type,
     RefCntBuffer *ref_frame_bufs[MAX_INTER_REF_FRAMES], int ref_frame_flags,
     vpx_rc_encodeframe_decision_t *encode_frame_decision) {
+  if (ext_ratectrl == NULL) {
+    return VPX_CODEC_ERROR;
+  }
   if (ext_ratectrl->ready) {
+    vpx_rc_status_t rc_status;
     vpx_rc_encodeframe_info_t encode_frame_info;
     encode_frame_info.show_index = show_index;
     encode_frame_info.coding_index = coding_index;
                            encode_frame_info.ref_frame_coding_indexes,
                            encode_frame_info.ref_frame_valid_list);
-    ext_ratectrl->funcs.get_encodeframe_decision(
+    rc_status = ext_ratectrl->funcs.get_encodeframe_decision(
         ext_ratectrl->model, &encode_frame_info, encode_frame_decision);
+    if (rc_status == VPX_RC_ERROR) {
+      return VPX_CODEC_ERROR;
+    }
   }
+  return VPX_CODEC_OK;
 }
 void vp9_extrc_update_encodeframe_result(EXT_RATECTRL *ext_ratectrl,

@@ -33,7 +33,7 @@ vpx_codec_err_t vp9_extrc_delete(EXT_RATECTRL *ext_ratectrl); · 32 unmodified lines
33	vpx_codec_err_t vp9_extrc_send_firstpass_stats(	33	vpx_codec_err_t vp9_extrc_send_firstpass_stats(
34	EXT_RATECTRL ext_ratectrl, const FIRST_PASS_INFO first_pass_info);	34	EXT_RATECTRL ext_ratectrl, const FIRST_PASS_INFO first_pass_info);
35		35
36	void vp9_extrc_get_encodeframe_decision(	36	vpx_codec_err_t vp9_extrc_get_encodeframe_decision(
37	EXT_RATECTRL *ext_ratectrl, int show_index, int coding_index, int gop_index,	37	EXT_RATECTRL *ext_ratectrl, int show_index, int coding_index, int gop_index,
38	FRAME_UPDATE_TYPE update_type,	38	FRAME_UPDATE_TYPE update_type,
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,

Keyboard shortcuts