fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-19 20:40:36 +01:00
Code Issues Projects Releases Wiki Activity

Convert aac-dec.c to feed bytes blindly

Browse Source
This commit is contained in:
Martin Storsjo 2018-07-07 00:09:07 +03:00
parent 08a821d188
commit a811fd41b5
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
aac-dec.c
View File

@ -55,44 +55,39 @@ int main(int argc, char *argv[]) {
int n, packet_size, i; int n, packet_size, i;
UINT valid; UINT valid;
AAC_DECODER_ERROR err; AAC_DECODER_ERROR err;
n = fread(packet, 1, 7, in); n = fread(packet, 1, 150, in);
if (n != 7) if (n <= 0)
break; break;
if (packet[0] != 0xff || (packet[1] & 0xf0) != 0xf0) { packet_size = n;
fprintf(stderr, "Not an ADTS packet\n");
break;
}
packet_size = ((packet[3] & 0x03) << 11) | (packet[4] << 3) | (packet[5] >> 5);
n = fread(packet + 7, 1, packet_size - 7, in);
if (n != packet_size - 7) {
fprintf(stderr, "Partial packet\n");
break;
}
valid = packet_size; valid = packet_size;
err = aacDecoder_Fill(handle, &ptr, &packet_size, &valid); err = aacDecoder_Fill(handle, &ptr, &packet_size, &valid);
if (err != AAC_DEC_OK) { if (err != AAC_DEC_OK) {
fprintf(stderr, "Fill failed: %x\n", err); fprintf(stderr, "Fill failed: %x\n", err);
break; break;
} }
if (valid != 0) {
fprintf(stderr, "Unable to feed all %d input bytes, %d bytes left\n", n, valid);
}
while (1) {
err = aacDecoder_DecodeFrame(handle, decode_buf, output_size / sizeof(INT_PCM), 0); err = aacDecoder_DecodeFrame(handle, decode_buf, output_size / sizeof(INT_PCM), 0);
if (err == AAC_DEC_NOT_ENOUGH_BITS) if (err == AAC_DEC_NOT_ENOUGH_BITS)
continue; break;
if (err != AAC_DEC_OK) { if (err != AAC_DEC_OK) {
fprintf(stderr, "Decode failed: %x\n", err); fprintf(stderr, "Decode failed: %x\n", err);
continue; break;
} }
if (!wav) { if (!wav) {
CStreamInfo *info = aacDecoder_GetStreamInfo(handle); CStreamInfo *info = aacDecoder_GetStreamInfo(handle);
if (!info || info->sampleRate <= 0) { if (!info || info->sampleRate <= 0) {
fprintf(stderr, "No stream info\n"); fprintf(stderr, "No stream info\n");
break; goto end;
} }
frame_size = info->frameSize * info->numChannels; frame_size = info->frameSize * info->numChannels;
// Note, this probably doesn't return channels > 2 in the right order for wav // Note, this probably doesn't return channels > 2 in the right order for wav
wav = wav_write_open(outfile, info->sampleRate, 16, info->numChannels); wav = wav_write_open(outfile, info->sampleRate, 16, info->numChannels);
if (!wav) { if (!wav) {
perror(outfile); perror(outfile);
break; goto end;
} }
} }
for (i = 0; i < frame_size; i++) { for (i = 0; i < frame_size; i++) {
@ -102,6 +97,8 @@ int main(int argc, char *argv[]) {
} }
wav_write_data(wav, output_buf, 2*frame_size); wav_write_data(wav, output_buf, 2*frame_size);
} }
}
end:
free(output_buf); free(output_buf);
free(decode_buf); free(decode_buf);
fclose(in); fclose(in);