Rename JobInfo as GlobalMotionJobInfo The JobInfo struct defined in global_motion.h is renamed GlobalMotionJobInfo. Change-Id: I607d2d647517f80a36eba59d6365d1a625c57dce
diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c index 755535b..3cc8e20 100644 --- a/av1/encoder/ethread.c +++ b/av1/encoder/ethread.c
@@ -2520,7 +2520,7 @@ static AOM_INLINE int get_next_gm_job(AV1_COMP *cpi, int *frame_idx, int cur_dir) { GlobalMotionInfo *gm_info = &cpi->gm_info; - JobInfo *job_info = &cpi->mt_info.gm_sync.job_info; + GlobalMotionJobInfo *job_info = &cpi->mt_info.gm_sync.job_info; int total_refs = gm_info->num_ref_frames[cur_dir]; int8_t cur_frame_to_process = job_info->next_frame_to_process[cur_dir]; @@ -2551,7 +2551,7 @@ AV1_COMP *cpi = thread_data->cpi; GlobalMotionInfo *gm_info = &cpi->gm_info; AV1GlobalMotionSync *gm_sync = &cpi->mt_info.gm_sync; - JobInfo *job_info = &gm_sync->job_info; + GlobalMotionJobInfo *job_info = &gm_sync->job_info; int thread_id = thread_data->thread_id; GlobalMotionData *gm_thread_data = &thread_data->td->gm_data; #if CONFIG_MULTITHREAD @@ -2689,7 +2689,7 @@ // Implements multi-threading for global motion. void av1_global_motion_estimation_mt(AV1_COMP *cpi) { - JobInfo *job_info = &cpi->mt_info.gm_sync.job_info; + GlobalMotionJobInfo *job_info = &cpi->mt_info.gm_sync.job_info; av1_zero(*job_info);
diff --git a/av1/encoder/global_motion.h b/av1/encoder/global_motion.h index de46a0e..dc18940 100644 --- a/av1/encoder/global_motion.h +++ b/av1/encoder/global_motion.h
@@ -58,11 +58,11 @@ // next_frame_to_process[i] will hold the count of next reference frame to be // processed in the direction 'i'. int8_t next_frame_to_process[MAX_DIRECTIONS]; -} JobInfo; +} GlobalMotionJobInfo; typedef struct { // Data related to assigning jobs for global motion multi-threading. - JobInfo job_info; + GlobalMotionJobInfo job_info; #if CONFIG_MULTITHREAD // Mutex lock used while dispatching jobs.