From 86fa4a7b08cb7a6e7232d007cab7e6481b253f90 Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Thu, 1 Oct 2020 16:07:08 +0200 Subject: [PATCH] pts: cleanup Makefile --- test/pts/Makefile | 4 +-- test/pts/avdtp_source_test.c | 59 ------------------------------------ 2 files changed, 1 insertion(+), 62 deletions(-) diff --git a/test/pts/Makefile b/test/pts/Makefile index 692daf5ce..0fdc17caa 100644 --- a/test/pts/Makefile +++ b/test/pts/Makefile @@ -142,7 +142,7 @@ HXCMOD_PLAYER_OBJ = ${HXCMOD_PLAYER:.c=.o} SRC_BLE_GATT_SERVICE_FILES_OBJ = ${SRC_BLE_GATT_SERVICE_FILES:.c=.o} EXAMPLES = iopt ble_peripheral_test ble_central_test l2cap_test classic_test bnep_test hsp_ag_test hsp_hs_test sco_loopback le_data_channel -EXAMPLES += avdtp_source_test avdtp_sink_test avrcp_test sm_test gatt_profiles hrp_col_test hrp_server_test +EXAMPLES += avdtp_source_test avdtp_sink_test avrcp_test gatt_profiles hrp_col_test hrp_server_test # EXAMPLES += hog_demo_test hid_device_test hid_host_test EXAMPLES += csc_server_test csc_client_test cycling_power_server_test @@ -241,7 +241,5 @@ myclean: rm -rf cycling_power_server_test.h rm -rf gatt_profiles.h rm -rf hrp_server_test.h - rm -rf sm_test.h - clean: myclean diff --git a/test/pts/avdtp_source_test.c b/test/pts/avdtp_source_test.c index c08a9b9c0..a60ed5b84 100644 --- a/test/pts/avdtp_source_test.c +++ b/test/pts/avdtp_source_test.c @@ -144,51 +144,6 @@ static int a2dp_sample_rate(void){ return sc.sampling_frequency; } -#if 0 -static void a2dp_source_setup_media_header(uint8_t * media_packet, int size, int *offset, uint8_t marker, uint16_t sequence_number){ - if (size < AVDTP_MEDIA_PAYLOAD_HEADER_SIZE){ - log_error("small outgoing buffer"); - return; - } - - uint8_t rtp_version = 2; - uint8_t padding = 0; - uint8_t extension = 0; - uint8_t csrc_count = 0; - uint8_t payload_type = 1; //0x60; - // uint16_t sequence_number = stream_endpoint->sequence_number; - uint32_t timestamp = btstack_run_loop_get_time_ms(); - uint32_t ssrc = 0x11223344; - - // rtp header (min size 12B) - int pos = 0; - // int mtu = l2cap_get_remote_mtu_for_local_cid(stream_endpoint->l2cap_media_cid); - - media_packet[pos++] = (rtp_version << 6) | (padding << 5) | (extension << 4) | csrc_count; - media_packet[pos++] = (marker << 1) | payload_type; - big_endian_store_16(media_packet, pos, sequence_number); - pos += 2; - big_endian_store_32(media_packet, pos, timestamp); - pos += 4; - big_endian_store_32(media_packet, pos, ssrc); // only used for multicast - pos += 4; - *offset = pos; -} - -static void a2dp_source_copy_media_payload(uint8_t * media_packet, int size, int * offset, uint8_t * storage, int num_bytes_to_copy, uint8_t num_frames){ - if (size < num_bytes_to_copy + 1){ - log_error("small outgoing buffer: buffer size %u, but need %u", size, num_bytes_to_copy + 1); - return; - } - - int pos = *offset; - media_packet[pos++] = num_frames; // (fragmentation << 7) | (starting_packet << 6) | (last_packet << 5) | num_frames; - memcpy(media_packet + pos, storage, num_bytes_to_copy); - pos += num_bytes_to_copy; - *offset = pos; -} - -#endif static void a2dp_demo_send_media_packet(void){ int num_bytes_in_frame = btstack_sbc_encoder_sbc_buffer_length(); @@ -278,20 +233,6 @@ static void avdtp_audio_timeout_handler(btstack_timer_source_t * timer){ } } -// static int avdtp_max_media_payload_size(uint8_t local_seid){ -// avdtp_stream_endpoint_t * stream_endpoint = avdtp_get_stream_endpoint_for_seid(local_seid, &a2dp_source_context); -// if (!stream_endpoint) { -// log_error("no stream_endpoint found for seid %d", local_seid); -// return 0; -// } -// if (stream_endpoint->l2cap_media_cid == 0){ -// log_error("no media cid found for seid %d", local_seid); -// return 0; -// } -// return l2cap_get_remote_mtu_for_local_cid(stream_endpoint->l2cap_media_cid) - AVDTP_MEDIA_PAYLOAD_HEADER_SIZE; -// } - - static void a2dp_demo_timer_start(a2dp_media_sending_context_t * context){ context->max_media_payload_size = 0x290;// avdtp_max_media_payload_size(context->local_seid); context->sbc_storage_count = 0;