History

make write output optional

lieff committed 8 years ago

Commit 9c7ce371 parent 64a369d2 files · +11 −8Browse files

Unified · Split

2 files
  1. minimp3.c +10 −7
  2. scripts/build.sh +1 −1
minimp3.c+10−7
@@ -1656,7 +1656,7 @@ static char *wav_header(int hz, int ch, int bips, int data_bytes) · 1655 unmodified lines
16561656 return hdr;
16571657 }
16581658
1659−static void decode_file(FILE *file_mp3, FILE *file_wav, FILE *file_ref)
1659+static void decode_file(FILE *file_mp3, FILE *file_ref, FILE *file_out)
16601660 {
16611661 static mp3dec_t mp3d = { 0, };
16621662 mp3dec_frame_info_t info;
@@ -1684,7 +1684,8 @@ static void decode_file(FILE *file_mp3, FILE *file_wav, FILE *file_ref) · 21 unmodified lines
16841684 maxdiff = MSEtemp;
16851685 MSE += MSEtemp*MSEtemp;
16861686 }
1687− fwrite(pcm, samples, 2*info.channels, file_wav);
1687+ if (file_out)
1688+ fwrite(pcm, samples, 2*info.channels, file_out);
16881689 }
16891690 memmove(buf, buf + info.frame_bytes, nbuf -= info.frame_bytes);
16901691 } while (info.frame_bytes);
@@ -1704,21 +1705,23 @@ static void decode_file(FILE *file_mp3, FILE *file_wav, FILE *file_ref) · 13 unmodified lines
17041705 //data_bytes = ftell(file_wav) - 44;
17051706 //rewind(file_wav);
17061707 //fwrite(wav_header(info.hz, info.channels, 16, data_bytes), 1, 44, file_wav);
1707− fclose(file_wav);
17081708 fclose(file_mp3);
1709+ fclose(file_ref);
1710+ if (file_out)
1711+ fclose(file_out);
17091712 }
17101713
17111714 int main(int argc, char *argv[])
17121715 {
17131716 char *input_file_name = (argc > 1) ? argv[1] : NULL;
1714− char *output_file_name = (argc > 2) ? argv[2] : NULL;
1715− char *ref_file_name = (argc > 3) ? argv[3] : NULL;
1716− if (!input_file_name || !output_file_name || !ref_file_name)
1717+ char *ref_file_name = (argc > 2) ? argv[2] : NULL;
1718+ char *output_file_name = (argc > 3) ? argv[3] : NULL;
1719+ if (!input_file_name || !ref_file_name)
17171720 {
17181721 printf("error: no file names given\n");
17191722 return 1;
17201723 }
1721− decode_file(fopen(input_file_name, "rb"), fopen(output_file_name, "wb"), fopen(ref_file_name, "rb"));
1724+ decode_file(fopen(input_file_name, "rb"), fopen(ref_file_name, "rb"), output_file_name ? fopen(output_file_name, "wb") : NULL);
17221725 return 0;
17231726 }
17241727 #endif
scripts/build.sh+1−1
@@ -11,7 +11,7 @@ APP=./minimp3 · 10 unmodified lines
1111
1212 set +e
1313 for i in fate-suite.ffmpeg.org/mp3-conformance/*.bit; do
14−$APP $i $i.out ${i%.*}.pcm
14+$APP $i ${i%.*}.pcm
1515 retval=$?
1616 echo $i exited with code=$retval
1717 if [ ! $retval -eq 0 ]; then

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