generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add ethreading.h

Browse Source 
quiets -Wmissing-prototypes in encodeframe.c

Change-Id: Ic216d0bdd6130eac44f2183639a715b2f1088ebe
This commit is contained in:
James Zern 2017-06-16 01:48:55 -07:00
parent d5d6a609d0
commit 864bc77e7a
5 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vp8/encoder/encodeframe.c
View File

@ -14,6 +14,9 @@
#include "bitstream.h"
#include "encodemb.h"
#include "encodemv.h"
#if CONFIG_MULTITHREAD
#include "ethreading.h"
#endif
#include "vp8/common/common.h"
#include "onyx_int.h"
#include "vp8/common/extend.h"
@ -38,8 +41,6 @@
extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t);
extern void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex);
extern void vp8_auto_select_speed(VP8_COMP *cpi);
extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi, MACROBLOCK *x,
MB_ROW_COMP *mbr_ei, int count);
static void adjust_act_zbin(VP8_COMP *cpi, MACROBLOCK *x);
#ifdef MODE_STATS

1
vp8/encoder/ethreading.c
View File

@ -14,6 +14,7 @@
#include "vp8/common/extend.h"
#include "bitstream.h"
#include "encodeframe.h"
#include "ethreading.h"
#if CONFIG_MULTITHREAD

32
vp8/encoder/ethreading.h Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2017 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 VP8_ENCODER_ETHREADING_H_
#define VP8_ENCODER_ETHREADING_H_
#include "vp8/encoder/onyx_int.h"
#ifdef __cplusplus
extern "C" {
#endif
struct VP8_COMP;
struct macroblock;
void vp8cx_init_mbrthread_data(struct VP8_COMP *cpi, struct macroblock *x,
MB_ROW_COMP *mbr_ei, int count);
int vp8cx_create_encoder_threads(struct VP8_COMP *cpi);
void vp8cx_remove_encoder_threads(struct VP8_COMP *cpi);
#ifdef __cplusplus
}
#endif
#endif // VP8_ENCODER_ETHREADING_H_

5
vp8/encoder/onyx_if.c
View File

@ -44,6 +44,9 @@
#include "mr_dissim.h"
#endif
#include "encodeframe.h"
#if CONFIG_MULTITHREAD
#include "ethreading.h"
#endif
#include <assert.h>
#include <math.h>
@ -64,8 +67,6 @@ extern void vp8_deblock_frame(YV12_BUFFER_CONFIG *source,
extern void print_parms(VP8_CONFIG *ocf, char *filenam);
extern unsigned int vp8_get_processor_freq();
extern void print_tree_update_probs();
extern int vp8cx_create_encoder_threads(VP8_COMP *cpi);
extern void vp8cx_remove_encoder_threads(VP8_COMP *cpi);
int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest);

1
vp8/vp8cx.mk
View File

@ -30,6 +30,7 @@ VP8_CX_SRCS-yes += encoder/encodeintra.c
VP8_CX_SRCS-yes += encoder/encodemb.c
VP8_CX_SRCS-yes += encoder/encodemv.c
VP8_CX_SRCS-$(CONFIG_MULTITHREAD) += encoder/ethreading.c
VP8_CX_SRCS-$(CONFIG_MULTITHREAD) += encoder/ethreading.h
VP8_CX_SRCS-yes += encoder/firstpass.c
VP8_CX_SRCS-yes += encoder/block.h
VP8_CX_SRCS-yes += encoder/boolhuff.h