From 749e0c7b2883139afa14b4886bbd6a940d021f4f Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 27 Jun 2014 17:31:01 -0700 Subject: [PATCH] Revert "Revert "Revert 3 patches from Hangyu to get Chrome to build:"" This reverts commit b336356198b8ada50fbb59f04f11cefceaf5ff95. This causes a hang in: VP9/InvalidFileTest.ReturnCode/3 the change to test/user_priv_test.cc remains with a minor update Change-Id: I4a8a272ca37ea329b0f413f0b1cd827a238bd9fd --- test/user_priv_test.cc | 2 +- vp9/decoder/vp9_decoder.c | 9 +- vp9/decoder/vp9_dthread.h | 17 --- vp9/vp9_dx_iface.c | 288 +++++++++++--------------------------- 4 files changed, 83 insertions(+), 233 deletions(-) diff --git a/test/user_priv_test.cc b/test/user_priv_test.cc index f9aef33da..22fce857c 100644 --- a/test/user_priv_test.cc +++ b/test/user_priv_test.cc @@ -78,7 +78,7 @@ string DecodeFile(const string &filename) { ref.idx = rnd.Rand8() % 3; decoder.Control(VP9_GET_REFERENCE, &ref); - CheckUserPrivateData(ref.img.user_priv, &frame_num); + CheckUserPrivateData(ref.img.user_priv, NULL); } md5.Add(img); } diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index 245c5f195..84cb84aec 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -210,10 +210,7 @@ static void swap_frame_buffers(VP9Decoder *pbi) { } cm->frame_to_show = get_frame_new_buffer(cm); - - if (!pbi->frame_parallel_decode || !cm->show_frame) { - --cm->frame_bufs[cm->new_fb_idx].ref_count; - } + cm->frame_bufs[cm->new_fb_idx].ref_count--; // Invalidate these references until the next frame starts. for (ref_index = 0; ref_index < 3; ref_index++) @@ -242,9 +239,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, } // Check if the previous frame was a frame without any references to it. - // Release frame buffer if not decoding in frame parallel mode. - if (!pbi->frame_parallel_decode && cm->new_fb_idx >= 0 - && cm->frame_bufs[cm->new_fb_idx].ref_count == 0) + if (cm->new_fb_idx >= 0 && cm->frame_bufs[cm->new_fb_idx].ref_count == 0) cm->release_fb_cb(cm->cb_priv, &cm->frame_bufs[cm->new_fb_idx].raw_frame_buffer); cm->new_fb_idx = get_free_fb(cm); diff --git a/vp9/decoder/vp9_dthread.h b/vp9/decoder/vp9_dthread.h index 01c07f1a0..a727e2aef 100644 --- a/vp9/decoder/vp9_dthread.h +++ b/vp9/decoder/vp9_dthread.h @@ -40,23 +40,6 @@ typedef struct VP9LfSyncData { int sync_range; } VP9LfSync; -// WorkerData for the FrameWorker thread. It contains all the information of -// the worker and decode structures for decoding a frame. -typedef struct FrameWorkerData { - struct VP9Decoder *pbi; - const uint8_t *data; - const uint8_t *data_end; - size_t data_size; - void *user_priv; - int result; - int worker_id; - - // scratch_buffer is used in frame parallel mode only. - // It is used to make a copy of the compressed data. - uint8_t *scratch_buffer; - size_t scratch_buffer_size; -} FrameWorkerData; - // Allocate memory for loopfilter row synchronization. void vp9_loop_filter_alloc(struct VP9Common *cm, VP9LfSync *lf_sync, int rows, int width); diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index fd868ae73..c3ca7ee8f 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -32,19 +32,15 @@ struct vpx_codec_alg_priv { vpx_codec_priv_t base; vpx_codec_dec_cfg_t cfg; vp9_stream_info_t si; + struct VP9Decoder *pbi; int postproc_cfg_set; vp8_postproc_cfg_t postproc_cfg; vpx_decrypt_cb decrypt_cb; void *decrypt_state; vpx_image_t img; + int img_avail; int invert_tile_order; int frame_parallel_decode; // frame-based threading. - int last_show_frame; // Index of last output frame. - - VP9Worker *frame_workers; - int num_frame_workers; - int next_submit_thread_id; - int next_output_thread_id; // External frame buffer info to save for VP9 common. void *ext_priv; // Private data associated with the external frame buffers. @@ -89,17 +85,11 @@ static vpx_codec_err_t decoder_init(vpx_codec_ctx_t *ctx, } static vpx_codec_err_t decoder_destroy(vpx_codec_alg_priv_t *ctx) { - if (ctx->frame_workers != NULL) { - int i; - for (i = 0; i < ctx->num_frame_workers; ++i) { - VP9Worker *const worker = &ctx->frame_workers[i]; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - vp9_decoder_remove(worker_data->pbi); - vpx_free(worker_data); - } + if (ctx->pbi) { + vp9_decoder_remove(ctx->pbi); + ctx->pbi = NULL; } - vpx_free(ctx->frame_workers); vpx_free(ctx); return VPX_CODEC_OK; @@ -198,42 +188,32 @@ static vpx_codec_err_t decoder_get_si(vpx_codec_alg_priv_t *ctx, return VPX_CODEC_OK; } -static void set_error_detail(vpx_codec_alg_priv_t *ctx, - const char *const error) { - ctx->base.err_detail = error; -} - static vpx_codec_err_t update_error_state(vpx_codec_alg_priv_t *ctx, const struct vpx_internal_error_info *error) { if (error->error_code) - set_error_detail(ctx, error->has_detail ? error->detail : NULL); + ctx->base.err_detail = error->has_detail ? error->detail : NULL; return error->error_code; } static void init_buffer_callbacks(vpx_codec_alg_priv_t *ctx) { - int i; - - for (i = 0; i < ctx->num_frame_workers; ++i) { - VP9Worker *const worker = &ctx->frame_workers[i]; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - VP9_COMMON *const cm = &worker_data->pbi->common; - - cm->new_fb_idx = -1; - if (ctx->get_ext_fb_cb != NULL && ctx->release_ext_fb_cb != NULL) { - cm->get_fb_cb = ctx->get_ext_fb_cb; - cm->release_fb_cb = ctx->release_ext_fb_cb; - cm->cb_priv = ctx->ext_priv; - } else { - cm->get_fb_cb = vp9_get_frame_buffer; - cm->release_fb_cb = vp9_release_frame_buffer; + VP9_COMMON *const cm = &ctx->pbi->common; - if (vp9_alloc_internal_frame_buffers(&cm->int_frame_buffers)) - vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, - "Failed to initialize internal frame buffers"); + cm->new_fb_idx = -1; - cm->cb_priv = &cm->int_frame_buffers; - } + if (ctx->get_ext_fb_cb != NULL && ctx->release_ext_fb_cb != NULL) { + cm->get_fb_cb = ctx->get_ext_fb_cb; + cm->release_fb_cb = ctx->release_ext_fb_cb; + cm->cb_priv = ctx->ext_priv; + } else { + cm->get_fb_cb = vp9_get_frame_buffer; + cm->release_fb_cb = vp9_release_frame_buffer; + + if (vp9_alloc_internal_frame_buffers(&cm->int_frame_buffers)) + vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, + "Failed to initialize internal frame buffers"); + + cm->cb_priv = &cm->int_frame_buffers; } } @@ -252,58 +232,14 @@ static void set_ppflags(const vpx_codec_alg_priv_t *ctx, flags->noise_level = ctx->postproc_cfg.noise_level; } -static int frame_worker_hook(void *arg1, void *arg2) { - FrameWorkerData *const worker_data = (FrameWorkerData *)arg1; - const uint8_t *data = worker_data->data; - (void)arg2; - worker_data->result = vp9_receive_compressed_data(worker_data->pbi, - worker_data->data_size, - &data); - worker_data->data_end = data; - return !worker_data->result; -} - -static vpx_codec_err_t init_decoder(vpx_codec_alg_priv_t *ctx) { - int i; - - ctx->last_show_frame = -1; - ctx->next_submit_thread_id = 0; - ctx->next_output_thread_id = 0; - ctx->num_frame_workers = - (ctx->frame_parallel_decode == 1) ? ctx->cfg.threads: 1; +static void init_decoder(vpx_codec_alg_priv_t *ctx) { + ctx->pbi = vp9_decoder_create(); + if (ctx->pbi == NULL) + return; - ctx->frame_workers = (VP9Worker *) - vpx_malloc(ctx->num_frame_workers * sizeof(*ctx->frame_workers)); - if (ctx->frame_workers == NULL) { - set_error_detail(ctx, "Failed to allocate frame_workers"); - return VPX_CODEC_MEM_ERROR; - } - - for (i = 0; i < ctx->num_frame_workers; ++i) { - VP9Worker *const worker = &ctx->frame_workers[i]; - FrameWorkerData *worker_data = NULL; - vp9_worker_init(worker); - worker->data1 = vpx_memalign(32, sizeof(FrameWorkerData)); - if (worker->data1 == NULL) { - set_error_detail(ctx, "Failed to allocate worker_data"); - return VPX_CODEC_MEM_ERROR; - } - worker_data = (FrameWorkerData *)worker->data1; - worker_data->pbi = vp9_decoder_create(); - if (worker_data->pbi == NULL) { - set_error_detail(ctx, "Failed to allocate worker_data"); - return VPX_CODEC_MEM_ERROR; - } - - // If decoding in serial mode, FrameWorker thread could create tile worker - // thread or loopfilter thread. - worker_data->pbi->max_threads = - (ctx->frame_parallel_decode == 0) ? ctx->cfg.threads : 0; - - worker_data->pbi->inv_tile_order = ctx->invert_tile_order; - worker_data->pbi->frame_parallel_decode = ctx->frame_parallel_decode; - worker->hook = (VP9WorkerHook)frame_worker_hook; - } + ctx->pbi->max_threads = ctx->cfg.threads; + ctx->pbi->inv_tile_order = ctx->invert_tile_order; + ctx->pbi->frame_parallel_decode = ctx->frame_parallel_decode; // If postprocessing was enabled by the application and a // configuration has not been provided, default it. @@ -312,16 +248,20 @@ static vpx_codec_err_t init_decoder(vpx_codec_alg_priv_t *ctx) { set_default_ppflags(&ctx->postproc_cfg); init_buffer_callbacks(ctx); - - return VPX_CODEC_OK; } static vpx_codec_err_t decode_one(vpx_codec_alg_priv_t *ctx, const uint8_t **data, unsigned int data_sz, void *user_priv, int64_t deadline) { - vp9_ppflags_t flags = {0}; + YV12_BUFFER_CONFIG sd; + vp9_ppflags_t flags = {0, 0, 0}; + VP9_COMMON *cm = NULL; + (void)deadline; + vp9_zero(sd); + ctx->img_avail = 0; + // Determine the stream parameters. Note that we rely on peek_si to // validate that we have a buffer that does not wrap around the top // of the heap. @@ -336,39 +276,33 @@ static vpx_codec_err_t decode_one(vpx_codec_alg_priv_t *ctx, return VPX_CODEC_ERROR; } - // Initialize the decoder workers on the first frame - if (ctx->frame_workers == NULL) { - const vpx_codec_err_t res = init_decoder(ctx); - if (res != VPX_CODEC_OK) - return res; + // Initialize the decoder instance on the first frame + if (ctx->pbi == NULL) { + init_decoder(ctx); + if (ctx->pbi == NULL) + return VPX_CODEC_ERROR; } - if (!ctx->frame_parallel_decode) { - VP9Worker *const worker = ctx->frame_workers; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - worker_data->data = *data; - worker_data->data_size = data_sz; - worker_data->user_priv = user_priv; + // Set these even if already initialized. The caller may have changed the + // decrypt config between frames. + ctx->pbi->decrypt_cb = ctx->decrypt_cb; + ctx->pbi->decrypt_state = ctx->decrypt_state; - // Set these even if already initialized. The caller may have changed the - // decrypt config between frames. - worker_data->pbi->decrypt_cb = ctx->decrypt_cb; - worker_data->pbi->decrypt_state = ctx->decrypt_state; + cm = &ctx->pbi->common; - vp9_worker_execute(worker); - if (worker->had_error) - return update_error_state(ctx, &worker_data->pbi->common.error); - - // Update data pointer after decode. - *data = worker_data->data_end; - } else { - // TODO(hkuang): Implement frame parallel decode. - return VPX_CODEC_INCAPABLE; - } + if (vp9_receive_compressed_data(ctx->pbi, data_sz, data)) + return update_error_state(ctx, &cm->error); if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC) set_ppflags(ctx, &flags); + if (vp9_get_raw_frame(ctx->pbi, &sd, &flags)) + return update_error_state(ctx, &cm->error); + + yuvconfig2image(&ctx->img, &sd, user_priv); + ctx->img.fb_priv = cm->frame_bufs[cm->new_fb_idx].raw_frame_buffer.priv; + ctx->img_avail = 1; + return VPX_CODEC_OK; } @@ -478,7 +412,7 @@ static vpx_codec_err_t decoder_decode(vpx_codec_alg_priv_t *ctx, vpx_codec_err_t res; if (data_start < data || frame_size > (uint32_t) (data_end - data_start)) { - set_error_detail(ctx, "Invalid frame size in index"); + ctx->base.err_detail = "Invalid frame size in index"; return VPX_CODEC_CORRUPT_FRAME; } @@ -496,7 +430,7 @@ static vpx_codec_err_t decoder_decode(vpx_codec_alg_priv_t *ctx, // Extra data detected after the frame. if (data_start < data_end - 1) { - set_error_detail(ctx, "Fail to decode frame in parallel mode"); + ctx->base.err_detail = "Fail to decode frame in parallel mode"; return VPX_CODEC_INCAPABLE; } } @@ -511,7 +445,7 @@ static vpx_codec_err_t decoder_decode(vpx_codec_alg_priv_t *ctx, vpx_codec_err_t res; if (data_start < data || frame_size > (uint32_t) (data_end - data_start)) { - set_error_detail(ctx, "Invalid frame size in index"); + ctx->base.err_detail = "Invalid frame size in index"; return VPX_CODEC_CORRUPT_FRAME; } @@ -549,31 +483,15 @@ static vpx_image_t *decoder_get_frame(vpx_codec_alg_priv_t *ctx, vpx_codec_iter_t *iter) { vpx_image_t *img = NULL; - // iter acts as a flip flop, so an image is only returned on the first - // call to get_frame. - if (*iter == NULL && ctx->frame_workers != NULL) { - YV12_BUFFER_CONFIG sd; - vp9_ppflags_t flags = {0, 0, 0}; - - VP9Worker *const worker = &ctx->frame_workers[ctx->next_output_thread_id]; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - if (vp9_get_raw_frame(worker_data->pbi, &sd, &flags) == 0) { - VP9_COMMON *const cm = &worker_data->pbi->common; - yuvconfig2image(&ctx->img, &sd, worker_data->user_priv); - ctx->img.fb_priv = cm->frame_bufs[cm->new_fb_idx].raw_frame_buffer.priv; + if (ctx->img_avail) { + // iter acts as a flip flop, so an image is only returned on the first + // call to get_frame. + if (!(*iter)) { img = &ctx->img; *iter = img; - // Decrease reference count of last output frame in frame parallel mode. - if (ctx->frame_parallel_decode && ctx->last_show_frame >= 0) { - --cm->frame_bufs[ctx->last_show_frame].ref_count; - if (cm->frame_bufs[ctx->last_show_frame].ref_count == 0) { - cm->release_fb_cb(cm->cb_priv, - &cm->frame_bufs[ctx->last_show_frame].raw_frame_buffer); - } - } - ctx->last_show_frame = worker_data->pbi->common.new_fb_idx; } } + ctx->img_avail = 0; return img; } @@ -584,7 +502,7 @@ static vpx_codec_err_t decoder_set_fb_fn( vpx_release_frame_buffer_cb_fn_t cb_release, void *cb_priv) { if (cb_get == NULL || cb_release == NULL) { return VPX_CODEC_INVALID_PARAM; - } else if (ctx->frame_workers == NULL) { + } else if (ctx->pbi == NULL) { // If the decoder has already been initialized, do not accept changes to // the frame buffer functions. ctx->get_ext_fb_cb = cb_get; @@ -600,19 +518,12 @@ static vpx_codec_err_t ctrl_set_reference(vpx_codec_alg_priv_t *ctx, va_list args) { vpx_ref_frame_t *const data = va_arg(args, vpx_ref_frame_t *); - // Only support this function in serial decode. - if (ctx->frame_parallel_decode) { - set_error_detail(ctx, "Not supported in frame parallel decode"); - return VPX_CODEC_INCAPABLE; - } - if (data) { vpx_ref_frame_t *const frame = (vpx_ref_frame_t *)data; YV12_BUFFER_CONFIG sd; - VP9Worker *const worker = ctx->frame_workers; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; + image2yuvconfig(&frame->img, &sd); - return vp9_set_reference_dec(&worker_data->pbi->common, + return vp9_set_reference_dec(&ctx->pbi->common, (VP9_REFFRAME)frame->frame_type, &sd); } else { return VPX_CODEC_INVALID_PARAM; @@ -623,19 +534,13 @@ static vpx_codec_err_t ctrl_copy_reference(vpx_codec_alg_priv_t *ctx, va_list args) { vpx_ref_frame_t *data = va_arg(args, vpx_ref_frame_t *); - // Only support this function in serial decode. - if (ctx->frame_parallel_decode) { - set_error_detail(ctx, "Not supported in frame parallel decode"); - return VPX_CODEC_INCAPABLE; - } - if (data) { - vpx_ref_frame_t *frame = (vpx_ref_frame_t *) data; + vpx_ref_frame_t *frame = (vpx_ref_frame_t *)data; YV12_BUFFER_CONFIG sd; - VP9Worker *const worker = ctx->frame_workers; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; + image2yuvconfig(&frame->img, &sd); - return vp9_copy_reference_dec(worker_data->pbi, + + return vp9_copy_reference_dec(ctx->pbi, (VP9_REFFRAME)frame->frame_type, &sd); } else { return VPX_CODEC_INVALID_PARAM; @@ -646,18 +551,11 @@ static vpx_codec_err_t ctrl_get_reference(vpx_codec_alg_priv_t *ctx, va_list args) { vp9_ref_frame_t *data = va_arg(args, vp9_ref_frame_t *); - // Only support this function in serial decode. - if (ctx->frame_parallel_decode) { - set_error_detail(ctx, "Not supported in frame parallel decode"); - return VPX_CODEC_INCAPABLE; - } - if (data) { YV12_BUFFER_CONFIG* fb; - VP9Worker *const worker = ctx->frame_workers; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - vp9_get_reference_dec(worker_data->pbi, data->idx, &fb); - yuvconfig2image(&data->img, fb, worker_data->user_priv); + + vp9_get_reference_dec(ctx->pbi, data->idx, &fb); + yuvconfig2image(&data->img, fb, NULL); return VPX_CODEC_OK; } else { return VPX_CODEC_INVALID_PARAM; @@ -694,20 +592,11 @@ static vpx_codec_err_t ctrl_get_last_ref_updates(vpx_codec_alg_priv_t *ctx, va_list args) { int *const update_info = va_arg(args, int *); - // Only support this function in serial decode. - if (ctx->frame_parallel_decode) { - set_error_detail(ctx, "Not supported in frame parallel decode"); - return VPX_CODEC_INCAPABLE; - } - if (update_info) { - if (ctx->frame_workers) { - VP9Worker *const worker = ctx->frame_workers; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - *update_info = worker_data->pbi->refresh_frame_flags; - } else { + if (ctx->pbi) + *update_info = ctx->pbi->refresh_frame_flags; + else return VPX_CODEC_ERROR; - } return VPX_CODEC_OK; } else { return VPX_CODEC_INVALID_PARAM; @@ -719,20 +608,11 @@ static vpx_codec_err_t ctrl_get_frame_corrupted(vpx_codec_alg_priv_t *ctx, va_list args) { int *corrupted = va_arg(args, int *); - // Only support this function in serial decode. - if (ctx->frame_parallel_decode) { - set_error_detail(ctx, "Not supported in frame parallel decode"); - return VPX_CODEC_INCAPABLE; - } - if (corrupted) { - if (ctx->frame_workers) { - VP9Worker *const worker = ctx->frame_workers; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - *corrupted = worker_data->pbi->common.frame_to_show->corrupted; - } else { + if (ctx->pbi) + *corrupted = ctx->pbi->common.frame_to_show->corrupted; + else return VPX_CODEC_ERROR; - } return VPX_CODEC_OK; } else { return VPX_CODEC_INVALID_PARAM; @@ -743,17 +623,9 @@ static vpx_codec_err_t ctrl_get_display_size(vpx_codec_alg_priv_t *ctx, va_list args) { int *const display_size = va_arg(args, int *); - // Only support this function in serial decode. - if (ctx->frame_parallel_decode) { - set_error_detail(ctx, "Not supported in frame parallel decode"); - return VPX_CODEC_INCAPABLE; - } - if (display_size) { - if (ctx->frame_workers) { - VP9Worker *const worker = ctx->frame_workers; - FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; - const VP9_COMMON *const cm = &worker_data->pbi->common; + if (ctx->pbi) { + const VP9_COMMON *const cm = &ctx->pbi->common; display_size[0] = cm->display_width; display_size[1] = cm->display_height; } else { -- 2.40.0