749e0c7b28
This reverts commit b336356198.
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
58 lines
1.9 KiB
C
58 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2014 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef VP9_DECODER_VP9_DTHREAD_H_
|
|
#define VP9_DECODER_VP9_DTHREAD_H_
|
|
|
|
#include "./vpx_config.h"
|
|
#include "vp9/decoder/vp9_reader.h"
|
|
#include "vp9/decoder/vp9_thread.h"
|
|
|
|
struct VP9Common;
|
|
struct VP9Decoder;
|
|
|
|
typedef struct TileWorkerData {
|
|
struct VP9Common *cm;
|
|
vp9_reader bit_reader;
|
|
DECLARE_ALIGNED(16, struct macroblockd, xd);
|
|
|
|
// Row-based parallel loopfilter data
|
|
LFWorkerData lfdata;
|
|
} TileWorkerData;
|
|
|
|
// Loopfilter row synchronization
|
|
typedef struct VP9LfSyncData {
|
|
#if CONFIG_MULTITHREAD
|
|
pthread_mutex_t *mutex_;
|
|
pthread_cond_t *cond_;
|
|
#endif
|
|
// Allocate memory to store the loop-filtered superblock index in each row.
|
|
int *cur_sb_col;
|
|
// The optimal sync_range for different resolution and platform should be
|
|
// determined by testing. Currently, it is chosen to be a power-of-2 number.
|
|
int sync_range;
|
|
} VP9LfSync;
|
|
|
|
// Allocate memory for loopfilter row synchronization.
|
|
void vp9_loop_filter_alloc(struct VP9Common *cm, VP9LfSync *lf_sync,
|
|
int rows, int width);
|
|
|
|
// Deallocate loopfilter synchronization related mutex and data.
|
|
void vp9_loop_filter_dealloc(VP9LfSync *lf_sync, int rows);
|
|
|
|
// Multi-threaded loopfilter that uses the tile threads.
|
|
void vp9_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
|
|
struct VP9Decoder *pbi,
|
|
struct VP9Common *cm,
|
|
int frame_filter_level,
|
|
int y_only);
|
|
|
|
#endif // VP9_DECODER_VP9_DTHREAD_H_
|