diff options
| author | James Zern <jzern@google.com> | 2017-06-16 01:48:55 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2017-06-21 19:00:14 -0700 |
| commit | 864bc77e7a2a190d2a25f55b62380d65a7956308 (patch) | |
| tree | 6b0db7fb729e11eea478a78cfaac78fb71c79398 /vp8/encoder | |
| parent | d5d6a609d0fdec6f142a9f0489893edd93e57f08 (diff) | |
| download | libvpx-864bc77e7a2a190d2a25f55b62380d65a7956308.tar libvpx-864bc77e7a2a190d2a25f55b62380d65a7956308.tar.gz libvpx-864bc77e7a2a190d2a25f55b62380d65a7956308.tar.bz2 libvpx-864bc77e7a2a190d2a25f55b62380d65a7956308.zip | |
add ethreading.h
quiets -Wmissing-prototypes in encodeframe.c
Change-Id: Ic216d0bdd6130eac44f2183639a715b2f1088ebe
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 5 | ||||
| -rw-r--r-- | vp8/encoder/ethreading.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/ethreading.h | 32 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 5 |
4 files changed, 39 insertions, 4 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index cf569daa7..1c9f57b56 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -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 diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index df34997ac..3e5b709e0 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -14,6 +14,7 @@ #include "vp8/common/extend.h" #include "bitstream.h" #include "encodeframe.h" +#include "ethreading.h" #if CONFIG_MULTITHREAD diff --git a/vp8/encoder/ethreading.h b/vp8/encoder/ethreading.h new file mode 100644 index 000000000..95bf73d18 --- /dev/null +++ b/vp8/encoder/ethreading.h @@ -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_ diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index a1aa3820b..28c5f404d 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -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); |