History

Do not compile leftover of LATM

LATM support was disabled 15 years ago: https://github.com/knik0/faad2/commit/b79b5a24a8dd65568aaef6a9f909b948ef5b94cd Not compiling unreachable code makes coverage picture more clear. Currently 4 of 10 top in undiscovered complexity are LATM functions.

Evgenii Kliuchnikov committed 3 years ago

Commit cba342e1 parent 2028a703 files · +6 −4Browse files

Unified · Split

3 files
  1. libfaad/decoder.c +2 −1
  2. libfaad/syntax.c +2 −3
  3. libfaad/syntax.h +2 −0
libfaad/decoder.c+2−1
@@ -233,6 +233,7 @@ unsigned char NeAACDecSetConfiguration(NeAACDecHandle hpDecoder, · 232 unmodified lines
233}233}
234 234
235 235
236#if 0
236static int latmCheck(latm_header *latm, bitfile *ld)237static int latmCheck(latm_header *latm, bitfile *ld)
237{238{
238 uint32_t good=0, bad=0, bits, m;239 uint32_t good=0, bad=0, bits, m;
@@ -256,7 +257,7 @@ static int latmCheck(latm_header *latm, bitfile *ld) · 17 unmodified lines
256 257
257 return (good>0);258 return (good>0);
258}259}
259 260#endif
260 261
261long NeAACDecInit(NeAACDecHandle hpDecoder,262long NeAACDecInit(NeAACDecHandle hpDecoder,
262 unsigned char *buffer,263 unsigned char *buffer,
libfaad/syntax.c+2−3
@@ -2522,6 +2522,7 @@ static void adts_error_check(adts_header *adts, bitfile *ld) · 2521 unmodified lines
2522}2522}
2523 2523
2524/* LATM parsing functions */2524/* LATM parsing functions */
2525#if 0
2525 2526
2526static uint32_t latm_get_value(bitfile *ld)2527static uint32_t latm_get_value(bitfile *ld)
2527{2528{
@@ -2536,7 +2537,6 @@ static uint32_t latm_get_value(bitfile *ld) · 8 unmodified lines
2536 return value;2537 return value;
2537}2538}
2538 2539
2539
2540static uint32_t latmParsePayload(latm_header *latm, bitfile *ld)2540static uint32_t latmParsePayload(latm_header *latm, bitfile *ld)
2541{2541{
2542 //assuming there's only one program with a single layer and 1 subFrame,2542 //assuming there's only one program with a single layer and 1 subFrame,
@@ -2560,7 +2560,6 @@ static uint32_t latmParsePayload(latm_header *latm, bitfile *ld) · 17 unmodified lines
2560 return framelen;2560 return framelen;
2561}2561}
2562 2562
2563
2564static uint32_t latmAudioMuxElement(latm_header *latm, bitfile *ld)2563static uint32_t latmAudioMuxElement(latm_header *latm, bitfile *ld)
2565{2564{
2566 uint32_t ascLen, asc_bits=0;2565 uint32_t ascLen, asc_bits=0;
@@ -2677,7 +2676,6 @@ static uint32_t latmAudioMuxElement(latm_header *latm, bitfile *ld) · 110 unmodified lines
2677 return 0;2676 return 0;
2678}2677}
2679 2678
2680
2681uint32_t faad_latm_frame(latm_header *latm, bitfile *ld)2679uint32_t faad_latm_frame(latm_header *latm, bitfile *ld)
2682{2680{
2683 uint16_t len;2681 uint16_t len;
@@ -2705,3 +2703,4 @@ uint32_t faad_latm_frame(latm_header *latm, bitfile *ld) · 21 unmodified lines
2705 }2703 }
2706 return 0xFFFFFFFF;2704 return 0xFFFFFFFF;
2707}2705}
2706#endif
libfaad/syntax.h+2−0
@@ -122,7 +122,9 @@ uint8_t reordered_spectral_data(NeAACDecStruct *hDecoder, ic_stream *ics, bitfil · 121 unmodified lines
122void DRM_aac_scalable_main_element(NeAACDecStruct *hDecoder, NeAACDecFrameInfo *hInfo,122void DRM_aac_scalable_main_element(NeAACDecStruct *hDecoder, NeAACDecFrameInfo *hInfo,
123 bitfile *ld, program_config *pce, drc_info *drc);123 bitfile *ld, program_config *pce, drc_info *drc);
124#endif124#endif
125#if 0
125uint32_t faad_latm_frame(latm_header *latm, bitfile *ld);126uint32_t faad_latm_frame(latm_header *latm, bitfile *ld);
127#endif
126 128
127#ifdef __cplusplus129#ifdef __cplusplus
128}130}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t