On Tue, Aug 09, 2016 at 01:26:04PM +0200, sebechlebsky...@gmail.com wrote: > From: Jan Sebechlebsky <sebechlebsky...@gmail.com> > > Signed-off-by: Jan Sebechlebsky <sebechlebsky...@gmail.com> > --- > Changes since the last version: > - Removed empty lines at the end of fifo_muxer.c file > [...] > diff --git a/tests/Makefile b/tests/Makefile > index 895944d..0848766 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -128,6 +128,7 @@ include $(SRC_PATH)/tests/fate/exif.mak > include $(SRC_PATH)/tests/fate/ffmpeg.mak > include $(SRC_PATH)/tests/fate/ffprobe.mak > include $(SRC_PATH)/tests/fate/fft.mak > +include $(SRC_PATH)/tests/fate/fifo-muxer.mak > include $(SRC_PATH)/tests/fate/filter-audio.mak > include $(SRC_PATH)/tests/fate/filter-video.mak > include $(SRC_PATH)/tests/fate/flac.mak > diff --git a/tests/fate/fifo-muxer.mak b/tests/fate/fifo-muxer.mak > new file mode 100644 > index 0000000..a064069 > --- /dev/null > +++ b/tests/fate/fifo-muxer.mak > @@ -0,0 +1,20 @@ > +fate-fifo-muxer-h264: CMD = ffmpeg -i $(TARGET_SAMPLES)/mkv/1242-small.mkv > -vframes 11\ > + -c:v copy -c:a copy -map v:0 -map a:0 -flags > +bitexact\ > + -fflags +bitexact -f fifo -fifo_format framecrc - > +fate-fifo-muxer-h264: REF = $(SRC_PATH)/tests/ref/fate/mkv-1242 > +FATE_FIFO_MUXER-$(call ALLYES, FIFO_MUXER, MATROSKA_DEMUXER, H264_DECODER) > += fate-fifo-muxer-h264 > +
> +fate-fifo-muxer-wav: CMD = ffmpeg -i > $(TARGET_SAMPLES)/audio-reference/chorusnoise_2ch_44kHz_s16.wav\ > + -c:a copy -map a:0 -flags +bitexact\ > + -fflags +bitexact -f fifo -fifo_format wav md5: inconsistent mix of space and tab > +fate-fifo-muxer-wav: CMP = oneline > +fate-fifo-muxer-wav: REF = 4dda5dcc7ecdc2218b0739a152ada802 > +FATE_FIFO_MUXER-$(call ALLYES, FIFO_MUXER, WAV_DEMUXER) += > fate-fifo-muxer-wav > + > +fate-fifo-muxer-tst: libavformat/tests/fifo_muxer$(EXESUF) > +fate-fifo-muxer-tst: CMD = run libavformat/tests/fifo_muxer > +FATE_FIFO_MUXER-$(CONFIG_FIFO_MUXER) += fate-fifo-muxer-tst > + > +FATE_SAMPLES_FFMPEG += fate-fifo-muxer-h264 fate-fifo-muxer-wav > +FATE_FFMPEG += fate-fifo-muxer-tst > +fate-fifo-muxer: $(FATE_FIFO_MUXER-yes) works on linux 32 & 64bit fails on mingw32 & 64 make: *** No rule to make target `libavformat/tests/fifo_muxer.exe', needed by `fate-fifo-muxer-tst'. make: Target `fate-fifo-muxer-tst' not remade because of errors. --- - 2016-08-09 19:30:03.073845341 +0200 +++ tests/data/fate/fifo-muxer-wav 2016-08-09 19:30:01.012629533 +0200 @@ -1 +0,0 @@ -4dda5dcc7ecdc2218b0739a152ada802 --- tests/ref/fate/mkv-1242 2016-08-09 12:44:16.864116669 +0200 +++ tests/data/fate/fifo-muxer-h264 2016-08-09 19:30:01.012629533 +0200 @@ -1,47 +0,0 @@ -#extradata 0: 93, 0xc2a32e14 -#extradata 1: 2, 0x00b200a1 -#tb 0: 1/1000 -#media_type 0: video -#codec_id 0: h264 -#dimensions 0: 1280x718 -#sar 0: 1/1 -#tb 1: 1/1000 -#media_type 1: audio -#codec_id 1: aac -#sample_rate 1: 48000 -#channel_layout 1: 3 -0, -42, 0, 41, 2969, 0xa7016742 -0, 0, 42, 41, 135, 0x33af1a9e, F=0x0 -1, 0, 0, 21, 6, 0x027e00e8 -1, 21, 21, 21, 6, 0x027e00e8 -0, 42, 83, 41, 9196, 0x24d8439f -1, 42, 42, 21, 6, 0x027e00e8 -1, 63, 63, 21, 6, 0x027e00e8 -0, 83, 125, 41, 4926, 0xd7e2e492, F=0x0 -1, 85, 85, 21, 6, 0x027e00e8 -1, 106, 106, 21, 24, 0x886f0c1f -0, 125, 167, 41, 11069, 0x44839c66 -1, 127, 127, 21, 550, 0xf863059c -1, 148, 148, 22, 596, 0x32d414c1 -0, 167, 250, 41, 6143, 0xc25343dd, F=0x0 -1, 171, 171, 21, 247, 0x2d0776c9 -1, 192, 192, 21, 264, 0xf04a7b44 -0, 209, 209, 41, 4197, 0x3b9f74ad, F=0x0 -1, 213, 213, 21, 251, 0xc7628539 -1, 234, 234, 22, 243, 0x99ef768b -0, 250, 334, 41, 17595, 0x1e502128, F=0x0 -1, 256, 256, 21, 257, 0x233f7ccc -1, 277, 277, 21, 264, 0x7d9f7bd9 -0, 292, 292, 41, 741, 0xe6b94afc, F=0x0 -1, 298, 298, 21, 298, 0x51478f98 -1, 319, 319, 22, 323, 0x419d9938 -0, 334, 417, 41, 16138, 0xba72f2fe, F=0x0 -1, 341, 341, 21, 309, 0x6219980c -1, 362, 362, 21, 325, 0x3fb3976f -0, 375, 375, 41, 322, 0xd6bf790f, F=0x0 -1, 383, 383, 21, 325, 0xcd7a9fd6 -1, 404, 404, 22, 359, 0x6edeb91c -1, 426, 426, 21, 333, 0xb8999fb7 -1, 447, 447, 21, 317, 0xf2589e1a -1, 468, 468, 21, 319, 0x82ed9572 -1, 489, 489, 22, 473, 0xea54e696 Test fifo-muxer-wav failed. Look at tests/data/fate/fifo-muxer-wav.err for details. make: *** [fate-fifo-muxer-wav] Error 1 Test fifo-muxer-h264 failed. Look at tests/data/fate/fifo-muxer-h264.err for details. make: *** [fate-fifo-muxer-h264] Error 1 [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Observe your enemies, for they first find out your faults. -- Antisthenes
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
