shithub: libvpx

Info  •  Files  •  Log  •  Branches

Move vp9_alt_ref_aq_private.h to vp9_alt_ref_aq.c

+ add a temporary dummy element to ALT_REF_AQ to avoid a warning about
an empty struct

Change-Id: Ib6e5c39ff62ad96eb4e3686d4882228a42b3843f

--- a/vp9/encoder/vp9_alt_ref_aq.c

+++ b/vp9/encoder/vp9_alt_ref_aq.c

@@ -9,9 +9,11 @@

  */

 #include "vp9/encoder/vp9_encoder.h"

-

-#include "vp9/encoder/vp9_alt_ref_aq_private.h"

 #include "vp9/encoder/vp9_alt_ref_aq.h"

+

+struct ALT_REF_AQ {

+  int dummy;

+};

 struct ALT_REF_AQ *vp9_alt_ref_aq_create() {

   return (struct ALT_REF_AQ *)vpx_malloc(sizeof(struct ALT_REF_AQ));

--- a/vp9/encoder/vp9_alt_ref_aq_private.h

+++ /dev/null

@@ -1,35 +1,0 @@

-/*

- *  Copyright (c) 2016 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.

- */

-

-/*

- *  \file vp9_alt_ref_aq_private.h

- *

- *  This file  describes class  used for  setting up  adaptive segmentation

- *  for  altref frames.   It  is  private file  and  most  likely you  need

- *  alt_ref_aq.h instead.

- */

-

-#ifndef VP9_ENCODER_VP9_ALT_REF_AQ_PRIVATE_H_

-#define VP9_ENCODER_VP9_ALT_REF_AQ_PRIVATE_H_

-

-#include "vp9/encoder/vp9_alt_ref_aq.h"

-

-#ifdef __cplusplus

-

-extern "C" {

-#endif

-

-struct ALT_REF_AQ {};

-

-#ifdef __cplusplus

-}  // extern "C"

-#endif

-

-#endif  // VP9_ENCODER_VP9_ALT_REF_AQ_PRIVATE_H_

--- a/vp9/vp9cx.mk

+++ b/vp9/vp9cx.mk

@@ -81,7 +81,6 @@

 VP9_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.h

 VP9_CX_SRCS-yes += encoder/vp9_aq_complexity.c

 VP9_CX_SRCS-yes += encoder/vp9_aq_complexity.h

-VP9_CX_SRCS-yes += encoder/vp9_alt_ref_aq_private.h

 VP9_CX_SRCS-yes += encoder/vp9_alt_ref_aq.h

 VP9_CX_SRCS-yes += encoder/vp9_alt_ref_aq.c

 VP9_CX_SRCS-yes += encoder/vp9_skin_detection.c