Support some more audio sample formats. Only warn about non-comparison of video once.

1 files changed, 41 insertions, 4 deletions

diff --git a/ffcmp.c b/ffcmp.c
index 720a597e..2e886790 100644
--- a/ffcmp.c
+++ b/ffcmp.c
@@ -6,6 +6,7 @@
 #endif
 #include <getopt.h>
 #include <stdbool.h>
+#include <math.h>
 
 #define MAX_COMPLETE_FRAMES 64
 
@@ -72,6 +73,8 @@ open_file(char* filename)
 bool
 read_frame(File* file)
 {
+	static bool warned_about_video = false;
+
 	int r = av_read_frame(file->format_context, &file->packet);
 	if (r == AVERROR_EOF) {
 		return true;
@@ -84,7 +87,10 @@ read_frame(File* file)
 
 	switch (file->format_context->streams[file->packet.stream_index]->codec->codec_type) {
 	case AVMEDIA_TYPE_VIDEO:
-		fprintf(stderr, "Warning: ignoring video frame.\n");
+		if (!warned_about_video) {
+			fprintf(stderr, "Warning: ignoring video frames.\n");
+			warned_about_video = true;
+		}
 		break;
 	case AVMEDIA_TYPE_AUDIO:
 	{
@@ -129,7 +135,7 @@ void help(char const * name)
 {
 	fprintf(stderr, "Syntax: %s [options] file1 file2\n", name);
 	fprintf(stderr, "Options are:\n");
-	fprintf(stderr, "\t--audio-sample-tolerance, -t  specify allowable absolute difference in audio sample value\n");
+	fprintf(stderr, "\t--audio-sample-tolerance, -t  specify allowable difference in audio sample value, in bits (e.g. 1 means least significant bit can differ)\n");
 }
 
 int main(int argc, char** argv)
@@ -232,11 +238,12 @@ int main(int argc, char** argv)
 					switch (stream->codec->sample_fmt) {
 					case AV_SAMPLE_FMT_S16:
 					{
+						int const tol = pow(2, audio_sample_tolerance - 1);
 						int16_t* p = (int16_t *) (file[0].complete_frames[0].frame->data[0]);
 						int16_t* q = (int16_t *) (file[1].complete_frames[0].frame->data[0]);
 						for (int i = 0; i < channels; ++i) {
 							for (int j = 0; j < frames; ++j) {
-								if (abs(*p - *q) > audio_sample_tolerance) {
+								if (abs(*p - *q) > tol) {
 									different = true;
 									fprintf(stderr, "\tsamples %d vs %d at channel %d frame %d\n", *p, *q, i, j);
 								}
@@ -246,8 +253,38 @@ int main(int argc, char** argv)
 						}
 						break;
 					}
+					case AV_SAMPLE_FMT_S32P:
+					{
+						int const tol = pow(2, audio_sample_tolerance - 1);
+						int32_t** p = (int32_t **) (file[0].complete_frames[0].frame->data);
+						int32_t** q = (int32_t **) (file[1].complete_frames[0].frame->data);
+						for (int i = 0; i < channels; ++i) {
+							for (int j = 0; j < frames; ++j) {
+								if (abs(p[i][j] - q[i][j]) > tol) {
+									different = true;
+									fprintf(stderr, "\tsamples %d vs %d at channel %d frame %d\n", p[i][j], q[i][j], i, j);
+								}
+							}
+						}
+						break;
+					}
+					case AV_SAMPLE_FMT_FLTP:
+					{
+						float const tol = pow(2, audio_sample_tolerance - 1) / ((float) pow(2, 32));
+						float** p = (float **) (file[0].complete_frames[0].frame->data);
+						float** q = (float **) (file[1].complete_frames[0].frame->data);
+						for (int i = 0; i < channels; ++i) {
+							for (int j = 0; j < frames; ++j) {
+								if (fabs(p[i][j] - q[i][j]) > tol) {
+									different = true;
+									fprintf(stderr, "\tsamples %f vs %f at channel %d frame %d\n", p[i][j], q[i][j], i, j);
+								}
+							}
+						}
+						break;
+					}
 					default:
-						fprintf(stderr, "Audio frames differ and could not be compared in detail.\n");
+						fprintf(stderr, "Audio frames differ and could not be compared in detail (sample format %d unsupported).\n", stream->codec->sample_fmt);
 						break;
 					}