Skip to content

Commit

Permalink
Remove harcoded values and change memory parameters
Browse files Browse the repository at this point in the history
- Change memory parameters in sdkconfig
- Remove harcoded values
- Update readme.md
  • Loading branch information
commarmi76 committed Apr 25, 2017
1 parent 191f752 commit ec852f5
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 21 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Isn't such a exhaustive test but enough for now.
=================================================================================
TODO:
- Encode something infinite to check memory leaks (partially done)
- Investigate why CONFIG_ENABLE_MEMORY_DEBUG=y crashes the system
- Profile to find the heaviest parts
- Investigate esp32 dsp features: Vectra LX DSP Engine, MAC16
- Streaming over tcp and http
Expand Down
18 changes: 5 additions & 13 deletions components/libmp3lame/library/lame.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,19 +595,11 @@ lame_init_params(lame_global_flags * gfp)
return -2;
}

// gfc->sv_rpg.rgdata->A = calloc (12000, sizeof(uint32_t));
gfc->sv_rpg.rgdata->A = pvPortMallocCaps(12000*sizeof(uint32_t), MALLOC_CAP_32BIT);
memset(gfc->sv_rpg.rgdata->A, 0, 12000*sizeof(uint32_t));
// gfc->sv_rpg.rgdata->B = calloc (12000, sizeof(uint32_t));
gfc->sv_rpg.rgdata->B = pvPortMallocCaps(12000*sizeof(uint32_t), MALLOC_CAP_32BIT);
memset(gfc->sv_rpg.rgdata->B, 0, 12000*sizeof(uint32_t));
/*
for (int i=0; i<12000; i++)
{
gfc->sv_rpg.rgdata->A[i]=0;
gfc->sv_rpg.rgdata->B[i]=0;
}
*/
gfc->sv_rpg.rgdata->A = pvPortMallocCaps(STEPS_per_dB * MAX_dB*sizeof(uint32_t), MALLOC_CAP_32BIT);
memset(gfc->sv_rpg.rgdata->A, 0, STEPS_per_dB * MAX_dB*sizeof(uint32_t));

gfc->sv_rpg.rgdata->B = pvPortMallocCaps(STEPS_per_dB * MAX_dB*sizeof(uint32_t), MALLOC_CAP_32BIT);
memset(gfc->sv_rpg.rgdata->B, 0, STEPS_per_dB * MAX_dB*sizeof(uint32_t));

cfg->error_protection = gfp->error_protection;
cfg->copyright = gfp->copyright;
Expand Down
10 changes: 9 additions & 1 deletion main/lame_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,15 @@ void lameTest()
pcm_samples += (nsamples*2); // nsamples*2 ????
frames++;

#if 0
// to test infinite loop
if ( pcm_samples_end - pcm_samples <= 0){
pcm_samples = (short int *)Sample16kHz_raw_start;
free8start=xPortGetFreeHeapSizeCaps(MALLOC_CAP_8BIT);
free32start=xPortGetFreeHeapSizeCaps(MALLOC_CAP_32BIT);
printf("LOOP: free mem8bit: %d mem32bit: %d frames encoded: %d bytes:%d\n",free8start,free32start,frames,total);
}
#endif
}

gettimeofday (&tvalAfter, NULL);
Expand Down Expand Up @@ -160,7 +169,6 @@ void lameTest()

// =========================================================

printf ("Total size: %d",total);
lame_close(lame);
printf("\nClose\n");

Expand Down
28 changes: 21 additions & 7 deletions sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
CONFIG_APP_OFFSET=0x10000
CONFIG_PHY_DATA_OFFSET=0xf000
CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set

Expand All @@ -101,17 +100,26 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
# CONFIG_MEMMAP_SMP is not set
# CONFIG_MEMMAP_TRACEMEM is not set
# CONFIG_MEMMAP_TRACEMEM_TWOBANKS is not set
# CONFIG_ESP32_TRAX is not set
CONFIG_TRACEMEM_RESERVE_DRAM=0x0
# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
# CONFIG_ESP32_ENABLE_COREDUMP is not set
# CONFIG_TWO_MAC_ADDRESS_FROM_EFUSE is not set
CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE=y
CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE=4
CONFIG_SYSTEM_EVENT_QUEUE_SIZE=64
CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=4096
CONFIG_MAIN_TASK_STACK_SIZE=65000
# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
# CONFIG_ESP32_APPTRACE_DEST_UART is not set
CONFIG_ESP32_APPTRACE_DEST_NONE=y
# CONFIG_ESP32_APPTRACE_ENABLE is not set
CONFIG_BASE_MAC_STORED_DEFAULT_EFUSE=y
# CONFIG_BASE_MAC_STORED_CUSTOMER_DEFINED_EFUSE is not set
# CONFIG_BASE_MAC_STORED_OTHER_CUSTOMER_DEFINED_PLACE is not set
CONFIG_TWO_MAC_ADDRESS_FROM_EFUSE=y
# CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE is not set
CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE=2
CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
CONFIG_MAIN_TASK_STACK_SIZE=8192
CONFIG_NEWLIB_STDOUT_ADDCR=y
# CONFIG_NEWLIB_NANO_FORMAT is not set
CONFIG_CONSOLE_UART_DEFAULT=y
Expand Down Expand Up @@ -139,6 +147,10 @@ CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set
CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=0
# CONFIG_ESP32_XTAL_FREQ_40 is not set
# CONFIG_ESP32_XTAL_FREQ_26 is not set
CONFIG_ESP32_XTAL_FREQ_AUTO=y
CONFIG_ESP32_XTAL_FREQ=0
# CONFIG_WIFI_ENABLED is not set
# CONFIG_ETHERNET is not set

Expand Down Expand Up @@ -223,6 +235,8 @@ CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
CONFIG_TCP_MAXRTX=12
CONFIG_TCP_SYNMAXRTX=6
CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
CONFIG_TCPIP_TASK_STACK_SIZE=2048
# CONFIG_PPP_SUPPORT is not set

#
# mbedTLS
Expand Down

0 comments on commit ec852f5

Please sign in to comment.