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

Commit 3b1b616b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: stack: Properly include stack/include/bt_hdr" am: 87f00408 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1831601

Change-Id: I2f2b2167b7f5bee30cc4e9a710eeb7d0f166b903
parents 85289668 87f00408

system/stack/a2dp/a2dp_aac.cc

+2 −3
Original line number Diff line number Diff line
@@ -23,19 +23,18 @@ 


#define LOG_TAG "a2dp_aac"



#include "bt_target.h"



#include "a2dp_aac.h"



#include <base/logging.h>

#include <string.h>



#include <base/logging.h>

#include "a2dp_aac_decoder.h"

#include "a2dp_aac_encoder.h"

#include "bt_utils.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "stack/include/bt_hdr.h"



#define A2DP_AAC_DEFAULT_BITRATE 320000  // 320 kbps

#define A2DP_AAC_MIN_BITRATE 64000       // 64 kbps

system/stack/a2dp/a2dp_aac_decoder.cc

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "a2dp_aac.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "stack/include/bt_hdr.h"



#define DECODE_BUF_LEN (8 * 2 * 1024)

system/stack/a2dp/a2dp_aac_encoder.cc

+3 −3
Original line number Diff line number Diff line
@@ -18,18 +18,18 @@ 


#include "a2dp_aac_encoder.h"



#include <aacenc_lib.h>

#include <base/logging.h>

#include <inttypes.h>

#include <stdio.h>

#include <string.h>



#include <aacenc_lib.h>

#include <base/logging.h>



#include "a2dp_aac.h"

#include "common/time_util.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"



//

// Encoder for AAC Source Codec

system/stack/a2dp/a2dp_codec_config.cc

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "bta/av/bta_av_int.h"

#include "osi/include/log.h"

#include "osi/include/properties.h"

#include "stack/include/bt_hdr.h"



/* The Media Type offset within the codec info byte array */

#define A2DP_MEDIA_TYPE_OFFSET 1

system/stack/a2dp/a2dp_sbc.cc

+2 −3
Original line number Diff line number Diff line
@@ -25,19 +25,18 @@ 


#define LOG_TAG "a2dp_sbc"



#include "bt_target.h"



#include "a2dp_sbc.h"



#include <base/logging.h>

#include <string.h>



#include <base/logging.h>

#include "a2dp_sbc_decoder.h"

#include "a2dp_sbc_encoder.h"

#include "bt_utils.h"

#include "embdrv/sbc/encoder/include/sbc_encoder.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"



#define A2DP_SBC_MAX_BITPOOL 53