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
233233 }
234234
235235
236+#if 0
236237 static int latmCheck(latm_header *latm, bitfile *ld)
237238 {
238239 uint32_t good=0, bad=0, bits, m;
@@ -256,7 +257,7 @@ static int latmCheck(latm_header *latm, bitfile *ld) · 17 unmodified lines
256257
257258 return (good>0);
258259 }
259−
260+#endif
260261
261262 long NeAACDecInit(NeAACDecHandle hpDecoder,
262263 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
25222522 }
25232523
25242524 /* LATM parsing functions */
2525+#if 0
25252526
25262527 static uint32_t latm_get_value(bitfile *ld)
25272528 {
@@ -2536,7 +2537,6 @@ static uint32_t latm_get_value(bitfile *ld) · 8 unmodified lines
25362537 return value;
25372538 }
25382539
2539−
25402540 static uint32_t latmParsePayload(latm_header *latm, bitfile *ld)
25412541 {
25422542 //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
25602560 return framelen;
25612561 }
25622562
2563−
25642563 static uint32_t latmAudioMuxElement(latm_header *latm, bitfile *ld)
25652564 {
25662565 uint32_t ascLen, asc_bits=0;
@@ -2677,7 +2676,6 @@ static uint32_t latmAudioMuxElement(latm_header *latm, bitfile *ld) · 110 unmodified lines
26772676 return 0;
26782677 }
26792678
2680−
26812679 uint32_t faad_latm_frame(latm_header *latm, bitfile *ld)
26822680 {
26832681 uint16_t len;
@@ -2705,3 +2703,4 @@ uint32_t faad_latm_frame(latm_header *latm, bitfile *ld) · 21 unmodified lines
27052703 }
27062704 return 0xFFFFFFFF;
27072705 }
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
122122 void DRM_aac_scalable_main_element(NeAACDecStruct *hDecoder, NeAACDecFrameInfo *hInfo,
123123 bitfile *ld, program_config *pce, drc_info *drc);
124124 #endif
125+#if 0
125126 uint32_t faad_latm_frame(latm_header *latm, bitfile *ld);
127+#endif
126128
127129 #ifdef __cplusplus
128130 }

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