Merge "VP9_COMMON: remove unused temp_scale_frame"
This commit is contained in:
commit
c3871f8f70
@ -53,7 +53,6 @@ void vp9_free_frame_buffers(VP9_COMMON *oci) {
|
|||||||
for (i = 0; i < NUM_YV12_BUFFERS; i++)
|
for (i = 0; i < NUM_YV12_BUFFERS; i++)
|
||||||
vp9_free_frame_buffer(&oci->yv12_fb[i]);
|
vp9_free_frame_buffer(&oci->yv12_fb[i]);
|
||||||
|
|
||||||
vp9_free_frame_buffer(&oci->temp_scale_frame);
|
|
||||||
vp9_free_frame_buffer(&oci->post_proc_buffer);
|
vp9_free_frame_buffer(&oci->post_proc_buffer);
|
||||||
|
|
||||||
vpx_free(oci->mip);
|
vpx_free(oci->mip);
|
||||||
@ -121,10 +120,6 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) {
|
|||||||
oci->fb_idx_ref_cnt[i] = 1;
|
oci->fb_idx_ref_cnt[i] = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vp9_alloc_frame_buffer(&oci->temp_scale_frame, width, 16, ss_x, ss_y,
|
|
||||||
VP9BORDERINPIXELS) < 0)
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
if (vp9_alloc_frame_buffer(&oci->post_proc_buffer, width, height, ss_x, ss_y,
|
if (vp9_alloc_frame_buffer(&oci->post_proc_buffer, width, height, ss_x, ss_y,
|
||||||
VP9BORDERINPIXELS) < 0)
|
VP9BORDERINPIXELS) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
@ -130,10 +130,7 @@ typedef struct VP9Common {
|
|||||||
struct scale_factors active_ref_scale[ALLOWED_REFS_PER_FRAME];
|
struct scale_factors active_ref_scale[ALLOWED_REFS_PER_FRAME];
|
||||||
int new_fb_idx;
|
int new_fb_idx;
|
||||||
|
|
||||||
|
|
||||||
YV12_BUFFER_CONFIG post_proc_buffer;
|
YV12_BUFFER_CONFIG post_proc_buffer;
|
||||||
YV12_BUFFER_CONFIG temp_scale_frame;
|
|
||||||
|
|
||||||
|
|
||||||
FRAME_TYPE last_frame_type; /* Save last frame's frame type for motion search. */
|
FRAME_TYPE last_frame_type; /* Save last frame's frame type for motion search. */
|
||||||
FRAME_TYPE frame_type;
|
FRAME_TYPE frame_type;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user