Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1c6b7fb authored by Myles Watson's avatar Myles Watson
Browse files

sbc_encoder: Remove bt_target.h and bt_types.h

Bug: 301661850
Test: mma -j32
Change-Id: I67861f0a29a410286b8f6a6c957213ba339746fc
parent 2d56c8e2
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@
#define ENCODER_VERSION "0025"

#include <stdbool.h>
#include <string.h>

#include "bt_target.h"
#include <stdint.h>

/*DEFINES*/
#ifndef FALSE
@@ -163,8 +161,6 @@
  (SBC_MAX_NUM_FRAME * SBC_MAX_NUM_OF_BLOCKS * SBC_MAX_NUM_OF_CHANNELS * \
   SBC_MAX_NUM_OF_SUBBANDS)

#include "sbc_types.h"

typedef struct SBC_ENC_PARAMS_TAG {
  int16_t s16SamplingFreq;  /* 16k, 32k, 44.1k or 48k*/
  int16_t s16ChannelMode;   /* mono, dual, streo or joint streo*/
+0 −34
Original line number Diff line number Diff line
/******************************************************************************
 *
 *  Copyright 1999-2012 Broadcom Corporation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at:
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 ******************************************************************************/

/******************************************************************************
 *
 *  Data type declarations.
 *
 ******************************************************************************/

#ifndef SBC_TYPES_H
#define SBC_TYPES_H

#include <stdint.h>

#include "bt_target.h"

#define abs32(x) (((x) >= 0) ? (x) : (-(x)))

#endif
+3 −2
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@
 ******************************************************************************/

#include "sbc_encoder.h"
#include <string.h>
#include "bt_target.h"

#include "sbc_enc_func_declare.h"

#define abs32(x) (((x) >= 0) ? (x) : (-(x)))

int16_t EncMaxShiftCounter;

#if (SBC_JOINT_STE_INCLUDED == TRUE)