Merge "Modify the frame context memory deallocation"
This commit is contained in:
commit
bf44117d5f
@ -151,6 +151,7 @@ const DecodeParam kMultiThreadedVP9InvalidFileTests[] = {
|
|||||||
{4, "invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm"},
|
{4, "invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm"},
|
||||||
{4, "invalid-"
|
{4, "invalid-"
|
||||||
"vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf"},
|
"vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf"},
|
||||||
|
{4, "invalid-vp90-2-08-tile_1x8_frame_parallel.webm.ivf.s288_r01-05_b6-.ivf"},
|
||||||
{2, "invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf"},
|
{2, "invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf"},
|
||||||
{4, "invalid-vp90-2-09-subpixel-00.ivf.s19552_r01-05_b6-.v2.ivf"},
|
{4, "invalid-vp90-2-09-subpixel-00.ivf.s19552_r01-05_b6-.v2.ivf"},
|
||||||
};
|
};
|
||||||
|
@ -695,6 +695,8 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-05-resize.ivf.s59293_r0
|
|||||||
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-05-resize.ivf.s59293_r01-05_b6-.ivf.res
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-05-resize.ivf.s59293_r01-05_b6-.ivf.res
|
||||||
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf
|
||||||
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf.res
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf.res
|
||||||
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x8_frame_parallel.webm.ivf.s288_r01-05_b6-.ivf
|
||||||
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x8_frame_parallel.webm.ivf.s288_r01-05_b6-.ivf.res
|
||||||
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm
|
||||||
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm.res
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm.res
|
||||||
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf
|
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf
|
||||||
|
@ -706,6 +706,8 @@ c12918cf0a716417fba2de35c3fc5ab90e52dfce vp90-2-18-resize.ivf.md5
|
|||||||
717da707afcaa1f692ff1946f291054eb75a4f06 screendata.y4m
|
717da707afcaa1f692ff1946f291054eb75a4f06 screendata.y4m
|
||||||
b7c1296630cdf1a7ef493d15ff4f9eb2999202f6 invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf
|
b7c1296630cdf1a7ef493d15ff4f9eb2999202f6 invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf
|
||||||
0a3884edb3fd8f9d9b500223e650f7de257b67d8 invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf.res
|
0a3884edb3fd8f9d9b500223e650f7de257b67d8 invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf.res
|
||||||
|
359e138dfb66863828397b77000ea7a83c844d02 invalid-vp90-2-08-tile_1x8_frame_parallel.webm.ivf.s288_r01-05_b6-.ivf
|
||||||
|
bbd33de01c17b165b4ce00308e8a19a942023ab8 invalid-vp90-2-08-tile_1x8_frame_parallel.webm.ivf.s288_r01-05_b6-.ivf.res
|
||||||
fac89b5735be8a86b0dc05159f996a5c3208ae32 invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf
|
fac89b5735be8a86b0dc05159f996a5c3208ae32 invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf
|
||||||
0a3884edb3fd8f9d9b500223e650f7de257b67d8 invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf.res
|
0a3884edb3fd8f9d9b500223e650f7de257b67d8 invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf.res
|
||||||
4506dfdcdf8ee4250924b075a0dcf1f070f72e5a invalid-vp90-2-09-subpixel-00.ivf.s19552_r01-05_b6-.v2.ivf
|
4506dfdcdf8ee4250924b075a0dcf1f070f72e5a invalid-vp90-2-09-subpixel-00.ivf.s19552_r01-05_b6-.v2.ivf
|
||||||
|
@ -145,6 +145,11 @@ void vp9_remove_common(VP9_COMMON *cm) {
|
|||||||
vp9_free_ref_frame_buffers(cm);
|
vp9_free_ref_frame_buffers(cm);
|
||||||
vp9_free_context_buffers(cm);
|
vp9_free_context_buffers(cm);
|
||||||
vp9_free_internal_frame_buffers(&cm->int_frame_buffers);
|
vp9_free_internal_frame_buffers(&cm->int_frame_buffers);
|
||||||
|
|
||||||
|
vpx_free(cm->fc);
|
||||||
|
cm->fc = NULL;
|
||||||
|
vpx_free(cm->frame_contexts);
|
||||||
|
cm->frame_contexts = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void vp9_init_context_buffers(VP9_COMMON *cm) {
|
void vp9_init_context_buffers(VP9_COMMON *cm) {
|
||||||
|
@ -117,11 +117,6 @@ void vp9_decoder_remove(VP9Decoder *pbi) {
|
|||||||
VP9_COMMON *const cm = &pbi->common;
|
VP9_COMMON *const cm = &pbi->common;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
vpx_free(cm->fc);
|
|
||||||
cm->fc = NULL;
|
|
||||||
vpx_free(cm->frame_contexts);
|
|
||||||
cm->frame_contexts = NULL;
|
|
||||||
|
|
||||||
vp9_get_worker_interface()->end(&pbi->lf_worker);
|
vp9_get_worker_interface()->end(&pbi->lf_worker);
|
||||||
vpx_free(pbi->lf_worker.data1);
|
vpx_free(pbi->lf_worker.data1);
|
||||||
vpx_free(pbi->tile_data);
|
vpx_free(pbi->tile_data);
|
||||||
|
@ -201,10 +201,6 @@ static void dealloc_compressor_data(VP9_COMP *cpi) {
|
|||||||
VP9_COMMON *const cm = &cpi->common;
|
VP9_COMMON *const cm = &cpi->common;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
vpx_free(cm->fc);
|
|
||||||
cm->fc = NULL;
|
|
||||||
vpx_free(cm->frame_contexts);
|
|
||||||
cm->frame_contexts = NULL;
|
|
||||||
vpx_free(cpi->tile_data);
|
vpx_free(cpi->tile_data);
|
||||||
cpi->tile_data = NULL;
|
cpi->tile_data = NULL;
|
||||||
|
|
||||||
@ -1733,12 +1729,13 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void vp9_remove_compressor(VP9_COMP *cpi) {
|
void vp9_remove_compressor(VP9_COMP *cpi) {
|
||||||
|
VP9_COMMON *const cm = &cpi->common;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (!cpi)
|
if (!cpi)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (cpi && (cpi->common.current_video_frame > 0)) {
|
if (cpi && (cm->current_video_frame > 0)) {
|
||||||
#if CONFIG_INTERNAL_STATS
|
#if CONFIG_INTERNAL_STATS
|
||||||
|
|
||||||
vp9_clear_system_state();
|
vp9_clear_system_state();
|
||||||
@ -1821,7 +1818,7 @@ void vp9_remove_compressor(VP9_COMP *cpi) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
vp9_remove_common(&cpi->common);
|
vp9_remove_common(cm);
|
||||||
vpx_free(cpi);
|
vpx_free(cpi);
|
||||||
|
|
||||||
#if CONFIG_VP9_TEMPORAL_DENOISING
|
#if CONFIG_VP9_TEMPORAL_DENOISING
|
||||||
|
Loading…
Reference in New Issue
Block a user