Return status in vp9_extrc_send_firstpass_stats

Bug: webm:1716

Angie Chiang committed 5 years ago

Commit 27f18381 parent f4fc5622 files · +14 −6Browse files

Unified · Split

2 files

   rc_frame_stats->count = stats->count;
 }
-void vp9_extrc_send_firstpass_stats(EXT_RATECTRL *ext_ratectrl,
+vpx_codec_err_t vp9_extrc_send_firstpass_stats(
-                                    const FIRST_PASS_INFO *first_pass_info) {
+    EXT_RATECTRL *ext_ratectrl, const FIRST_PASS_INFO *first_pass_info) {
+  if (ext_ratectrl == NULL) {
+    return VPX_CODEC_ERROR;
+  }
   if (ext_ratectrl->ready) {
+    vpx_rc_status_t rc_status;
     vpx_rc_firstpass_stats_t *rc_firstpass_stats =
         &ext_ratectrl->rc_firstpass_stats;
     int i;
       gen_rc_firstpass_stats(&first_pass_info->stats[i],
                              &rc_firstpass_stats->frame_stats[i]);
     }
-    ext_ratectrl->funcs.send_firstpass_stats(ext_ratectrl->model,
+    rc_status = ext_ratectrl->funcs.send_firstpass_stats(ext_ratectrl->model,
-                                             rc_firstpass_stats);
+                                                         rc_firstpass_stats);
+    if (rc_status == VPX_RC_ERROR) {
+      return VPX_CODEC_ERROR;
+    }
   }
+  return VPX_CODEC_OK;
 }
 static int extrc_get_frame_type(FRAME_UPDATE_TYPE update_type) {

@@ -30,8 +30,8 @@ vpx_codec_err_t vp9_extrc_create(vpx_rc_funcs_t funcs, · 29 unmodified lines
30		30
31	vpx_codec_err_t vp9_extrc_delete(EXT_RATECTRL *ext_ratectrl);	31	vpx_codec_err_t vp9_extrc_delete(EXT_RATECTRL *ext_ratectrl);
32		32
33	void vp9_extrc_send_firstpass_stats(EXT_RATECTRL *ext_ratectrl,	33	vpx_codec_err_t vp9_extrc_send_firstpass_stats(
34	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	void 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,

Keyboard shortcuts