From 7c6d2406655ae44dd97e95253a2f2d5b27a1c449 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Mon, 14 May 2012 16:47:59 +0100 Subject: mtv: do not byteswap raw video in demuxer Signed-off-by: Mans Rullgard --- tests/ref/fate/mtv | 80 +++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'tests') diff --git a/tests/ref/fate/mtv b/tests/ref/fate/mtv index 2e88bd8333..4f8f6165b7 100644 --- a/tests/ref/fate/mtv +++ b/tests/ref/fate/mtv @@ -1,138 +1,138 @@ #tb 0: 1/16 #tb 1: 1/44100 -0, 0, 0, 1, 12288, 0x80398ebc +0, 0, 0, 1, 12288, 0xc2258ebc 1, 0, 0, 1152, 417, 0xae1cc66a 1, 1152, 1152, 1152, 418, 0xdc3ec850 1, 2304, 2304, 1152, 418, 0x4e8ed05f -0, 1, 1, 1, 12288, 0x80398ebc +0, 1, 1, 1, 12288, 0xc2258ebc 1, 3456, 3456, 1152, 418, 0xeb43d574 1, 4608, 4608, 1152, 418, 0x9357c91d -0, 2, 2, 1, 12288, 0x6678829c +0, 2, 2, 1, 12288, 0xb3fe829c 1, 5760, 5760, 1152, 418, 0x5306d16b 1, 6912, 6912, 1152, 418, 0x46e0d4da 1, 8064, 8064, 1152, 418, 0xac11ce79 -0, 3, 3, 1, 12288, 0xda08884a +0, 3, 3, 1, 12288, 0x2315884a 1, 9216, 9216, 1152, 418, 0xffdfc4ad 1, 10368, 10368, 1152, 418, 0xf8a8c2ff -0, 4, 4, 1, 12288, 0x45ae8046 +0, 4, 4, 1, 12288, 0x95a08046 1, 11520, 11520, 1152, 418, 0x2d66d83f 1, 12672, 12672, 1152, 418, 0x65c0da12 -0, 5, 5, 1, 12288, 0x926c886b +0, 5, 5, 1, 12288, 0xdb49886b 1, 13824, 13824, 1152, 418, 0x0eafd20f 1, 14976, 14976, 1152, 418, 0x8c6dd949 1, 16128, 16128, 1152, 418, 0x9094c02d -0, 6, 6, 1, 12288, 0x926c886b +0, 6, 6, 1, 12288, 0xdb49886b 1, 17280, 17280, 1152, 418, 0xb47bd944 1, 18432, 18432, 1152, 418, 0x935ccce7 -0, 7, 7, 1, 12288, 0x926c886b +0, 7, 7, 1, 12288, 0xdb49886b 1, 19584, 19584, 1152, 418, 0x6e3ed020 1, 20736, 20736, 1152, 418, 0x8922cd6c 1, 21888, 21888, 1152, 418, 0xe811c8f8 -0, 8, 8, 1, 12288, 0x926c886b +0, 8, 8, 1, 12288, 0xdb49886b 1, 23040, 23040, 1152, 418, 0xb84adc72 1, 24192, 24192, 1152, 418, 0xa2bbc5f4 -0, 9, 9, 1, 12288, 0x926c886b +0, 9, 9, 1, 12288, 0xdb49886b 1, 25344, 25344, 1152, 418, 0xec0cb67d 1, 26496, 26496, 1152, 418, 0x89d1d014 -0, 10, 10, 1, 12288, 0x926c886b +0, 10, 10, 1, 12288, 0xdb49886b 1, 27648, 27648, 1152, 418, 0xfb5bc872 1, 28800, 28800, 1152, 417, 0x8bfcc7a0 1, 29952, 29952, 1152, 418, 0xeb4ac61b -0, 11, 11, 1, 12288, 0x926c886b +0, 11, 11, 1, 12288, 0xdb49886b 1, 31104, 31104, 1152, 418, 0xd3cbc3c4 1, 32256, 32256, 1152, 418, 0xa272d092 -0, 12, 12, 1, 12288, 0x926c886b +0, 12, 12, 1, 12288, 0xdb49886b 1, 33408, 33408, 1152, 418, 0x611ec37e 1, 34560, 34560, 1152, 418, 0x70a3d423 1, 35712, 35712, 1152, 418, 0xeff9ccf4 -0, 13, 13, 1, 12288, 0x926c886b +0, 13, 13, 1, 12288, 0xdb49886b 1, 36864, 36864, 1152, 418, 0x9788c65b 1, 38016, 38016, 1152, 418, 0xe9a8cb8c -0, 14, 14, 1, 12288, 0x926c886b +0, 14, 14, 1, 12288, 0xdb49886b 1, 39168, 39168, 1152, 418, 0x5834c300 1, 40320, 40320, 1152, 418, 0xa4b8cd3a -0, 15, 15, 1, 12288, 0x926c886b +0, 15, 15, 1, 12288, 0xdb49886b 1, 41472, 41472, 1152, 418, 0x6de2c7f9 1, 42624, 42624, 1152, 418, 0x961bbbf3 1, 43776, 43776, 1152, 418, 0x53edc13a -0, 16, 16, 1, 12288, 0x45ae8046 +0, 16, 16, 1, 12288, 0x95a08046 1, 44928, 44928, 1152, 418, 0x2fedc4b0 1, 46080, 46080, 1152, 418, 0xb756c18b -0, 17, 17, 1, 12288, 0x926c886b +0, 17, 17, 1, 12288, 0xdb49886b 1, 47232, 47232, 1152, 418, 0xaf0ed0e4 1, 48384, 48384, 1152, 418, 0x019fd3f0 1, 49536, 49536, 1152, 418, 0x6e29d83e -0, 18, 18, 1, 12288, 0x45ae8046 +0, 18, 18, 1, 12288, 0x95a08046 1, 50688, 50688, 1152, 418, 0x2ddad6bb 1, 51840, 51840, 1152, 418, 0xafefca99 -0, 19, 19, 1, 12288, 0x926c886b +0, 19, 19, 1, 12288, 0xdb49886b 1, 52992, 52992, 1152, 418, 0x366ed013 1, 54144, 54144, 1152, 418, 0x532ac7e0 -0, 20, 20, 1, 12288, 0x45ae8046 +0, 20, 20, 1, 12288, 0x95a08046 1, 55296, 55296, 1152, 418, 0x1d0cd1ce 1, 56448, 56448, 1152, 417, 0x572ad1e3 1, 57600, 57600, 1152, 418, 0x858cd91f -0, 21, 21, 1, 12288, 0x926c886b +0, 21, 21, 1, 12288, 0xdb49886b 1, 58752, 58752, 1152, 418, 0x82cacdfd 1, 59904, 59904, 1152, 418, 0xf4dcc6ed -0, 22, 22, 1, 12288, 0x45ae8046 +0, 22, 22, 1, 12288, 0x95a08046 1, 61056, 61056, 1152, 418, 0x2cf3ca72 1, 62208, 62208, 1152, 418, 0x5963c859 1, 63360, 63360, 1152, 418, 0xa667c53d -0, 23, 23, 1, 12288, 0x926c886b +0, 23, 23, 1, 12288, 0xdb49886b 1, 64512, 64512, 1152, 418, 0xb2f1d09c 1, 65664, 65664, 1152, 418, 0x2ec1c8d3 -0, 24, 24, 1, 12288, 0x926c886b +0, 24, 24, 1, 12288, 0xdb49886b 1, 66816, 66816, 1152, 418, 0x5754d2e8 1, 67968, 67968, 1152, 418, 0x1956bdba -0, 25, 25, 1, 12288, 0x926c886b +0, 25, 25, 1, 12288, 0xdb49886b 1, 69120, 69120, 1152, 418, 0x3e18bd55 1, 70272, 70272, 1152, 418, 0xe4cfc339 1, 71424, 71424, 1152, 418, 0xb426c835 -0, 26, 26, 1, 12288, 0x926c886b +0, 26, 26, 1, 12288, 0xdb49886b 1, 72576, 72576, 1152, 418, 0xd7b6cbcf 1, 73728, 73728, 1152, 418, 0x340ec315 -0, 27, 27, 1, 12288, 0x926c886b +0, 27, 27, 1, 12288, 0xdb49886b 1, 74880, 74880, 1152, 418, 0x23a9baec 1, 76032, 76032, 1152, 418, 0x9f04cd01 -0, 28, 28, 1, 12288, 0x926c886b +0, 28, 28, 1, 12288, 0xdb49886b 1, 77184, 77184, 1152, 418, 0xa80ec223 1, 78336, 78336, 1152, 418, 0x23d6bd5d 1, 79488, 79488, 1152, 418, 0xcb25cf5b -0, 29, 29, 1, 12288, 0x926c886b +0, 29, 29, 1, 12288, 0xdb49886b 1, 80640, 80640, 1152, 418, 0xccccc217 1, 81792, 81792, 1152, 418, 0x757abbfe -0, 30, 30, 1, 12288, 0x926c886b +0, 30, 30, 1, 12288, 0xdb49886b 1, 82944, 82944, 1152, 418, 0xa2e6cc68 1, 84096, 84096, 1152, 418, 0xdf77cc05 1, 85248, 85248, 1152, 417, 0xe9d2c5d5 -0, 31, 31, 1, 12288, 0x926c886b +0, 31, 31, 1, 12288, 0xdb49886b 1, 86400, 86400, 1152, 418, 0x50dec174 1, 87552, 87552, 1152, 418, 0xf654b27e -0, 32, 32, 1, 12288, 0x45ae8046 +0, 32, 32, 1, 12288, 0x95a08046 1, 88704, 88704, 1152, 418, 0x4d8bc26e 1, 89856, 89856, 1152, 418, 0xccd2bf37 -0, 33, 33, 1, 12288, 0x926c886b +0, 33, 33, 1, 12288, 0xdb49886b 1, 91008, 91008, 1152, 418, 0x6ce2c18a 1, 92160, 92160, 1152, 418, 0xb3cdcf0c 1, 93312, 93312, 1152, 418, 0x55eebe9a -0, 34, 34, 1, 12288, 0x45ae8046 +0, 34, 34, 1, 12288, 0x95a08046 1, 94464, 94464, 1152, 418, 0x9031c9ec 1, 95616, 95616, 1152, 418, 0xb037c49d -0, 35, 35, 1, 12288, 0x926c886b +0, 35, 35, 1, 12288, 0xdb49886b 1, 96768, 96768, 1152, 418, 0x377bcc78 1, 97920, 97920, 1152, 418, 0x3762c725 1, 99072, 99072, 1152, 418, 0x39afbd4d -0, 36, 36, 1, 12288, 0x45ae8046 +0, 36, 36, 1, 12288, 0x95a08046 1, 100224, 100224, 1152, 418, 0x655ed6cd 1, 101376, 101376, 1152, 418, 0x09aec202 -0, 37, 37, 1, 12288, 0x926c886b +0, 37, 37, 1, 12288, 0xdb49886b 1, 102528, 102528, 1152, 418, 0xf2d2ce55 1, 103680, 103680, 1152, 418, 0x254ebf04 -0, 38, 38, 1, 12288, 0x45ae8046 +0, 38, 38, 1, 12288, 0x95a08046 1, 104832, 104832, 1152, 418, 0xa105cdcc 1, 105984, 105984, 1152, 418, 0x1477ba58 1, 107136, 107136, 1152, 418, 0x8d0dcdb2 -0, 39, 39, 1, 3584, 0xba46c435 +0, 39, 39, 1, 3584, 0x0354c435 1, 108288, 108288, 1152, 418, 0x0d7cbef4 1, 109440, 109440, 1152, 294, 0x5e2b87c4 -- cgit v1.2.3 From 369cb092ecbbaff20bb0a2a1d60536c3bc04a8f0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 5 May 2012 18:22:46 +0200 Subject: avconv: add support for audio filters. The FATE changes are all off-by-one due to different rounding being used (lrintf vs av_rescale_q). --- avconv.c | 806 ++++++++++++++++------------------------ doc/avconv.texi | 5 + tests/ref/fate/adpcm-ima-amv | 20 +- tests/ref/fate/adpcm-ima-smjpeg | 16 +- tests/ref/fate/smjpeg | 16 +- 5 files changed, 359 insertions(+), 504 deletions(-) (limited to 'tests') diff --git a/avconv.c b/avconv.c index fbe3827405..25958ea559 100644 --- a/avconv.c +++ b/avconv.c @@ -140,11 +140,6 @@ static float dts_delta_threshold = 10; static int print_stats = 1; -static uint8_t *audio_buf; -static unsigned int allocated_audio_buf_size; -static uint8_t *async_buf; -static unsigned int allocated_async_buf_size; - #define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass" typedef struct InputFilter { @@ -211,6 +206,11 @@ typedef struct InputStream { int resample_width; int resample_pix_fmt; + int resample_sample_fmt; + int resample_sample_rate; + int resample_channels; + uint64_t resample_channel_layout; + /* a pool of free buffers for decoded data */ FrameBuffer *buffer_pool; @@ -249,7 +249,6 @@ typedef struct OutputStream { AVBitStreamFilterContext *bitstream_filters; AVCodec *enc; int64_t max_frames; - AVFrame *output_frame; AVFrame *filtered_frame; /* video only */ @@ -265,14 +264,6 @@ typedef struct OutputStream { int forced_kf_count; int forced_kf_index; - /* audio only */ - int audio_resample; - AVAudioResampleContext *avr; - int resample_sample_fmt; - int resample_channels; - uint64_t resample_channel_layout; - int resample_sample_rate; - AVFifoBuffer *fifo; /* for compression: one audio fifo per codec */ FILE *logfile; OutputFilter *filter; @@ -583,42 +574,150 @@ static void filter_release_buffer(AVFilterBuffer *fb) unref_buffer(buf->ist, buf); } -static char *choose_pixel_fmts(OutputStream *ost) +/** + * Define a function for building a string containing a list of + * allowed formats, + */ +#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, separator) \ +static char *choose_ ## var ## s(OutputStream *ost) \ +{ \ + if (ost->st->codec->var != none) { \ + get_name(ost->st->codec->var); \ + return av_strdup(name); \ + } else if (ost->enc->supported_list) { \ + const type *p; \ + AVIOContext *s = NULL; \ + uint8_t *ret; \ + int len; \ + \ + if (avio_open_dyn_buf(&s) < 0) \ + exit_program(1); \ + \ + for (p = ost->enc->supported_list; *p != none; p++) { \ + get_name(*p); \ + avio_printf(s, "%s" separator, name); \ + } \ + len = avio_close_dyn_buf(s, &ret); \ + ret[len - 1] = 0; \ + return ret; \ + } else \ + return NULL; \ +} + +#define GET_PIX_FMT_NAME(pix_fmt)\ + const char *name = av_get_pix_fmt_name(pix_fmt); + +DEF_CHOOSE_FORMAT(enum PixelFormat, pix_fmt, pix_fmts, PIX_FMT_NONE, + GET_PIX_FMT_NAME, ":") + +#define GET_SAMPLE_FMT_NAME(sample_fmt)\ + const char *name = av_get_sample_fmt_name(sample_fmt) + +DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts, + AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",") + +#define GET_SAMPLE_RATE_NAME(rate)\ + char name[16];\ + snprintf(name, sizeof(name), "%d", rate); + +DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, + GET_SAMPLE_RATE_NAME, ",") + +#define GET_CH_LAYOUT_NAME(ch_layout)\ + char name[16];\ + snprintf(name, sizeof(name), "0x%"PRIx64, ch_layout); + +DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, + GET_CH_LAYOUT_NAME, ",") + +static int configure_audio_filters(FilterGraph *fg, AVFilterContext **in_filter, + AVFilterContext **out_filter) { - if (ost->st->codec->pix_fmt != PIX_FMT_NONE) { - return av_strdup(av_get_pix_fmt_name(ost->st->codec->pix_fmt)); - } else if (ost->enc->pix_fmts) { - const enum PixelFormat *p; - AVIOContext *s = NULL; - uint8_t *ret; - int len; - - if (avio_open_dyn_buf(&s) < 0) - exit_program(1); + InputStream *ist = fg->inputs[0]->ist; + OutputStream *ost = fg->outputs[0]->ost; + AVCodecContext *codec = ost->st->codec; + AVCodecContext *icodec = ist->st->codec; + char *sample_fmts, *sample_rates, *channel_layouts; + char args[256]; + int ret; + + avfilter_graph_free(&fg->graph); + if (!(fg->graph = avfilter_graph_alloc())) + return AVERROR(ENOMEM); + + snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:" + "channel_layout=0x%"PRIx64, ist->st->time_base.num, + ist->st->time_base.den, icodec->sample_rate, + av_get_sample_fmt_name(icodec->sample_fmt), icodec->channel_layout); + ret = avfilter_graph_create_filter(&fg->inputs[0]->filter, + avfilter_get_by_name("abuffer"), + "src", args, NULL, fg->graph); + if (ret < 0) + return ret; - for (p = ost->enc->pix_fmts; *p != PIX_FMT_NONE; p++) - avio_printf(s, "%s:", av_get_pix_fmt_name(*p)); - len = avio_close_dyn_buf(s, &ret); - ret[len - 1] = 0; + ret = avfilter_graph_create_filter(&fg->outputs[0]->filter, + avfilter_get_by_name("abuffersink"), + "out", NULL, NULL, fg->graph); + if (ret < 0) return ret; - } else - return NULL; + + *in_filter = fg->inputs[0]->filter; + *out_filter = fg->outputs[0]->filter; + + if (codec->channels && !codec->channel_layout) + codec->channel_layout = av_get_default_channel_layout(codec->channels); + + sample_fmts = choose_sample_fmts(ost); + sample_rates = choose_sample_rates(ost); + channel_layouts = choose_channel_layouts(ost); + if (sample_fmts || sample_rates || channel_layouts) { + AVFilterContext *format; + char args[256]; + int len = 0; + + if (sample_fmts) + len += snprintf(args + len, sizeof(args) - len, "sample_fmts=%s:", + sample_fmts); + if (sample_rates) + len += snprintf(args + len, sizeof(args) - len, "sample_rates=%s:", + sample_rates); + if (channel_layouts) + len += snprintf(args + len, sizeof(args) - len, "channel_layouts=%s:", + channel_layouts); + args[len - 1] = 0; + + av_freep(&sample_fmts); + av_freep(&sample_rates); + av_freep(&channel_layouts); + + ret = avfilter_graph_create_filter(&format, + avfilter_get_by_name("aformat"), + "aformat", args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(format, 0, fg->outputs[0]->filter, 0); + if (ret < 0) + return ret; + + *out_filter = format; + } + + return 0; } -static int configure_video_filters(FilterGraph *fg) +static int configure_video_filters(FilterGraph *fg, AVFilterContext **in_filter, + AVFilterContext **out_filter) { InputStream *ist = fg->inputs[0]->ist; OutputStream *ost = fg->outputs[0]->ost; - AVFilterContext *in_filter, *out_filter, *filter; + AVFilterContext *filter; AVCodecContext *codec = ost->st->codec; char *pix_fmts; AVRational sample_aspect_ratio; char args[255]; int ret; - avfilter_graph_free(&fg->graph); - fg->graph = avfilter_graph_alloc(); - if (ist->st->sample_aspect_ratio.num) { sample_aspect_ratio = ist->st->sample_aspect_ratio; } else @@ -638,8 +737,8 @@ static int configure_video_filters(FilterGraph *fg) "out", NULL, NULL, fg->graph); if (ret < 0) return ret; - in_filter = fg->inputs[0]->filter; - out_filter = fg->outputs[0]->filter; + *in_filter = fg->inputs[0]->filter; + *out_filter = fg->outputs[0]->filter; if (codec->width || codec->height) { snprintf(args, 255, "%d:%d:flags=0x%X", @@ -649,27 +748,51 @@ static int configure_video_filters(FilterGraph *fg) if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), NULL, args, NULL, fg->graph)) < 0) return ret; - if ((ret = avfilter_link(in_filter, 0, filter, 0)) < 0) + if ((ret = avfilter_link(*in_filter, 0, filter, 0)) < 0) return ret; - in_filter = filter; + *in_filter = filter; } - if ((pix_fmts = choose_pixel_fmts(ost))) { + if ((pix_fmts = choose_pix_fmts(ost))) { if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("format"), "format", pix_fmts, NULL, fg->graph)) < 0) return ret; - if ((ret = avfilter_link(filter, 0, out_filter, 0)) < 0) + if ((ret = avfilter_link(filter, 0, *out_filter, 0)) < 0) return ret; - out_filter = filter; + *out_filter = filter; av_freep(&pix_fmts); } snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags); fg->graph->scale_sws_opts = av_strdup(args); + return 0; +} + +static int configure_simple_filtergraph(FilterGraph *fg) +{ + OutputStream *ost = fg->outputs[0]->ost; + AVFilterContext *in_filter, *out_filter; + int ret; + + avfilter_graph_free(&fg->graph); + fg->graph = avfilter_graph_alloc(); + + switch (ost->st->codec->codec_type) { + case AVMEDIA_TYPE_VIDEO: + ret = configure_video_filters(fg, &in_filter, &out_filter); + break; + case AVMEDIA_TYPE_AUDIO: + ret = configure_audio_filters(fg, &in_filter, &out_filter); + break; + default: av_assert0(0); + } + if (ret < 0) + return ret; + if (ost->avfilter) { AVFilterInOut *outputs = avfilter_inout_alloc(); AVFilterInOut *inputs = avfilter_inout_alloc(); @@ -834,7 +957,7 @@ static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFil pad_idx = 0; } - if ((pix_fmts = choose_pixel_fmts(ofilter->ost))) { + if ((pix_fmts = choose_pix_fmts(ofilter->ost))) { AVFilterContext *filter; if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("format"), @@ -931,7 +1054,8 @@ static int configure_complex_filters(void) static int configure_filtergraph(FilterGraph *fg) { - return fg->graph_desc ? configure_complex_filter(fg) : configure_video_filters(fg); + return fg->graph_desc ? configure_complex_filter(fg) : + configure_simple_filtergraph(fg); } static int ist_in_filtergraph(FilterGraph *fg, InputStream *ist) @@ -1009,13 +1133,6 @@ void exit_program(int ret) } output_streams[i]->bitstream_filters = NULL; - if (output_streams[i]->output_frame) { - AVFrame *frame = output_streams[i]->output_frame; - if (frame->extended_data != frame->data) - av_freep(&frame->extended_data); - av_freep(&frame); - } - av_freep(&output_streams[i]->avfilter); av_freep(&output_streams[i]->filtered_frame); av_freep(&output_streams[i]); @@ -1042,10 +1159,6 @@ void exit_program(int ret) av_freep(&output_files); uninit_opts(); - av_free(audio_buf); - allocated_audio_buf_size = 0; - av_free(async_buf); - allocated_async_buf_size = 0; avfilter_uninit(); avformat_network_deinit(); @@ -1085,25 +1198,6 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder) } } -static void choose_sample_fmt(AVStream *st, AVCodec *codec) -{ - if (codec && codec->sample_fmts) { - const enum AVSampleFormat *p = codec->sample_fmts; - for (; *p != -1; p++) { - if (*p == st->codec->sample_fmt) - break; - } - if (*p == -1) { - av_log(NULL, AV_LOG_WARNING, - "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n", - av_get_sample_fmt_name(st->codec->sample_fmt), - codec->name, - av_get_sample_fmt_name(codec->sample_fmts[0])); - st->codec->sample_fmt = codec->sample_fmts[0]; - } - } -} - /** * Update the requested input sample format based on the output sample format. * This is currently only used to request float output from decoders which @@ -1144,26 +1238,6 @@ static void update_sample_fmt(AVCodecContext *dec, AVCodec *dec_codec, } } -static void choose_sample_rate(AVStream *st, AVCodec *codec) -{ - if (codec && codec->supported_samplerates) { - const int *p = codec->supported_samplerates; - int best = 0; - int best_dist = INT_MAX; - for (; *p; p++) { - int dist = abs(st->codec->sample_rate - *p); - if (dist < best_dist) { - best_dist = dist; - best = *p; - } - } - if (best_dist) { - av_log(st->codec, AV_LOG_WARNING, "Requested sampling rate unsupported using closest supported (%d)\n", best); - } - st->codec->sample_rate = best; - } -} - static double get_sync_ipts(const OutputStream *ost, int64_t pts) { @@ -1235,107 +1309,24 @@ static int check_recording_time(OutputStream *ost) return 1; } -static void get_default_channel_layouts(OutputStream *ost, InputStream *ist) -{ - char layout_name[256]; - AVCodecContext *enc = ost->st->codec; - AVCodecContext *dec = ist->st->codec; - - if (dec->channel_layout && - av_get_channel_layout_nb_channels(dec->channel_layout) != dec->channels) { - av_get_channel_layout_string(layout_name, sizeof(layout_name), - dec->channels, dec->channel_layout); - av_log(NULL, AV_LOG_ERROR, "New channel layout (%s) is invalid\n", - layout_name); - dec->channel_layout = 0; - } - if (!dec->channel_layout) { - if (enc->channel_layout && dec->channels == enc->channels) { - dec->channel_layout = enc->channel_layout; - } else { - dec->channel_layout = av_get_default_channel_layout(dec->channels); - - if (!dec->channel_layout) { - av_log(NULL, AV_LOG_FATAL, "Unable to find default channel " - "layout for Input Stream #%d.%d\n", ist->file_index, - ist->st->index); - exit_program(1); - } - } - av_get_channel_layout_string(layout_name, sizeof(layout_name), - dec->channels, dec->channel_layout); - av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Input Stream " - "#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name); - } - if (!enc->channel_layout) { - if (dec->channels == enc->channels) { - enc->channel_layout = dec->channel_layout; - return; - } else { - enc->channel_layout = av_get_default_channel_layout(enc->channels); - } - if (!enc->channel_layout) { - av_log(NULL, AV_LOG_FATAL, "Unable to find default channel layout " - "for Output Stream #%d.%d\n", ost->file_index, - ost->st->index); - exit_program(1); - } - av_get_channel_layout_string(layout_name, sizeof(layout_name), - enc->channels, enc->channel_layout); - av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Output Stream " - "#%d.%d : %s\n", ost->file_index, ost->st->index, layout_name); - } -} - -static void generate_silence(uint8_t* buf, enum AVSampleFormat sample_fmt, size_t size) -{ - int fill_char = 0x00; - if (sample_fmt == AV_SAMPLE_FMT_U8) - fill_char = 0x80; - memset(buf, fill_char, size); -} - -static int encode_audio_frame(AVFormatContext *s, OutputStream *ost, - const uint8_t *buf, int buf_size) +static void do_audio_out(AVFormatContext *s, OutputStream *ost, + AVFrame *frame) { AVCodecContext *enc = ost->st->codec; - AVFrame *frame = NULL; AVPacket pkt; - int ret, got_packet; + int got_packet = 0; av_init_packet(&pkt); pkt.data = NULL; pkt.size = 0; - if (buf) { - if (!ost->output_frame) { - ost->output_frame = avcodec_alloc_frame(); - if (!ost->output_frame) { - av_log(NULL, AV_LOG_FATAL, "out-of-memory in encode_audio_frame()\n"); - exit_program(1); - } - } - frame = ost->output_frame; - if (frame->extended_data != frame->data) - av_freep(&frame->extended_data); - avcodec_get_frame_defaults(frame); - - frame->nb_samples = buf_size / - (enc->channels * av_get_bytes_per_sample(enc->sample_fmt)); - if ((ret = avcodec_fill_audio_frame(frame, enc->channels, enc->sample_fmt, - buf, buf_size, 1)) < 0) { - av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n"); - exit_program(1); - } - - if (!check_recording_time(ost)) - return 0; + if (!check_recording_time(ost)) + return; + if (frame->pts == AV_NOPTS_VALUE || audio_sync_method < 0) frame->pts = ost->sync_opts; - ost->sync_opts += frame->nb_samples; - } + ost->sync_opts = frame->pts + frame->nb_samples; - got_packet = 0; if (avcodec_encode_audio2(enc, &pkt, frame, &got_packet) < 0) { av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n"); exit_program(1); @@ -1353,207 +1344,6 @@ static int encode_audio_frame(AVFormatContext *s, OutputStream *ost, audio_size += pkt.size; } - - return pkt.size; -} - -static int alloc_audio_output_buf(AVCodecContext *dec, AVCodecContext *enc, - int nb_samples, int *buf_linesize) -{ - int64_t audio_buf_samples; - int audio_buf_size; - - /* calculate required number of samples to allocate */ - audio_buf_samples = ((int64_t)nb_samples * enc->sample_rate + dec->sample_rate) / - dec->sample_rate; - audio_buf_samples = 4 * audio_buf_samples + 16; // safety factors for resampling - audio_buf_samples = FFMAX(audio_buf_samples, enc->frame_size); - if (audio_buf_samples > INT_MAX) - return AVERROR(EINVAL); - - audio_buf_size = av_samples_get_buffer_size(buf_linesize, enc->channels, - audio_buf_samples, - enc->sample_fmt, 0); - if (audio_buf_size < 0) - return audio_buf_size; - - av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size); - if (!audio_buf) - return AVERROR(ENOMEM); - - return 0; -} - -static void do_audio_out(AVFormatContext *s, OutputStream *ost, - InputStream *ist, AVFrame *decoded_frame) -{ - uint8_t *buftmp; - - int size_out, frame_bytes, resample_changed, ret; - AVCodecContext *enc = ost->st->codec; - AVCodecContext *dec = ist->st->codec; - int osize = av_get_bytes_per_sample(enc->sample_fmt); - int isize = av_get_bytes_per_sample(dec->sample_fmt); - uint8_t *buf = decoded_frame->data[0]; - int size = decoded_frame->nb_samples * dec->channels * isize; - int out_linesize = 0; - int buf_linesize = decoded_frame->linesize[0]; - - get_default_channel_layouts(ost, ist); - - if (alloc_audio_output_buf(dec, enc, decoded_frame->nb_samples, &out_linesize) < 0) { - av_log(NULL, AV_LOG_FATAL, "Error allocating audio buffer\n"); - exit_program(1); - } - - if (audio_sync_method > 1 || - enc->channels != dec->channels || - enc->channel_layout != dec->channel_layout || - enc->sample_rate != dec->sample_rate || - dec->sample_fmt != enc->sample_fmt) - ost->audio_resample = 1; - - resample_changed = ost->resample_sample_fmt != dec->sample_fmt || - ost->resample_channels != dec->channels || - ost->resample_channel_layout != dec->channel_layout || - ost->resample_sample_rate != dec->sample_rate; - - if ((ost->audio_resample && !ost->avr) || resample_changed) { - if (resample_changed) { - av_log(NULL, AV_LOG_INFO, "Input stream #%d:%d frame changed from rate:%d fmt:%s ch:%d chl:0x%"PRIx64" to rate:%d fmt:%s ch:%d chl:0x%"PRIx64"\n", - ist->file_index, ist->st->index, - ost->resample_sample_rate, av_get_sample_fmt_name(ost->resample_sample_fmt), - ost->resample_channels, ost->resample_channel_layout, - dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), - dec->channels, dec->channel_layout); - ost->resample_sample_fmt = dec->sample_fmt; - ost->resample_channels = dec->channels; - ost->resample_channel_layout = dec->channel_layout; - ost->resample_sample_rate = dec->sample_rate; - if (ost->avr) - avresample_close(ost->avr); - } - /* if audio_sync_method is >1 the resampler is needed for audio drift compensation */ - if (audio_sync_method <= 1 && - ost->resample_sample_fmt == enc->sample_fmt && - ost->resample_channels == enc->channels && - ost->resample_channel_layout == enc->channel_layout && - ost->resample_sample_rate == enc->sample_rate) { - ost->audio_resample = 0; - } else if (ost->audio_resample) { - if (!ost->avr) { - ost->avr = avresample_alloc_context(); - if (!ost->avr) { - av_log(NULL, AV_LOG_FATAL, "Error allocating context for libavresample\n"); - exit_program(1); - } - } - - av_opt_set_int(ost->avr, "in_channel_layout", dec->channel_layout, 0); - av_opt_set_int(ost->avr, "in_sample_fmt", dec->sample_fmt, 0); - av_opt_set_int(ost->avr, "in_sample_rate", dec->sample_rate, 0); - av_opt_set_int(ost->avr, "out_channel_layout", enc->channel_layout, 0); - av_opt_set_int(ost->avr, "out_sample_fmt", enc->sample_fmt, 0); - av_opt_set_int(ost->avr, "out_sample_rate", enc->sample_rate, 0); - if (audio_sync_method > 1) - av_opt_set_int(ost->avr, "force_resampling", 1, 0); - - /* if both the input and output formats are s16 or u8, use s16 as - the internal sample format */ - if (av_get_bytes_per_sample(dec->sample_fmt) <= 2 && - av_get_bytes_per_sample(enc->sample_fmt) <= 2) { - av_opt_set_int(ost->avr, "internal_sample_fmt", AV_SAMPLE_FMT_S16P, 0); - } - - ret = avresample_open(ost->avr); - if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Error opening libavresample\n"); - exit_program(1); - } - } - } - - if (audio_sync_method > 0) { - double delta = get_sync_ipts(ost, ist->last_dts) * enc->sample_rate - ost->sync_opts - - av_fifo_size(ost->fifo) / (enc->channels * osize); - int idelta = delta * dec->sample_rate / enc->sample_rate; - int byte_delta = idelta * isize * dec->channels; - - // FIXME resample delay - if (fabs(delta) > 50) { - if (ist->is_start || fabs(delta) > audio_drift_threshold*enc->sample_rate) { - if (byte_delta < 0) { - byte_delta = FFMAX(byte_delta, -size); - size += byte_delta; - buf -= byte_delta; - av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio samples\n", - -byte_delta / (isize * dec->channels)); - if (!size) - return; - ist->is_start = 0; - } else { - av_fast_malloc(&async_buf, &allocated_async_buf_size, - byte_delta + size); - if (!async_buf) { - av_log(NULL, AV_LOG_FATAL, "Out of memory in do_audio_out\n"); - exit_program(1); - } - - if (alloc_audio_output_buf(dec, enc, decoded_frame->nb_samples + idelta, &out_linesize) < 0) { - av_log(NULL, AV_LOG_FATAL, "Error allocating audio buffer\n"); - exit_program(1); - } - ist->is_start = 0; - - generate_silence(async_buf, dec->sample_fmt, byte_delta); - memcpy(async_buf + byte_delta, buf, size); - buf = async_buf; - size += byte_delta; - buf_linesize = allocated_async_buf_size; - av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of silence\n", idelta); - } - } else if (audio_sync_method > 1) { - int comp = av_clip(delta, -audio_sync_method, audio_sync_method); - av_log(NULL, AV_LOG_VERBOSE, "compensating audio timestamp drift:%f compensation:%d in:%d\n", - delta, comp, enc->sample_rate); -// fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2)); - avresample_set_compensation(ost->avr, comp, enc->sample_rate); - } - } - } else if (audio_sync_method == 0) - ost->sync_opts = lrintf(get_sync_ipts(ost, ist->last_dts) * enc->sample_rate) - - av_fifo_size(ost->fifo) / (enc->channels * osize); // FIXME wrong - - if (ost->audio_resample) { - buftmp = audio_buf; - size_out = avresample_convert(ost->avr, (void **)&buftmp, - allocated_audio_buf_size, out_linesize, - (void **)&buf, buf_linesize, - size / (dec->channels * isize)); - size_out = size_out * enc->channels * osize; - } else { - buftmp = buf; - size_out = size; - } - - /* now encode as many frames as possible */ - if (!(enc->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) { - /* output resampled raw samples */ - if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) { - av_log(NULL, AV_LOG_FATAL, "av_fifo_realloc2() failed\n"); - exit_program(1); - } - av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL); - - frame_bytes = enc->frame_size * osize * enc->channels; - - while (av_fifo_size(ost->fifo) >= frame_bytes) { - av_fifo_generic_read(ost->fifo, audio_buf, frame_bytes, NULL); - encode_audio_frame(s, ost, audio_buf, frame_bytes); - } - } else { - encode_audio_frame(s, ost, buftmp, size_out); - } } static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void **bufp) @@ -1852,6 +1642,7 @@ static int poll_filters(void) for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; OutputFile *of = output_files[ost->file_index]; + int ret = 0; if (!ost->filter || ost->is_past_recording_time) continue; @@ -1862,11 +1653,29 @@ static int poll_filters(void) avcodec_get_frame_defaults(ost->filtered_frame); filtered_frame = ost->filtered_frame; - while (av_buffersink_read(ost->filter->filter, &picref) >= 0) { + while (ret >= 0) { + if (ost->enc->type == AVMEDIA_TYPE_AUDIO && + !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) + ret = av_buffersink_read_samples(ost->filter->filter, &picref, + ost->st->codec->frame_size); + else + ret = av_buffersink_read(ost->filter->filter, &picref); + + if (ret < 0) + break; + avfilter_copy_buf_props(filtered_frame, picref); - filtered_frame->pts = av_rescale_q(picref->pts, - ost->filter->filter->inputs[0]->time_base, - AV_TIME_BASE_Q); + if (ost->enc->type == AVMEDIA_TYPE_VIDEO) + filtered_frame->pts = av_rescale_q(picref->pts, + ost->filter->filter->inputs[0]->time_base, + AV_TIME_BASE_Q); + else if (picref->pts != AV_NOPTS_VALUE) + filtered_frame->pts = av_rescale_q(picref->pts, + ost->filter->filter->inputs[0]->time_base, + ost->st->codec->time_base) - + av_rescale_q(of->start_time, + AV_TIME_BASE_Q, + ost->st->codec->time_base); if (of->start_time && filtered_frame->pts < of->start_time) return 0; @@ -1882,8 +1691,11 @@ static int poll_filters(void) if (vstats_filename && frame_size) do_video_stats(of->ctx, ost, frame_size); break; + case AVMEDIA_TYPE_AUDIO: + do_audio_out(of->ctx, ost, filtered_frame); + break; default: - // TODO support audio/subtitle filters + // TODO support subtitle filters av_assert0(0); } @@ -2033,38 +1845,38 @@ static void flush_encoders(void) continue; for (;;) { - AVPacket pkt; - int fifo_bytes, got_packet; - av_init_packet(&pkt); - pkt.data = NULL; - pkt.size = 0; + int (*encode)(AVCodecContext*, AVPacket*, const AVFrame*, int*) = NULL; + const char *desc; + int64_t *size; switch (ost->st->codec->codec_type) { case AVMEDIA_TYPE_AUDIO: - fifo_bytes = av_fifo_size(ost->fifo); - if (fifo_bytes > 0) { - /* encode any samples remaining in fifo */ - int frame_bytes = fifo_bytes; - - av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL); - - encode_audio_frame(os, ost, audio_buf, frame_bytes); - } else { - /* flush encoder with NULL frames until it is done - returning packets */ - if (encode_audio_frame(os, ost, NULL, 0) == 0) { - stop_encoding = 1; - break; - } - } + encode = avcodec_encode_audio2; + desc = "Audio"; + size = &audio_size; break; case AVMEDIA_TYPE_VIDEO: - ret = avcodec_encode_video2(enc, &pkt, NULL, &got_packet); + encode = avcodec_encode_video2; + desc = "Video"; + size = &video_size; + break; + default: + stop_encoding = 1; + } + + if (encode) { + AVPacket pkt; + int got_packet; + av_init_packet(&pkt); + pkt.data = NULL; + pkt.size = 0; + + ret = encode(enc, &pkt, NULL, &got_packet); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n"); + av_log(NULL, AV_LOG_FATAL, "%s encoding failed\n", desc); exit_program(1); } - video_size += ret; + *size += ret; if (ost->logfile && enc->stats_out) { fprintf(ost->logfile, "%s", enc->stats_out); } @@ -2077,10 +1889,8 @@ static void flush_encoders(void) if (pkt.dts != AV_NOPTS_VALUE) pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base); write_frame(os, &pkt, ost); - break; - default: - stop_encoding = 1; } + if (stop_encoding) break; } @@ -2172,12 +1982,30 @@ static void rate_emu_sleep(InputStream *ist) } } +static int guess_input_channel_layout(InputStream *ist) +{ + AVCodecContext *dec = ist->st->codec; + + if (!dec->channel_layout) { + char layout_name[256]; + + dec->channel_layout = av_get_default_channel_layout(dec->channels); + if (!dec->channel_layout) + return 0; + av_get_channel_layout_string(layout_name, sizeof(layout_name), + dec->channels, dec->channel_layout); + av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Input Stream " + "#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name); + } + return 1; +} + static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) { AVFrame *decoded_frame; AVCodecContext *avctx = ist->st->codec; int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt); - int i, ret; + int i, ret, resample_changed; if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame())) return AVERROR(ENOMEM); @@ -2192,6 +2020,9 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) if (!*got_output) { /* no audio frame */ + if (!pkt->size) + for (i = 0; i < ist->nb_filters; i++) + av_buffersrc_buffer(ist->filters[i]->filter, NULL); return ret; } @@ -2199,11 +2030,10 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) the decoder could be delaying output by a packet or more. */ if (decoded_frame->pts != AV_NOPTS_VALUE) ist->next_dts = decoded_frame->pts; - - /* increment next_dts to use for the case where the input stream does not - have timestamps or there are multiple frames in the packet */ - ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) / - avctx->sample_rate; + else if (pkt->pts != AV_NOPTS_VALUE) { + decoded_frame->pts = pkt->pts; + pkt->pts = AV_NOPTS_VALUE; + } // preprocess audio (volume) if (audio_volume != 256) { @@ -2265,14 +2095,50 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) rate_emu_sleep(ist); - for (i = 0; i < nb_output_streams; i++) { - OutputStream *ost = output_streams[i]; + resample_changed = ist->resample_sample_fmt != decoded_frame->format || + ist->resample_channels != avctx->channels || + ist->resample_channel_layout != decoded_frame->channel_layout || + ist->resample_sample_rate != decoded_frame->sample_rate; + if (resample_changed) { + char layout1[64], layout2[64]; - if (!check_output_constraints(ist, ost) || !ost->encoding_needed) - continue; - do_audio_out(output_files[ost->file_index]->ctx, ost, ist, decoded_frame); + if (!guess_input_channel_layout(ist)) { + av_log(NULL, AV_LOG_FATAL, "Unable to find default channel " + "layout for Input Stream #%d.%d\n", ist->file_index, + ist->st->index); + exit_program(1); + } + decoded_frame->channel_layout = avctx->channel_layout; + + av_get_channel_layout_string(layout1, sizeof(layout1), ist->resample_channels, + ist->resample_channel_layout); + av_get_channel_layout_string(layout2, sizeof(layout2), avctx->channels, + decoded_frame->channel_layout); + + av_log(NULL, AV_LOG_INFO, + "Input stream #%d:%d frame changed from rate:%d fmt:%s ch:%d chl:%s to rate:%d fmt:%s ch:%d chl:%s\n", + ist->file_index, ist->st->index, + ist->resample_sample_rate, av_get_sample_fmt_name(ist->resample_sample_fmt), + ist->resample_channels, layout1, + decoded_frame->sample_rate, av_get_sample_fmt_name(decoded_frame->format), + avctx->channels, layout2); + + ist->resample_sample_fmt = decoded_frame->format; + ist->resample_sample_rate = decoded_frame->sample_rate; + ist->resample_channel_layout = decoded_frame->channel_layout; + ist->resample_channels = avctx->channels; + + for (i = 0; i < nb_filtergraphs; i++) + if (ist_in_filtergraph(filtergraphs[i], ist) && + configure_filtergraph(filtergraphs[i]) < 0) { + av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n"); + exit_program(1); + } } + for (i = 0; i < ist->nb_filters; i++) + av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame); + return ret; } @@ -2550,17 +2416,6 @@ static int init_input_stream(int ist_index, char *error, int error_len) } assert_codec_experimental(ist->st->codec, 0); assert_avoptions(ist->opts); - - if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - for (i = 0; i < nb_output_streams; i++) { - OutputStream *ost = output_streams[i]; - if (ost->source_index == ist_index) { - if (!ist->st->codec->channel_layout || !ost->st->codec->channel_layout) - get_default_channel_layouts(ost, ist); - break; - } - } - } } ist->last_dts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0; @@ -2732,45 +2587,26 @@ static int transcode_init(void) ist->decoding_needed = 1; ost->encoding_needed = 1; - switch (codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: - ost->fifo = av_fifo_alloc(1024); - if (!ost->fifo) { - return AVERROR(ENOMEM); - } - - if (!codec->sample_rate) - codec->sample_rate = icodec->sample_rate; - choose_sample_rate(ost->st, ost->enc); - codec->time_base = (AVRational){ 1, codec->sample_rate }; - - if (codec->sample_fmt == AV_SAMPLE_FMT_NONE) - codec->sample_fmt = icodec->sample_fmt; - choose_sample_fmt(ost->st, ost->enc); - - if (!codec->channels) - codec->channels = icodec->channels; - if (!codec->channel_layout) - codec->channel_layout = icodec->channel_layout; - if (av_get_channel_layout_nb_channels(codec->channel_layout) != codec->channels) - codec->channel_layout = 0; - - icodec->request_channels = codec-> channels; - ost->resample_sample_fmt = icodec->sample_fmt; - ost->resample_sample_rate = icodec->sample_rate; - ost->resample_channels = icodec->channels; - ost->resample_channel_layout = icodec->channel_layout; - break; - case AVMEDIA_TYPE_VIDEO: - if (!ost->filter) { + if (!ost->filter && + (codec->codec_type == AVMEDIA_TYPE_VIDEO || + codec->codec_type == AVMEDIA_TYPE_AUDIO)) { FilterGraph *fg; fg = init_simple_filtergraph(ist, ost); - if (configure_video_filters(fg)) { + if (configure_simple_filtergraph(fg)) { av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n"); exit(1); } - } + } + switch (codec->codec_type) { + case AVMEDIA_TYPE_AUDIO: + codec->sample_fmt = ost->filter->filter->inputs[0]->format; + codec->sample_rate = ost->filter->filter->inputs[0]->sample_rate; + codec->channel_layout = ost->filter->filter->inputs[0]->channel_layout; + codec->channels = av_get_channel_layout_nb_channels(codec->channel_layout); + codec->time_base = (AVRational){ 1, codec->sample_rate }; + break; + case AVMEDIA_TYPE_VIDEO: /* * We want CFR output if and only if one of those is true: * 1) user specified output framerate with -r @@ -3227,12 +3063,8 @@ static int transcode(void) fclose(ost->logfile); ost->logfile = NULL; } - av_fifo_free(ost->fifo); /* works even if fifo is not - initialized but set to zero */ av_freep(&ost->st->codec->subtitle_header); av_free(ost->forced_kf_pts); - if (ost->avr) - avresample_free(&ost->avr); av_dict_free(&ost->opts); } } @@ -3564,6 +3396,14 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) break; case AVMEDIA_TYPE_AUDIO: + guess_input_channel_layout(ist); + + ist->resample_sample_fmt = dec->sample_fmt; + ist->resample_sample_rate = dec->sample_rate; + ist->resample_channels = dec->channels; + ist->resample_channel_layout = dec->channel_layout; + + break; case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_ATTACHMENT: @@ -4095,7 +3935,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) audio_enc->codec_type = AVMEDIA_TYPE_AUDIO; if (!ost->stream_copy) { - char *sample_fmt = NULL; + char *sample_fmt = NULL, *filters = NULL;; MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st); @@ -4107,6 +3947,10 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) } MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st); + + MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); + if (filters) + ost->avfilter = av_strdup(filters); } return ost; @@ -4850,6 +4694,11 @@ static int opt_video_filters(OptionsContext *o, const char *opt, const char *arg return parse_option(o, "filter:v", arg, options); } +static int opt_audio_filters(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "filter:a", arg, options); +} + static int opt_vsync(const char *opt, const char *arg) { if (!av_strcasecmp(arg, "cfr")) video_sync_method = VSYNC_CFR; @@ -5022,6 +4871,7 @@ static const OptionDef options[] = { { "vol", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&audio_volume}, "change audio volume (256=normal)" , "volume" }, // { "sample_fmt", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_SPEC | OPT_STRING, {.off = OFFSET(sample_fmts)}, "set sample format", "format" }, { "channel_layout", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_FUNC2, {(void*)opt_channel_layout}, "set channel layout", "layout" }, + { "af", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_filters}, "audio filters", "filter list" }, /* subtitle options */ { "sn", OPT_BOOL | OPT_SUBTITLE | OPT_OFFSET, {.off = OFFSET(subtitle_disable)}, "disable subtitle" }, diff --git a/doc/avconv.texi b/doc/avconv.texi index cc46e95392..511642a56d 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -435,6 +435,11 @@ Set the audio codec. This is an alias for @code{-codec:a}. @item -sample_fmt[:@var{stream_specifier}] @var{sample_fmt} (@emph{output,per-stream}) Set the audio sample format. Use @code{-sample_fmts} to get a list of supported sample formats. +@item -af @var{filter_graph} (@emph{output}) +@var{filter_graph} is a description of the filter graph to apply to +the input audio. +Use the option "-filters" to show all the available filters (including +also sources and sinks). This is an alias for @code{-filter:a}. @end table @section Advanced Audio options: diff --git a/tests/ref/fate/adpcm-ima-amv b/tests/ref/fate/adpcm-ima-amv index 977c125080..6c2fa32726 100644 --- a/tests/ref/fate/adpcm-ima-amv +++ b/tests/ref/fate/adpcm-ima-amv @@ -3,7 +3,7 @@ 0, 1378, 1378, 1378, 2756, 0x8462443f 0, 2756, 2756, 1378, 2756, 0x9f493ba6 0, 4134, 4134, 1378, 2756, 0x634e5f06 -0, 5512, 5512, 1380, 2760, 0x51f35cd4 +0, 5513, 5513, 1380, 2760, 0x51f35cd4 0, 6891, 6891, 1378, 2756, 0x011c51e5 0, 8269, 8269, 1378, 2756, 0x8c2c198c 0, 9647, 9647, 1378, 2756, 0x2b4a3397 @@ -19,7 +19,7 @@ 0, 23428, 23428, 1378, 2756, 0x96346ba6 0, 24806, 24806, 1378, 2756, 0x3d54543b 0, 26184, 26184, 1380, 2760, 0x601786e1 -0, 27562, 27562, 1378, 2756, 0xf22a5793 +0, 27563, 27563, 1378, 2756, 0xf22a5793 0, 28941, 28941, 1378, 2756, 0x21f54d49 0, 30319, 30319, 1378, 2756, 0x0c6d4399 0, 31697, 31697, 1378, 2756, 0x17282f8e @@ -35,7 +35,7 @@ 0, 45478, 45478, 1380, 2760, 0x98a76091 0, 46856, 46856, 1378, 2756, 0x5d357141 0, 48234, 48234, 1378, 2756, 0x65ea2657 -0, 49612, 49612, 1378, 2756, 0xb5e1334a +0, 49613, 49613, 1378, 2756, 0xb5e1334a 0, 50991, 50991, 1378, 2756, 0x32cd5d91 0, 52369, 52369, 1378, 2756, 0xdc23722b 0, 53747, 53747, 1378, 2756, 0x2ba34684 @@ -51,7 +51,7 @@ 0, 67528, 67528, 1378, 2756, 0x39c2586c 0, 68906, 68906, 1378, 2756, 0x7ffc46e5 0, 70284, 70284, 1378, 2756, 0xa2766664 -0, 71662, 71662, 1378, 2756, 0xacb50c6c +0, 71663, 71663, 1378, 2756, 0xacb50c6c 0, 73041, 73041, 1378, 2756, 0x7f659084 0, 74419, 74419, 1378, 2756, 0xc72e6a12 0, 75797, 75797, 1380, 2760, 0xdb6944df @@ -67,7 +67,7 @@ 0, 89578, 89578, 1378, 2756, 0x5c17abef 0, 90956, 90956, 1378, 2756, 0xb3235184 0, 92334, 92334, 1378, 2756, 0xdabb64a6 -0, 93712, 93712, 1378, 2756, 0xa95dc58d +0, 93713, 93713, 1378, 2756, 0xa95dc58d 0, 95091, 95091, 1380, 2760, 0x8e7ac9eb 0, 96469, 96469, 1378, 2756, 0x492b658e 0, 97847, 97847, 1378, 2756, 0x377483ab @@ -83,7 +83,7 @@ 0, 111628, 111628, 1378, 2756, 0xf0de66ae 0, 113006, 113006, 1378, 2756, 0xeabf3c32 0, 114384, 114384, 1378, 2756, 0xe98e81d1 -0, 115762, 115762, 1380, 2760, 0x56aa5889 +0, 115763, 115763, 1380, 2760, 0x56aa5889 0, 117141, 117141, 1378, 2756, 0x4fd34c0e 0, 118519, 118519, 1378, 2756, 0x67cf6912 0, 119897, 119897, 1378, 2756, 0xfa944def @@ -99,7 +99,7 @@ 0, 133678, 133678, 1378, 2756, 0x2e0e3f2e 0, 135056, 135056, 1380, 2760, 0xdf534478 0, 136434, 136434, 1378, 2756, 0xca000a2e -0, 137812, 137812, 1378, 2756, 0x87472df3 +0, 137813, 137813, 1378, 2756, 0x87472df3 0, 139191, 139191, 1378, 2756, 0x16733810 0, 140569, 140569, 1378, 2756, 0xfa0734b4 0, 141947, 141947, 1378, 2756, 0x5eff3fc4 @@ -115,7 +115,7 @@ 0, 155728, 155728, 1380, 2760, 0x8eca4bdb 0, 157106, 157106, 1378, 2756, 0x62bd4162 0, 158484, 158484, 1378, 2756, 0x9f744aa4 -0, 159862, 159862, 1378, 2756, 0x0f3f6409 +0, 159863, 159863, 1378, 2756, 0x0f3f6409 0, 161241, 161241, 1378, 2756, 0x3fee827a 0, 162619, 162619, 1378, 2756, 0x48a0ac19 0, 163997, 163997, 1378, 2756, 0x8e4ce0d0 @@ -131,7 +131,7 @@ 0, 177778, 177778, 1378, 2756, 0xab01fb12 0, 179156, 179156, 1378, 2756, 0x04cffe5c 0, 180534, 180534, 1378, 2756, 0xef661c5e -0, 181912, 181912, 1378, 2756, 0x094c5fc5 +0, 181913, 181913, 1378, 2756, 0x094c5fc5 0, 183291, 183291, 1378, 2756, 0xe0c1486a 0, 184669, 184669, 1380, 2760, 0x8c3535b7 0, 186047, 186047, 1378, 2756, 0x594934aa @@ -147,7 +147,7 @@ 0, 199828, 199828, 1378, 2756, 0x448e681d 0, 201206, 201206, 1378, 2756, 0x0ba9826e 0, 202584, 202584, 1378, 2756, 0x049f36fa -0, 203962, 203962, 1378, 2756, 0x096a2b62 +0, 203963, 203963, 1378, 2756, 0x096a2b62 0, 205341, 205341, 1380, 2760, 0x579e2035 0, 206719, 206719, 1378, 2756, 0xd13e30e1 0, 208097, 208097, 1378, 2756, 0x30b6412b diff --git a/tests/ref/fate/adpcm-ima-smjpeg b/tests/ref/fate/adpcm-ima-smjpeg index 287e8a091c..45cb97bfc1 100644 --- a/tests/ref/fate/adpcm-ima-smjpeg +++ b/tests/ref/fate/adpcm-ima-smjpeg @@ -27,7 +27,7 @@ 0, 12789, 12789, 512, 1024, 0x3866b03b 0, 13296, 13296, 512, 1024, 0xbc005403 0, 13803, 13803, 512, 1024, 0xe9dfcc51 -0, 14332, 14332, 512, 1024, 0x83c837cb +0, 14333, 14333, 512, 1024, 0x83c837cb 0, 14840, 14840, 512, 1024, 0xfa649580 0, 15347, 15347, 512, 1024, 0x519452ea 0, 15854, 15854, 512, 1024, 0xd4978774 @@ -108,7 +108,7 @@ 0, 54265, 54265, 512, 1024, 0xd6ece2a1 0, 54772, 54772, 512, 1024, 0x33ab9553 0, 55279, 55279, 512, 1024, 0xd50c73a6 -0, 55786, 55786, 512, 1024, 0xfe25b63a +0, 55787, 55787, 512, 1024, 0xfe25b63a 0, 56316, 56316, 512, 1024, 0x7e2959e3 0, 56823, 56823, 512, 1024, 0xa4c07b34 0, 57330, 57330, 512, 1024, 0xd6d8f15c @@ -139,7 +139,7 @@ 0, 70141, 70141, 512, 1024, 0xc434d238 0, 70648, 70648, 512, 1024, 0xe9ad7562 0, 71155, 71155, 512, 1024, 0xb51b6b50 -0, 71662, 71662, 512, 1024, 0xe70aecd3 +0, 71663, 71663, 512, 1024, 0xe70aecd3 0, 72192, 72192, 512, 1024, 0x03c816b2 0, 72699, 72699, 512, 1024, 0x869fdf25 0, 73206, 73206, 512, 1024, 0xd40a0a62 @@ -170,7 +170,7 @@ 0, 85995, 85995, 512, 1024, 0xaa919ccc 0, 86524, 86524, 512, 1024, 0x15993dbc 0, 87031, 87031, 512, 1024, 0xbe01a7b9 -0, 87538, 87538, 512, 1024, 0xefe93c09 +0, 87539, 87539, 512, 1024, 0xefe93c09 0, 88046, 88046, 512, 1024, 0x1bb566e5 0, 88575, 88575, 512, 1024, 0x15ce6237 0, 89082, 89082, 512, 1024, 0xa8552e66 @@ -201,7 +201,7 @@ 0, 101871, 101871, 512, 1024, 0x1e01fb02 0, 102378, 102378, 512, 1024, 0x4ed2c1d8 0, 102907, 102907, 512, 1024, 0xf2fdbe63 -0, 103414, 103414, 512, 1024, 0x8d6f63a1 +0, 103415, 103415, 512, 1024, 0x8d6f63a1 0, 103922, 103922, 512, 1024, 0xded468d9 0, 104429, 104429, 512, 1024, 0xccad839e 0, 104958, 104958, 512, 1024, 0xdde7c082 @@ -232,7 +232,7 @@ 0, 117747, 117747, 512, 1024, 0xb01e2365 0, 118254, 118254, 512, 1024, 0x14e200d3 0, 118783, 118783, 512, 1024, 0xd1184c98 -0, 119290, 119290, 512, 1024, 0xef9140e9 +0, 119291, 119291, 512, 1024, 0xef9140e9 0, 119798, 119798, 512, 1024, 0x4cbb645e 0, 120305, 120305, 512, 1024, 0xe7fe2f06 0, 120812, 120812, 512, 1024, 0xf8c45028 @@ -263,7 +263,7 @@ 0, 133623, 133623, 512, 1024, 0xa5099687 0, 134130, 134130, 512, 1024, 0xbff10707 0, 134637, 134637, 512, 1024, 0x37c4ffc0 -0, 135166, 135166, 512, 1024, 0xf9fb6caa +0, 135167, 135167, 512, 1024, 0xf9fb6caa 0, 135674, 135674, 512, 1024, 0x3b6a3a1f 0, 136181, 136181, 512, 1024, 0x83431edb 0, 136688, 136688, 512, 1024, 0x1eb713cf @@ -344,7 +344,7 @@ 0, 175099, 175099, 512, 1024, 0xd009a7ca 0, 175606, 175606, 512, 1024, 0xb6d5a938 0, 176113, 176113, 512, 1024, 0xf3d45e47 -0, 176620, 176620, 512, 1024, 0xea8e04fc +0, 176621, 176621, 512, 1024, 0xea8e04fc 0, 177150, 177150, 512, 1024, 0x0b928bd8 0, 177657, 177657, 512, 1024, 0x0f02caec 0, 178164, 178164, 512, 1024, 0xe2b137a8 diff --git a/tests/ref/fate/smjpeg b/tests/ref/fate/smjpeg index 78b750a5ac..7aac52febc 100644 --- a/tests/ref/fate/smjpeg +++ b/tests/ref/fate/smjpeg @@ -34,7 +34,7 @@ 1, 12789, 12789, 512, 1024, 0x3866b03b 1, 13296, 13296, 512, 1024, 0xbc005403 1, 13803, 13803, 512, 1024, 0xe9dfcc51 -1, 14332, 14332, 512, 1024, 0x83c837cb +1, 14333, 14333, 512, 1024, 0x83c837cb 0, 666, 666, 0, 6808, 0x1f6eb7c3 1, 14840, 14840, 512, 1024, 0xfa649580 1, 15347, 15347, 512, 1024, 0x519452ea @@ -132,7 +132,7 @@ 1, 54265, 54265, 512, 1024, 0xd6ece2a1 1, 54772, 54772, 512, 1024, 0x33ab9553 1, 55279, 55279, 512, 1024, 0xd50c73a6 -1, 55786, 55786, 512, 1024, 0xfe25b63a +1, 55787, 55787, 512, 1024, 0xfe25b63a 1, 56316, 56316, 512, 1024, 0x7e2959e3 0, 2555, 2555, 0, 7213, 0x97b89994 1, 56823, 56823, 512, 1024, 0xa4c07b34 @@ -170,7 +170,7 @@ 1, 70648, 70648, 512, 1024, 0xe9ad7562 0, 3222, 3222, 0, 7065, 0x45035c5c 1, 71155, 71155, 512, 1024, 0xb51b6b50 -1, 71662, 71662, 512, 1024, 0xe70aecd3 +1, 71663, 71663, 512, 1024, 0xe70aecd3 1, 72192, 72192, 512, 1024, 0x03c816b2 1, 72699, 72699, 512, 1024, 0x869fdf25 1, 73206, 73206, 512, 1024, 0xd40a0a62 @@ -207,7 +207,7 @@ 1, 85995, 85995, 512, 1024, 0xaa919ccc 1, 86524, 86524, 512, 1024, 0x15993dbc 1, 87031, 87031, 512, 1024, 0xbe01a7b9 -1, 87538, 87538, 512, 1024, 0xefe93c09 +1, 87539, 87539, 512, 1024, 0xefe93c09 1, 88046, 88046, 512, 1024, 0x1bb566e5 0, 4000, 4000, 0, 7246, 0x519a7a3c 1, 88575, 88575, 512, 1024, 0x15ce6237 @@ -245,7 +245,7 @@ 1, 102378, 102378, 512, 1024, 0x4ed2c1d8 0, 4666, 4666, 111, 7104, 0xc0d14f78 1, 102907, 102907, 512, 1024, 0xf2fdbe63 -1, 103414, 103414, 512, 1024, 0x8d6f63a1 +1, 103415, 103415, 512, 1024, 0x8d6f63a1 1, 103922, 103922, 512, 1024, 0xded468d9 1, 104429, 104429, 512, 1024, 0xccad839e 1, 104958, 104958, 512, 1024, 0xdde7c082 @@ -282,7 +282,7 @@ 1, 117747, 117747, 512, 1024, 0xb01e2365 1, 118254, 118254, 512, 1024, 0x14e200d3 1, 118783, 118783, 512, 1024, 0xd1184c98 -1, 119290, 119290, 512, 1024, 0xef9140e9 +1, 119291, 119291, 512, 1024, 0xef9140e9 1, 119798, 119798, 512, 1024, 0x4cbb645e 0, 5444, 5444, 111, 7106, 0xd1a83ddc 1, 120305, 120305, 512, 1024, 0xe7fe2f06 @@ -320,7 +320,7 @@ 1, 134130, 134130, 512, 1024, 0xbff10707 1, 134637, 134637, 512, 1024, 0x37c4ffc0 0, 6111, 6111, 111, 7283, 0x19dd7319 -1, 135166, 135166, 512, 1024, 0xf9fb6caa +1, 135167, 135167, 512, 1024, 0xf9fb6caa 1, 135674, 135674, 512, 1024, 0x3b6a3a1f 1, 136181, 136181, 512, 1024, 0x83431edb 1, 136688, 136688, 512, 1024, 0x1eb713cf @@ -418,7 +418,7 @@ 1, 175606, 175606, 512, 1024, 0xb6d5a938 1, 176113, 176113, 512, 1024, 0xf3d45e47 0, 8000, 8000, 111, 2153, 0xf4e3bc17 -1, 176620, 176620, 512, 1024, 0xea8e04fc +1, 176621, 176621, 512, 1024, 0xea8e04fc 1, 177150, 177150, 512, 1024, 0x0b928bd8 1, 177657, 177657, 512, 1024, 0x0f02caec 1, 178164, 178164, 512, 1024, 0xe2b137a8 -- cgit v1.2.3 From 0b1c868508ba092c63bfe429fe57ec1379afa502 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 15:22:55 +0100 Subject: fate: separate smacker audio and video tests Signed-off-by: Mans Rullgard --- tests/fate/audio.mak | 3 + tests/fate/video.mak | 4 +- tests/ref/fate/smacker | 188 ------------------------------------------- tests/ref/fate/smacker-audio | 87 ++++++++++++++++++++ tests/ref/fate/smacker-video | 101 +++++++++++++++++++++++ 5 files changed, 193 insertions(+), 190 deletions(-) delete mode 100644 tests/ref/fate/smacker create mode 100644 tests/ref/fate/smacker-audio create mode 100644 tests/ref/fate/smacker-video (limited to 'tests') diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 7533f20058..83449c0b12 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -34,5 +34,8 @@ fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm +FATE_AVCONV += fate-smacker-audio +fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn + FATE_AVCONV += fate-ws_snd fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 1fdd240b2b..62b5f99781 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -176,8 +176,8 @@ fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an FATE_AVCONV += fate-roqvideo fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an -FATE_AVCONV += fate-smacker -fate-smacker: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 +FATE_AVCONV += fate-smacker-video +fate-smacker-video: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an FATE_AVCONV += fate-smc fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 diff --git a/tests/ref/fate/smacker b/tests/ref/fate/smacker deleted file mode 100644 index b8d4d22d01..0000000000 --- a/tests/ref/fate/smacker +++ /dev/null @@ -1,188 +0,0 @@ -#tb 0: 71/1000 -#tb 1: 1/22050 -0, 0, 0, 1, 192000, 0x8926d7fc -1, 0, 0, 23620, 47240, 0x9974897c -0, 1, 1, 1, 192000, 0x2506d384 -0, 2, 2, 1, 192000, 0x9a8dc93a -0, 3, 3, 1, 192000, 0x4badb7f2 -0, 4, 4, 1, 192000, 0xc1fc9631 -0, 5, 5, 1, 192000, 0xfc906592 -0, 6, 6, 1, 192000, 0xeddd28e2 -0, 7, 7, 1, 192000, 0xeee0dcf5 -0, 8, 8, 1, 192000, 0x76798c91 -0, 9, 9, 1, 192000, 0x8a034c1b -0, 10, 10, 1, 192000, 0x4df3127c -0, 11, 11, 1, 192000, 0x2eefd36f -0, 12, 12, 1, 192000, 0x58a2a1d6 -0, 13, 13, 1, 192000, 0x1a3d7971 -0, 14, 14, 1, 192000, 0xa1a65bd5 -0, 15, 15, 1, 192000, 0x344957b9 -1, 23620, 23620, 1564, 3128, 0x7e4064b4 -0, 16, 16, 1, 192000, 0xe23b5f4e -1, 25184, 25184, 1564, 3128, 0x80883301 -0, 17, 17, 1, 192000, 0xb5c2710b -1, 26748, 26748, 1568, 3136, 0x2ad2d341 -0, 18, 18, 1, 192000, 0x7a25938f -1, 28316, 28316, 1564, 3128, 0xda8468e3 -0, 19, 19, 1, 192000, 0x0a84e4c9 -1, 29880, 29880, 1568, 3136, 0x9d6f6cdf -0, 20, 20, 1, 192000, 0x94209b0d -1, 31448, 31448, 1564, 3128, 0x1aaa64b5 -0, 21, 21, 1, 192000, 0xf940e51f -1, 33012, 33012, 1564, 3128, 0x9182728b -0, 22, 22, 1, 192000, 0xb9fdec42 -1, 34576, 34576, 1568, 3136, 0xfa8e17b3 -0, 23, 23, 1, 192000, 0x7b04a376 -1, 36144, 36144, 1564, 3128, 0x0dc3c1cf -0, 24, 24, 1, 192000, 0x5fe0026b -1, 37708, 37708, 1568, 3136, 0x0109639d -0, 25, 25, 1, 192000, 0x775aca39 -1, 39276, 39276, 1564, 3128, 0x6d8a12d9 -0, 26, 26, 1, 192000, 0xae14fb32 -1, 40840, 40840, 1564, 3128, 0x4b9a9597 -0, 27, 27, 1, 192000, 0x661106e5 -1, 42404, 42404, 1568, 3136, 0x9112710e -0, 28, 28, 1, 192000, 0xe8658dbf -1, 43972, 43972, 1564, 3128, 0x8cccf522 -0, 29, 29, 1, 192000, 0x5359f0f9 -1, 45536, 45536, 1564, 3128, 0x6594bbf3 -0, 30, 30, 1, 192000, 0xc1ec80f4 -1, 47100, 47100, 1568, 3136, 0xd878a7d5 -0, 31, 31, 1, 192000, 0xca53806b -1, 48668, 48668, 1564, 3128, 0xaa6e3905 -0, 32, 32, 1, 192000, 0xf0766b2e -1, 50232, 50232, 1568, 3136, 0x2a062e04 -0, 33, 33, 1, 192000, 0x39962da8 -1, 51800, 51800, 1564, 3128, 0x84e4006a -0, 34, 34, 1, 192000, 0x4171c37f -1, 53364, 53364, 1564, 3128, 0x85183633 -0, 35, 35, 1, 192000, 0x3abf3b46 -1, 54928, 54928, 1568, 3136, 0xb62d4b02 -0, 36, 36, 1, 192000, 0xecc68313 -1, 56496, 56496, 1564, 3128, 0xe209462a -0, 37, 37, 1, 192000, 0xea339baf -1, 58060, 58060, 1568, 3136, 0x57c4824b -0, 38, 38, 1, 192000, 0x616b8f16 -1, 59628, 59628, 1564, 3128, 0x664a9163 -0, 39, 39, 1, 192000, 0xf77a8581 -1, 61192, 61192, 1564, 3128, 0xb4287874 -0, 40, 40, 1, 192000, 0xb315678b -1, 62756, 62756, 1568, 3136, 0xde626885 -0, 41, 41, 1, 192000, 0x0a4a5218 -1, 64324, 64324, 1564, 3128, 0x919763c2 -0, 42, 42, 1, 192000, 0x98802be4 -1, 65888, 65888, 1564, 3128, 0xa4f664e1 -0, 43, 43, 1, 192000, 0xa2f0fd94 -1, 67452, 67452, 1568, 3136, 0xa0bab0d4 -0, 44, 44, 1, 192000, 0x6671c84f -1, 69020, 69020, 1564, 3128, 0xe938939c -0, 45, 45, 1, 192000, 0x38327e31 -1, 70584, 70584, 1568, 3136, 0x3679bfc7 -0, 46, 46, 1, 192000, 0xb85d3e08 -1, 72152, 72152, 1564, 3128, 0xc96c55c3 -0, 47, 47, 1, 192000, 0xdc69eba9 -1, 73716, 73716, 1564, 3128, 0x119114d6 -0, 48, 48, 1, 192000, 0x8955a0b3 -1, 75280, 75280, 1568, 3136, 0x42f3800f -0, 49, 49, 1, 192000, 0x714a548b -1, 76848, 76848, 1564, 3128, 0x4250c4ad -0, 50, 50, 1, 192000, 0xc0471de9 -1, 78412, 78412, 1568, 3136, 0x5cdd4925 -0, 51, 51, 1, 192000, 0x2e16e039 -1, 79980, 79980, 1564, 3128, 0xa4c12360 -0, 52, 52, 1, 192000, 0x9fa4b033 -1, 81544, 81544, 1564, 3128, 0x849f48de -0, 53, 53, 1, 192000, 0x4a0f9402 -1, 83108, 83108, 1568, 3136, 0x6acd8ff9 -0, 54, 54, 1, 192000, 0x1f3e6843 -1, 84676, 84676, 1564, 3128, 0xb2758556 -0, 55, 55, 1, 192000, 0x31774850 -1, 86240, 86240, 1564, 3128, 0x10f2fcb1 -0, 56, 56, 1, 192000, 0x9d5336a2 -1, 87804, 87804, 1568, 3136, 0xf0f02b23 -0, 57, 57, 1, 192000, 0xf7de27a2 -1, 89372, 89372, 1564, 3128, 0x64f759c6 -0, 58, 58, 1, 192000, 0x98c717ce -1, 90936, 90936, 1568, 3136, 0x7ec075e3 -0, 59, 59, 1, 192000, 0x615b10b8 -1, 92504, 92504, 1564, 3128, 0xf981d51e -0, 60, 60, 1, 192000, 0xd5bc0e7e -1, 94068, 94068, 1564, 3128, 0xc622e8b9 -0, 61, 61, 1, 192000, 0xd5bc0e7e -1, 95632, 95632, 1568, 3136, 0xf632e2f8 -0, 62, 62, 1, 192000, 0xd5bc0e7e -1, 97200, 97200, 1564, 3128, 0xda561864 -0, 63, 63, 1, 192000, 0xd5bc0e7e -1, 98764, 98764, 1568, 3136, 0x14d2e888 -0, 64, 64, 1, 192000, 0xd5bc0e7e -1, 100332, 100332, 1564, 3128, 0x015bb869 -0, 65, 65, 1, 192000, 0xd5bc0e7e -1, 101896, 101896, 1564, 3128, 0xedb1fb62 -0, 66, 66, 1, 192000, 0xd5bc0e7e -1, 103460, 103460, 1568, 3136, 0xe0560c41 -0, 67, 67, 1, 192000, 0xd5bc0e7e -1, 105028, 105028, 1564, 3128, 0x14773c9a -0, 68, 68, 1, 192000, 0xd5bc0e7e -1, 106592, 106592, 1568, 3136, 0x850f1c82 -0, 69, 69, 1, 192000, 0xd5bc0e7e -1, 108160, 108160, 1564, 3128, 0xb0bd5347 -0, 70, 70, 1, 192000, 0xd5bc0e7e -1, 109724, 109724, 1564, 3128, 0x8f82edbf -0, 71, 71, 1, 192000, 0xd5bc0e7e -1, 111288, 111288, 1568, 3136, 0x493abee2 -0, 72, 72, 1, 192000, 0xd5bc0e7e -1, 112856, 112856, 1564, 3128, 0xf5daff3f -0, 73, 73, 1, 192000, 0xd5bc0e7e -1, 114420, 114420, 1564, 3128, 0x78ad2690 -0, 74, 74, 1, 192000, 0xd5bc0e7e -1, 115984, 115984, 1568, 3136, 0x490ebafc -0, 75, 75, 1, 192000, 0xd5bc0e7e -1, 117552, 117552, 1564, 3128, 0x70333fd2 -0, 76, 76, 1, 192000, 0xd5bc0e7e -1, 119116, 119116, 1568, 3136, 0x8cb1c350 -0, 77, 77, 1, 192000, 0xd5bc0e7e -1, 120684, 120684, 1564, 3128, 0x8bd057cb -0, 78, 78, 1, 192000, 0xd5bc0e7e -1, 122248, 122248, 1564, 3128, 0x161b3dbc -0, 79, 79, 1, 192000, 0xd5bc0e7e -1, 123812, 123812, 1568, 3136, 0xb47fb88a -0, 80, 80, 1, 192000, 0xd5bc0e7e -1, 125380, 125380, 1564, 3128, 0x474b381e -0, 81, 81, 1, 192000, 0xd5bc0e7e -1, 126944, 126944, 1568, 3136, 0x07c519bb -0, 82, 82, 1, 192000, 0xd5bc0e7e -1, 128512, 128512, 1564, 3128, 0x15b916c8 -0, 83, 83, 1, 192000, 0xd5bc0e7e -1, 130076, 130076, 1564, 3128, 0x0ed7f6fb -0, 84, 84, 1, 192000, 0xd5bc0e7e -1, 131640, 131640, 1568, 3136, 0x54d6397b -0, 85, 85, 1, 192000, 0xd5bc0e7e -1, 133208, 133208, 1564, 3128, 0x437242bb -0, 86, 86, 1, 192000, 0xd5bc0e7e -1, 134772, 134772, 1564, 3128, 0x38f05c4d -0, 87, 87, 1, 192000, 0xd5bc0e7e -1, 136336, 136336, 1568, 3136, 0x5d000e59 -0, 88, 88, 1, 192000, 0xd5bc0e7e -1, 137904, 137904, 1564, 3128, 0xdeab2d04 -0, 89, 89, 1, 192000, 0xd5bc0e7e -1, 139468, 139468, 1568, 3136, 0x77de6880 -0, 90, 90, 1, 192000, 0xd5bc0e7e -1, 141036, 141036, 1564, 3128, 0xbc87ef25 -0, 91, 91, 1, 192000, 0xd5bc0e7e -1, 142600, 142600, 1564, 3128, 0xc1638ade -0, 92, 92, 1, 192000, 0xd5bc0e7e -1, 144164, 144164, 1568, 3136, 0xcfb64a5f -0, 93, 93, 1, 192000, 0xd5bc0e7e -1, 145732, 145732, 1564, 3128, 0x90b1b826 -0, 94, 94, 1, 192000, 0xd5bc0e7e -1, 147296, 147296, 1568, 3136, 0x00000000 -0, 95, 95, 1, 192000, 0xd5bc0e7e -1, 148864, 148864, 1564, 3128, 0x00000000 -0, 96, 96, 1, 192000, 0xd5bc0e7e -1, 150428, 150428, 1564, 3128, 0x00000000 -0, 97, 97, 1, 192000, 0xd5bc0e7e -1, 151992, 151992, 1568, 3136, 0x00000000 -0, 98, 98, 1, 192000, 0xd5bc0e7e -1, 153560, 153560, 1564, 3128, 0x00000000 -0, 99, 99, 1, 192000, 0xd5bc0e7e -1, 155124, 155124, 1428, 2856, 0x00000000 diff --git a/tests/ref/fate/smacker-audio b/tests/ref/fate/smacker-audio new file mode 100644 index 0000000000..442f479dd8 --- /dev/null +++ b/tests/ref/fate/smacker-audio @@ -0,0 +1,87 @@ +#tb 0: 1/22050 +0, 0, 0, 23620, 47240, 0x9974897c +0, 23620, 23620, 1564, 3128, 0x7e4064b4 +0, 25184, 25184, 1564, 3128, 0x80883301 +0, 26748, 26748, 1568, 3136, 0x2ad2d341 +0, 28316, 28316, 1564, 3128, 0xda8468e3 +0, 29880, 29880, 1568, 3136, 0x9d6f6cdf +0, 31448, 31448, 1564, 3128, 0x1aaa64b5 +0, 33012, 33012, 1564, 3128, 0x9182728b +0, 34576, 34576, 1568, 3136, 0xfa8e17b3 +0, 36144, 36144, 1564, 3128, 0x0dc3c1cf +0, 37708, 37708, 1568, 3136, 0x0109639d +0, 39276, 39276, 1564, 3128, 0x6d8a12d9 +0, 40840, 40840, 1564, 3128, 0x4b9a9597 +0, 42404, 42404, 1568, 3136, 0x9112710e +0, 43972, 43972, 1564, 3128, 0x8cccf522 +0, 45536, 45536, 1564, 3128, 0x6594bbf3 +0, 47100, 47100, 1568, 3136, 0xd878a7d5 +0, 48668, 48668, 1564, 3128, 0xaa6e3905 +0, 50232, 50232, 1568, 3136, 0x2a062e04 +0, 51800, 51800, 1564, 3128, 0x84e4006a +0, 53364, 53364, 1564, 3128, 0x85183633 +0, 54928, 54928, 1568, 3136, 0xb62d4b02 +0, 56496, 56496, 1564, 3128, 0xe209462a +0, 58060, 58060, 1568, 3136, 0x57c4824b +0, 59628, 59628, 1564, 3128, 0x664a9163 +0, 61192, 61192, 1564, 3128, 0xb4287874 +0, 62756, 62756, 1568, 3136, 0xde626885 +0, 64324, 64324, 1564, 3128, 0x919763c2 +0, 65888, 65888, 1564, 3128, 0xa4f664e1 +0, 67452, 67452, 1568, 3136, 0xa0bab0d4 +0, 69020, 69020, 1564, 3128, 0xe938939c +0, 70584, 70584, 1568, 3136, 0x3679bfc7 +0, 72152, 72152, 1564, 3128, 0xc96c55c3 +0, 73716, 73716, 1564, 3128, 0x119114d6 +0, 75280, 75280, 1568, 3136, 0x42f3800f +0, 76848, 76848, 1564, 3128, 0x4250c4ad +0, 78412, 78412, 1568, 3136, 0x5cdd4925 +0, 79980, 79980, 1564, 3128, 0xa4c12360 +0, 81544, 81544, 1564, 3128, 0x849f48de +0, 83108, 83108, 1568, 3136, 0x6acd8ff9 +0, 84676, 84676, 1564, 3128, 0xb2758556 +0, 86240, 86240, 1564, 3128, 0x10f2fcb1 +0, 87804, 87804, 1568, 3136, 0xf0f02b23 +0, 89372, 89372, 1564, 3128, 0x64f759c6 +0, 90936, 90936, 1568, 3136, 0x7ec075e3 +0, 92504, 92504, 1564, 3128, 0xf981d51e +0, 94068, 94068, 1564, 3128, 0xc622e8b9 +0, 95632, 95632, 1568, 3136, 0xf632e2f8 +0, 97200, 97200, 1564, 3128, 0xda561864 +0, 98764, 98764, 1568, 3136, 0x14d2e888 +0, 100332, 100332, 1564, 3128, 0x015bb869 +0, 101896, 101896, 1564, 3128, 0xedb1fb62 +0, 103460, 103460, 1568, 3136, 0xe0560c41 +0, 105028, 105028, 1564, 3128, 0x14773c9a +0, 106592, 106592, 1568, 3136, 0x850f1c82 +0, 108160, 108160, 1564, 3128, 0xb0bd5347 +0, 109724, 109724, 1564, 3128, 0x8f82edbf +0, 111288, 111288, 1568, 3136, 0x493abee2 +0, 112856, 112856, 1564, 3128, 0xf5daff3f +0, 114420, 114420, 1564, 3128, 0x78ad2690 +0, 115984, 115984, 1568, 3136, 0x490ebafc +0, 117552, 117552, 1564, 3128, 0x70333fd2 +0, 119116, 119116, 1568, 3136, 0x8cb1c350 +0, 120684, 120684, 1564, 3128, 0x8bd057cb +0, 122248, 122248, 1564, 3128, 0x161b3dbc +0, 123812, 123812, 1568, 3136, 0xb47fb88a +0, 125380, 125380, 1564, 3128, 0x474b381e +0, 126944, 126944, 1568, 3136, 0x07c519bb +0, 128512, 128512, 1564, 3128, 0x15b916c8 +0, 130076, 130076, 1564, 3128, 0x0ed7f6fb +0, 131640, 131640, 1568, 3136, 0x54d6397b +0, 133208, 133208, 1564, 3128, 0x437242bb +0, 134772, 134772, 1564, 3128, 0x38f05c4d +0, 136336, 136336, 1568, 3136, 0x5d000e59 +0, 137904, 137904, 1564, 3128, 0xdeab2d04 +0, 139468, 139468, 1568, 3136, 0x77de6880 +0, 141036, 141036, 1564, 3128, 0xbc87ef25 +0, 142600, 142600, 1564, 3128, 0xc1638ade +0, 144164, 144164, 1568, 3136, 0xcfb64a5f +0, 145732, 145732, 1564, 3128, 0x90b1b826 +0, 147296, 147296, 1568, 3136, 0x00000000 +0, 148864, 148864, 1564, 3128, 0x00000000 +0, 150428, 150428, 1564, 3128, 0x00000000 +0, 151992, 151992, 1568, 3136, 0x00000000 +0, 153560, 153560, 1564, 3128, 0x00000000 +0, 155124, 155124, 1428, 2856, 0x00000000 diff --git a/tests/ref/fate/smacker-video b/tests/ref/fate/smacker-video new file mode 100644 index 0000000000..8bd307159f --- /dev/null +++ b/tests/ref/fate/smacker-video @@ -0,0 +1,101 @@ +#tb 0: 71/1000 +0, 0, 0, 1, 192000, 0x8926d7fc +0, 1, 1, 1, 192000, 0x2506d384 +0, 2, 2, 1, 192000, 0x9a8dc93a +0, 3, 3, 1, 192000, 0x4badb7f2 +0, 4, 4, 1, 192000, 0xc1fc9631 +0, 5, 5, 1, 192000, 0xfc906592 +0, 6, 6, 1, 192000, 0xeddd28e2 +0, 7, 7, 1, 192000, 0xeee0dcf5 +0, 8, 8, 1, 192000, 0x76798c91 +0, 9, 9, 1, 192000, 0x8a034c1b +0, 10, 10, 1, 192000, 0x4df3127c +0, 11, 11, 1, 192000, 0x2eefd36f +0, 12, 12, 1, 192000, 0x58a2a1d6 +0, 13, 13, 1, 192000, 0x1a3d7971 +0, 14, 14, 1, 192000, 0xa1a65bd5 +0, 15, 15, 1, 192000, 0x344957b9 +0, 16, 16, 1, 192000, 0xe23b5f4e +0, 17, 17, 1, 192000, 0xb5c2710b +0, 18, 18, 1, 192000, 0x7a25938f +0, 19, 19, 1, 192000, 0x0a84e4c9 +0, 20, 20, 1, 192000, 0x94209b0d +0, 21, 21, 1, 192000, 0xf940e51f +0, 22, 22, 1, 192000, 0xb9fdec42 +0, 23, 23, 1, 192000, 0x7b04a376 +0, 24, 24, 1, 192000, 0x5fe0026b +0, 25, 25, 1, 192000, 0x775aca39 +0, 26, 26, 1, 192000, 0xae14fb32 +0, 27, 27, 1, 192000, 0x661106e5 +0, 28, 28, 1, 192000, 0xe8658dbf +0, 29, 29, 1, 192000, 0x5359f0f9 +0, 30, 30, 1, 192000, 0xc1ec80f4 +0, 31, 31, 1, 192000, 0xca53806b +0, 32, 32, 1, 192000, 0xf0766b2e +0, 33, 33, 1, 192000, 0x39962da8 +0, 34, 34, 1, 192000, 0x4171c37f +0, 35, 35, 1, 192000, 0x3abf3b46 +0, 36, 36, 1, 192000, 0xecc68313 +0, 37, 37, 1, 192000, 0xea339baf +0, 38, 38, 1, 192000, 0x616b8f16 +0, 39, 39, 1, 192000, 0xf77a8581 +0, 40, 40, 1, 192000, 0xb315678b +0, 41, 41, 1, 192000, 0x0a4a5218 +0, 42, 42, 1, 192000, 0x98802be4 +0, 43, 43, 1, 192000, 0xa2f0fd94 +0, 44, 44, 1, 192000, 0x6671c84f +0, 45, 45, 1, 192000, 0x38327e31 +0, 46, 46, 1, 192000, 0xb85d3e08 +0, 47, 47, 1, 192000, 0xdc69eba9 +0, 48, 48, 1, 192000, 0x8955a0b3 +0, 49, 49, 1, 192000, 0x714a548b +0, 50, 50, 1, 192000, 0xc0471de9 +0, 51, 51, 1, 192000, 0x2e16e039 +0, 52, 52, 1, 192000, 0x9fa4b033 +0, 53, 53, 1, 192000, 0x4a0f9402 +0, 54, 54, 1, 192000, 0x1f3e6843 +0, 55, 55, 1, 192000, 0x31774850 +0, 56, 56, 1, 192000, 0x9d5336a2 +0, 57, 57, 1, 192000, 0xf7de27a2 +0, 58, 58, 1, 192000, 0x98c717ce +0, 59, 59, 1, 192000, 0x615b10b8 +0, 60, 60, 1, 192000, 0xd5bc0e7e +0, 61, 61, 1, 192000, 0xd5bc0e7e +0, 62, 62, 1, 192000, 0xd5bc0e7e +0, 63, 63, 1, 192000, 0xd5bc0e7e +0, 64, 64, 1, 192000, 0xd5bc0e7e +0, 65, 65, 1, 192000, 0xd5bc0e7e +0, 66, 66, 1, 192000, 0xd5bc0e7e +0, 67, 67, 1, 192000, 0xd5bc0e7e +0, 68, 68, 1, 192000, 0xd5bc0e7e +0, 69, 69, 1, 192000, 0xd5bc0e7e +0, 70, 70, 1, 192000, 0xd5bc0e7e +0, 71, 71, 1, 192000, 0xd5bc0e7e +0, 72, 72, 1, 192000, 0xd5bc0e7e +0, 73, 73, 1, 192000, 0xd5bc0e7e +0, 74, 74, 1, 192000, 0xd5bc0e7e +0, 75, 75, 1, 192000, 0xd5bc0e7e +0, 76, 76, 1, 192000, 0xd5bc0e7e +0, 77, 77, 1, 192000, 0xd5bc0e7e +0, 78, 78, 1, 192000, 0xd5bc0e7e +0, 79, 79, 1, 192000, 0xd5bc0e7e +0, 80, 80, 1, 192000, 0xd5bc0e7e +0, 81, 81, 1, 192000, 0xd5bc0e7e +0, 82, 82, 1, 192000, 0xd5bc0e7e +0, 83, 83, 1, 192000, 0xd5bc0e7e +0, 84, 84, 1, 192000, 0xd5bc0e7e +0, 85, 85, 1, 192000, 0xd5bc0e7e +0, 86, 86, 1, 192000, 0xd5bc0e7e +0, 87, 87, 1, 192000, 0xd5bc0e7e +0, 88, 88, 1, 192000, 0xd5bc0e7e +0, 89, 89, 1, 192000, 0xd5bc0e7e +0, 90, 90, 1, 192000, 0xd5bc0e7e +0, 91, 91, 1, 192000, 0xd5bc0e7e +0, 92, 92, 1, 192000, 0xd5bc0e7e +0, 93, 93, 1, 192000, 0xd5bc0e7e +0, 94, 94, 1, 192000, 0xd5bc0e7e +0, 95, 95, 1, 192000, 0xd5bc0e7e +0, 96, 96, 1, 192000, 0xd5bc0e7e +0, 97, 97, 1, 192000, 0xd5bc0e7e +0, 98, 98, 1, 192000, 0xd5bc0e7e +0, 99, 99, 1, 192000, 0xd5bc0e7e -- cgit v1.2.3 From b1c1d7dae783300701ed39fe5103e5c313e87bd9 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 15:31:36 +0100 Subject: fate: separate sierra-vmd audio and video tests Signed-off-by: Mans Rullgard --- tests/fate/audio.mak | 3 + tests/fate/demux.mak | 3 - tests/fate/video.mak | 3 + tests/ref/fate/sierra-vmd | 334 ---------------------------------------- tests/ref/fate/sierra-vmd-audio | 216 ++++++++++++++++++++++++++ tests/ref/fate/sierra-vmd-video | 118 ++++++++++++++ 6 files changed, 340 insertions(+), 337 deletions(-) delete mode 100644 tests/ref/fate/sierra-vmd create mode 100644 tests/ref/fate/sierra-vmd-audio create mode 100644 tests/ref/fate/sierra-vmd-video (limited to 'tests') diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 83449c0b12..7a201e0800 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -34,6 +34,9 @@ fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm +FATE_AVCONV += fate-sierra-vmd-audio +fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn + FATE_AVCONV += fate-smacker-audio fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 32f3200fee..92aa812471 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -55,9 +55,6 @@ fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy FATE_AVCONV += fate-redcode-demux fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy -FATE_AVCONV += fate-sierra-vmd -fate-sierra-vmd: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -pix_fmt rgb24 - FATE_AVCONV += fate-siff fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 62b5f99781..0f4219d94f 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -176,6 +176,9 @@ fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an FATE_AVCONV += fate-roqvideo fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an +FATE_AVCONV += fate-sierra-vmd-video +fate-sierra-vmd-video: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an + FATE_AVCONV += fate-smacker-video fate-smacker-video: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an diff --git a/tests/ref/fate/sierra-vmd b/tests/ref/fate/sierra-vmd deleted file mode 100644 index c72813e5b8..0000000000 --- a/tests/ref/fate/sierra-vmd +++ /dev/null @@ -1,334 +0,0 @@ -#tb 0: 1/10 -#tb 1: 1/22050 -0, 0, 0, 1, 230400, 0x0224ab01 -1, 0, 0, 61740, 123480, 0x3a794c13 -0, 1, 1, 1, 230400, 0x449e4d81 -0, 2, 2, 1, 230400, 0x3e15e07a -0, 3, 3, 1, 230400, 0xdabe4172 -0, 4, 4, 1, 230400, 0x0947b7db -0, 5, 5, 1, 230400, 0x934e243b -0, 6, 6, 1, 230400, 0x6b5c5b6c -0, 7, 7, 1, 230400, 0x4bf7bbb5 -0, 8, 8, 1, 230400, 0x423eec8e -0, 9, 9, 1, 230400, 0x63663b5e -0, 10, 10, 1, 230400, 0x9c258a67 -0, 11, 11, 1, 230400, 0x1c92b6e0 -0, 12, 12, 1, 230400, 0xdd0a0e28 -0, 13, 13, 1, 230400, 0x51d64af1 -0, 14, 14, 1, 230400, 0x5776ac12 -0, 15, 15, 1, 230400, 0x49070132 -0, 16, 16, 1, 230400, 0xa59635ab -0, 17, 17, 1, 230400, 0xb1f99504 -0, 18, 18, 1, 230400, 0x61fac725 -0, 19, 19, 1, 230400, 0xc32c28d5 -0, 20, 20, 1, 230400, 0x2b7a91d6 -0, 21, 21, 1, 230400, 0x917be717 -0, 22, 22, 1, 230400, 0xd3c5a2ff -0, 23, 23, 1, 230400, 0x0678a707 -0, 24, 24, 1, 230400, 0x122504e6 -0, 25, 25, 1, 230400, 0x76aebdae -0, 26, 26, 1, 230400, 0x81357545 -0, 27, 27, 1, 230400, 0x38baeebd -0, 28, 28, 1, 230400, 0x1c5c44d4 -1, 61740, 61740, 2205, 4410, 0x109d04e0 -0, 29, 29, 1, 230400, 0x60e189cc -1, 63945, 63945, 2205, 4410, 0x224d244f -0, 30, 30, 1, 230400, 0xb1f4381c -1, 66150, 66150, 2205, 4410, 0xbb72413d -0, 31, 31, 1, 230400, 0xb5048fed -1, 68355, 68355, 2205, 4410, 0xaa5f5b86 -0, 32, 32, 1, 230400, 0xc947c30e -1, 70560, 70560, 2205, 4410, 0x94e7aea7 -0, 33, 33, 1, 230400, 0xe8e31c07 -1, 72765, 72765, 2205, 4410, 0xad497ca0 -0, 34, 34, 1, 230400, 0x6d49dd02 -1, 74970, 74970, 2205, 4410, 0x1de10c9e -0, 35, 35, 1, 230400, 0x293e15d3 -1, 77175, 77175, 2205, 4410, 0x9f55efa8 -0, 36, 36, 1, 230400, 0x354d792e -1, 79380, 79380, 2205, 4410, 0x220a072a -0, 37, 37, 1, 230400, 0x35468780 -1, 81585, 81585, 2205, 4410, 0xa7dafb29 -0, 38, 38, 1, 230400, 0x365d3991 -1, 83790, 83790, 2205, 4410, 0xd5e29c7a -0, 39, 39, 1, 230400, 0xc9debef2 -1, 85995, 85995, 2205, 4410, 0xb8465006 -0, 40, 40, 1, 230400, 0x4c4634c2 -1, 88200, 88200, 2205, 4410, 0x518669c7 -0, 41, 41, 1, 230400, 0x347c2dca -1, 90405, 90405, 2205, 4410, 0xb5b5efca -0, 42, 42, 1, 230400, 0x1efa0aaa -1, 92610, 92610, 2205, 4410, 0x8600015d -0, 43, 43, 1, 230400, 0xa79a0b5a -1, 94815, 94815, 2205, 4410, 0xe2f68fe9 -0, 44, 44, 1, 230400, 0xfdb2dcdb -1, 97020, 97020, 2205, 4410, 0x8d3458d9 -0, 45, 45, 1, 230400, 0x42dbea33 -1, 99225, 99225, 2205, 4410, 0xf1ff4775 -0, 46, 46, 1, 230400, 0x2a207e43 -1, 101430, 101430, 2205, 4410, 0x830f67c9 -0, 47, 47, 1, 230400, 0x86573783 -1, 103635, 103635, 2205, 4410, 0x110e0bc1 -0, 48, 48, 1, 230400, 0xc3968473 -1, 105840, 105840, 2205, 4410, 0x71682f47 -0, 49, 49, 1, 230400, 0x8f62a7b4 -1, 108045, 108045, 2205, 4410, 0x38119095 -0, 50, 50, 1, 230400, 0x5a2e3073 -1, 110250, 110250, 2205, 4410, 0xd2494db6 -0, 51, 51, 1, 230400, 0xd24f5e2c -1, 112455, 112455, 2205, 4410, 0x8b552509 -0, 52, 52, 1, 230400, 0x1df3c67d -1, 114660, 114660, 2205, 4410, 0x71e52909 -0, 53, 53, 1, 230400, 0xe4fd884d -1, 116865, 116865, 2205, 4410, 0x9f0a6f4d -1, 119070, 119070, 2205, 4410, 0x901302f2 -1, 121275, 121275, 2205, 4410, 0x855d5222 -1, 123480, 123480, 2205, 4410, 0x324bb2fe -0, 57, 57, 1, 230400, 0x9a228555 -1, 125685, 125685, 2205, 4410, 0xe85f583f -0, 58, 58, 1, 230400, 0x9eba8ed5 -1, 127890, 127890, 2205, 4410, 0x2cbc67c4 -0, 59, 59, 1, 230400, 0x3d808a3d -1, 130095, 130095, 2205, 4410, 0xc82e6aa1 -0, 60, 60, 1, 230400, 0xf57e866d -1, 132300, 132300, 2205, 4410, 0xb9fc423c -0, 61, 61, 1, 230400, 0x85f594f5 -1, 134505, 134505, 2205, 4410, 0x6b9b4ef9 -0, 62, 62, 1, 230400, 0xb09f99dd -1, 136710, 136710, 2205, 4410, 0x39290f10 -0, 63, 63, 1, 230400, 0x2b368475 -1, 138915, 138915, 2205, 4410, 0xad718eb4 -0, 64, 64, 1, 230400, 0xa2417afd -1, 141120, 141120, 2205, 4410, 0x82f463ac -0, 65, 65, 1, 230400, 0x590b709d -1, 143325, 143325, 2205, 4410, 0xfac87cac -0, 66, 66, 1, 230400, 0x5d617705 -1, 145530, 145530, 2205, 4410, 0x9e8bcca7 -0, 67, 67, 1, 230400, 0xabf981ad -1, 147735, 147735, 2205, 4410, 0x52f79c99 -0, 68, 68, 1, 230400, 0x5a8590cd -1, 149940, 149940, 2205, 4410, 0xf2d14de2 -0, 69, 69, 1, 230400, 0x1bff853d -1, 152145, 152145, 2205, 4410, 0x367f95e1 -0, 70, 70, 1, 230400, 0x71d08055 -1, 154350, 154350, 2205, 4410, 0x8bfac293 -0, 71, 71, 1, 230400, 0x2ebd817d -1, 156555, 156555, 2205, 4410, 0x01ea5040 -0, 72, 72, 1, 230400, 0x6e838255 -1, 158760, 158760, 2205, 4410, 0x8ff5e212 -0, 73, 73, 1, 230400, 0x043984cd -1, 160965, 160965, 2205, 4410, 0x93f32824 -0, 74, 74, 1, 230400, 0x7ff18495 -1, 163170, 163170, 2205, 4410, 0x998f90dc -0, 75, 75, 1, 230400, 0xa43b8385 -1, 165375, 165375, 2205, 4410, 0x65231170 -0, 76, 76, 1, 230400, 0x72b5825d -1, 167580, 167580, 2205, 4410, 0xc79039a1 -0, 77, 77, 1, 230400, 0x3a178085 -1, 169785, 169785, 2205, 4410, 0x0b0e58bd -0, 78, 78, 1, 230400, 0x67748245 -1, 171990, 171990, 2205, 4410, 0xc24ab4fa -0, 79, 79, 1, 230400, 0xeddf81d5 -1, 174195, 174195, 2205, 4410, 0xd3796a8e -0, 80, 80, 1, 230400, 0x8b088665 -1, 176400, 176400, 2205, 4410, 0xa37f8295 -0, 81, 81, 1, 230400, 0x6c408e15 -1, 178605, 178605, 2205, 4410, 0xb760fed7 -0, 82, 82, 1, 230400, 0x81f196dd -1, 180810, 180810, 2205, 4410, 0x05495a34 -0, 83, 83, 1, 230400, 0xab9f953d -1, 183015, 183015, 2205, 4410, 0x6f203437 -0, 84, 84, 1, 230400, 0xa5f69795 -1, 185220, 185220, 2205, 4410, 0x71299402 -0, 85, 85, 1, 230400, 0xa772950d -1, 187425, 187425, 2205, 4410, 0x72e7b346 -0, 86, 86, 1, 230400, 0x6a5596d5 -1, 189630, 189630, 2205, 4410, 0x879b0dae -0, 87, 87, 1, 230400, 0x1355958d -1, 191835, 191835, 2205, 4410, 0x041aa1bd -0, 88, 88, 1, 230400, 0x4134981d -1, 194040, 194040, 2205, 4410, 0x18a962e6 -0, 89, 89, 1, 230400, 0x8b929515 -1, 196245, 196245, 2205, 4410, 0x21d20539 -0, 90, 90, 1, 230400, 0x482f95c5 -1, 198450, 198450, 2205, 4410, 0x8f449267 -0, 91, 91, 1, 230400, 0x7a9795d5 -1, 200655, 200655, 2205, 4410, 0xecdc01d6 -0, 92, 92, 1, 230400, 0x21c29abd -1, 202860, 202860, 2205, 4410, 0x458abd5a -0, 93, 93, 1, 230400, 0x9ae6a475 -1, 205065, 205065, 2205, 4410, 0xa070ea63 -0, 94, 94, 1, 230400, 0x3734aee5 -1, 207270, 207270, 2205, 4410, 0xc25b26ce -0, 95, 95, 1, 230400, 0xa0a1b365 -1, 209475, 209475, 2205, 4410, 0x4d9237ca -0, 96, 96, 1, 230400, 0x2dcab1c5 -1, 211680, 211680, 2205, 4410, 0x748e1801 -0, 97, 97, 1, 230400, 0x9c8b6c44 -1, 213885, 213885, 2205, 4410, 0xc96b69e6 -0, 98, 98, 1, 230400, 0x5da75feb -1, 216090, 216090, 2205, 4410, 0x6663186c -0, 99, 99, 1, 230400, 0x4d02f8e3 -1, 218295, 218295, 2205, 4410, 0x7f6d3081 -0, 100, 100, 1, 230400, 0x66824f3a -1, 220500, 220500, 2205, 4410, 0x1a0343b5 -0, 101, 101, 1, 230400, 0x0c9257e2 -1, 222705, 222705, 2205, 4410, 0xc48e338c -0, 102, 102, 1, 230400, 0xb2927092 -1, 224910, 224910, 2205, 4410, 0x26fc03c8 -0, 103, 103, 1, 230400, 0xb5dc6e9a -1, 227115, 227115, 2205, 4410, 0x69be7e2d -0, 104, 104, 1, 230400, 0x6e567bc6 -1, 229320, 229320, 2205, 4410, 0x69a74da1 -0, 105, 105, 1, 230400, 0xbf9e0f7a -1, 231525, 231525, 2205, 4410, 0x85bd2ab3 -0, 106, 106, 1, 230400, 0xb16f684a -1, 233730, 233730, 2205, 4410, 0xeff05426 -0, 107, 107, 1, 230400, 0xf9e55e81 -1, 235935, 235935, 2205, 4410, 0x292829e0 -0, 108, 108, 1, 230400, 0xd8d0bcba -1, 238140, 238140, 2205, 4410, 0x8f741798 -0, 109, 109, 1, 230400, 0x44720ac0 -1, 240345, 240345, 2205, 4410, 0x6b9337e9 -0, 110, 110, 1, 230400, 0x7d4c2058 -1, 242550, 242550, 2205, 4410, 0xe4e1703f -1, 244755, 244755, 2205, 4410, 0x043d6c35 -1, 246960, 246960, 2205, 4410, 0x3a8988e7 -0, 113, 113, 1, 230400, 0xb0973eb9 -1, 249165, 249165, 2205, 4410, 0x1fa7d2a9 -0, 114, 114, 1, 230400, 0x405a13ce -1, 251370, 251370, 2205, 4410, 0xe28799e3 -0, 115, 115, 1, 230400, 0x6422f00a -1, 253575, 253575, 2205, 4410, 0xc2df4470 -0, 116, 116, 1, 230400, 0x924b6c1e -1, 255780, 255780, 2205, 4410, 0x694d0cf5 -1, 257985, 257985, 2205, 4410, 0x5aac2dcf -1, 260190, 260190, 2205, 4410, 0x259fa2db -1, 262395, 262395, 2205, 4410, 0xd16d6803 -1, 264600, 264600, 2205, 4410, 0xa4b3478a -1, 266805, 266805, 2205, 4410, 0xdbe0443d -1, 269010, 269010, 2205, 4410, 0x26c16119 -1, 271215, 271215, 2205, 4410, 0x0c06475c -1, 273420, 273420, 2205, 4410, 0x6ffaba2d -1, 275625, 275625, 2205, 4410, 0x5b287192 -1, 277830, 277830, 2205, 4410, 0xf2cf2651 -1, 280035, 280035, 2205, 4410, 0x3857673a -1, 282240, 282240, 2205, 4410, 0x5b555feb -1, 284445, 284445, 2205, 4410, 0x93f997af -1, 286650, 286650, 2205, 4410, 0xb3ba8d35 -1, 288855, 288855, 2205, 4410, 0x66433944 -1, 291060, 291060, 2205, 4410, 0xf0005a5f -1, 293265, 293265, 2205, 4410, 0xb948541f -1, 295470, 295470, 2205, 4410, 0xc8f1b16f -1, 297675, 297675, 2205, 4410, 0x7d4b7506 -1, 299880, 299880, 2205, 4410, 0xac723c55 -1, 302085, 302085, 2205, 4410, 0x2926fab5 -1, 304290, 304290, 2205, 4410, 0x31684995 -1, 306495, 306495, 2205, 4410, 0x35ebfca4 -1, 308700, 308700, 2205, 4410, 0x9cd42c18 -1, 310905, 310905, 2205, 4410, 0xd7ecd7b1 -1, 313110, 313110, 2205, 4410, 0x5e13c602 -1, 315315, 315315, 2205, 4410, 0xe955b5e3 -1, 317520, 317520, 2205, 4410, 0xefad19a1 -0, 145, 145, 1, 230400, 0xcf7809c0 -1, 319725, 319725, 2205, 4410, 0x435950de -0, 146, 146, 1, 230400, 0x883a3863 -1, 321930, 321930, 2205, 4410, 0x9d624ebe -0, 147, 147, 1, 230400, 0x6adc9e03 -1, 324135, 324135, 2205, 4410, 0x774a9158 -0, 148, 148, 1, 230400, 0x4f5ab7a8 -1, 326340, 326340, 2205, 4410, 0x8c41e66a -1, 328545, 328545, 2205, 4410, 0x70112740 -1, 330750, 330750, 2205, 4410, 0x55abc7a2 -1, 332955, 332955, 2205, 4410, 0x0ec3183c -1, 335160, 335160, 2205, 4410, 0x54609c56 -1, 337365, 337365, 2205, 4410, 0x60d49f92 -1, 339570, 339570, 2205, 4410, 0x5fb061c8 -1, 341775, 341775, 2205, 4410, 0x6e119c98 -1, 343980, 343980, 2205, 4410, 0x3f39fc69 -1, 346185, 346185, 2205, 4410, 0xef466d0e -1, 348390, 348390, 2205, 4410, 0xf4cb6fe1 -1, 350595, 350595, 2205, 4410, 0xc4434439 -1, 352800, 352800, 2205, 4410, 0xd02329d2 -1, 355005, 355005, 2205, 4410, 0x216cffaf -1, 357210, 357210, 2205, 4410, 0x7e59e8c1 -1, 359415, 359415, 2205, 4410, 0xc7c3346d -1, 361620, 361620, 2205, 4410, 0x5b3723af -1, 363825, 363825, 2205, 4410, 0x76097270 -1, 366030, 366030, 2205, 4410, 0xae39a233 -1, 368235, 368235, 2205, 4410, 0x686a471c -1, 370440, 370440, 2205, 4410, 0x3af3c5e0 -1, 372645, 372645, 2205, 4410, 0x11ac711e -1, 374850, 374850, 2205, 4410, 0xcd8da8ce -1, 377055, 377055, 2205, 4410, 0x21296e3a -1, 379260, 379260, 2205, 4410, 0x77168188 -1, 381465, 381465, 2205, 4410, 0x5fcf59cd -1, 383670, 383670, 2205, 4410, 0x390c8717 -1, 385875, 385875, 2205, 4410, 0x3d5d5b3c -1, 388080, 388080, 2205, 4410, 0x3b8f13d3 -1, 390285, 390285, 2205, 4410, 0x5b002c2f -1, 392490, 392490, 2205, 4410, 0x9e1d2b08 -1, 394695, 394695, 2205, 4410, 0x69454ebd -1, 396900, 396900, 2205, 4410, 0x62a54bec -1, 399105, 399105, 2205, 4410, 0x4d231fdb -1, 401310, 401310, 2205, 4410, 0x65624ff7 -1, 403515, 403515, 2205, 4410, 0x6fc66932 -1, 405720, 405720, 2205, 4410, 0x23200cf6 -1, 407925, 407925, 2205, 4410, 0xf8033122 -1, 410130, 410130, 2205, 4410, 0x0fce0744 -1, 412335, 412335, 2205, 4410, 0x9302683e -1, 414540, 414540, 2205, 4410, 0xd2380245 -1, 416745, 416745, 2205, 4410, 0x482e0872 -1, 418950, 418950, 2205, 4410, 0xe98e6461 -1, 421155, 421155, 2205, 4410, 0x1db404e3 -1, 423360, 423360, 2205, 4410, 0x47a26d45 -1, 425565, 425565, 2205, 4410, 0x449a348a -1, 427770, 427770, 2205, 4410, 0xee874f84 -1, 429975, 429975, 2205, 4410, 0xc4ecf965 -1, 432180, 432180, 2205, 4410, 0xcc450bc8 -1, 434385, 434385, 2205, 4410, 0xb18d044b -1, 436590, 436590, 2205, 4410, 0x895435e8 -1, 438795, 438795, 2205, 4410, 0x57e7574e -1, 441000, 441000, 2205, 4410, 0x8041ad3d -1, 443205, 443205, 2205, 4410, 0x853d1616 -1, 445410, 445410, 2205, 4410, 0xa11bb32b -1, 447615, 447615, 2205, 4410, 0xe10ea0de -1, 449820, 449820, 2205, 4410, 0xdf2ee328 -1, 452025, 452025, 2205, 4410, 0xd5a6dcae -1, 454230, 454230, 2205, 4410, 0xd176c00b -1, 456435, 456435, 2205, 4410, 0x9cd6bcf3 -1, 458640, 458640, 2205, 4410, 0x2569690a -1, 460845, 460845, 2205, 4410, 0x6824aa1d -1, 463050, 463050, 2205, 4410, 0xa9110afa -1, 465255, 465255, 2205, 4410, 0x115c25be -1, 467460, 467460, 2205, 4410, 0x1100f085 -1, 469665, 469665, 2205, 4410, 0x00000000 -0, 214, 214, 1, 230400, 0xdc0aab94 -1, 471870, 471870, 2205, 4410, 0x00000000 -1, 474075, 474075, 2205, 4410, 0x00000000 -1, 476280, 476280, 2205, 4410, 0x00000000 -1, 478485, 478485, 2205, 4410, 0x00000000 -1, 480690, 480690, 2205, 4410, 0x00000000 -1, 482895, 482895, 2205, 4410, 0x00000000 -1, 485100, 485100, 2205, 4410, 0x00000000 -1, 487305, 487305, 2205, 4410, 0x00000000 -1, 489510, 489510, 2205, 4410, 0x00000000 -1, 491715, 491715, 2205, 4410, 0x00000000 -1, 493920, 493920, 2205, 4410, 0x00000000 -1, 496125, 496125, 2205, 4410, 0x00000000 -1, 498330, 498330, 2205, 4410, 0x00000000 -1, 500535, 500535, 2205, 4410, 0x00000000 -1, 502740, 502740, 2205, 4410, 0x00000000 -1, 504945, 504945, 2205, 4410, 0x00000000 -1, 507150, 507150, 2205, 4410, 0x00000000 -1, 509355, 509355, 2205, 4410, 0x00000000 -1, 511560, 511560, 2205, 4410, 0x00000000 -1, 513765, 513765, 2205, 4410, 0x00000000 -1, 515970, 515970, 2205, 4410, 0x00000000 -1, 518175, 518175, 2205, 4410, 0x00000000 -1, 520380, 520380, 2205, 4410, 0x00000000 -1, 522585, 522585, 2205, 4410, 0x00000000 -1, 524790, 524790, 2205, 4410, 0x00000000 -1, 526995, 526995, 2205, 4410, 0x00000000 -1, 529200, 529200, 2205, 4410, 0x00000000 -1, 531405, 531405, 2205, 4410, 0x00000000 diff --git a/tests/ref/fate/sierra-vmd-audio b/tests/ref/fate/sierra-vmd-audio new file mode 100644 index 0000000000..13d3567e11 --- /dev/null +++ b/tests/ref/fate/sierra-vmd-audio @@ -0,0 +1,216 @@ +#tb 0: 1/22050 +0, 0, 0, 61740, 123480, 0x3a794c13 +0, 61740, 61740, 2205, 4410, 0x109d04e0 +0, 63945, 63945, 2205, 4410, 0x224d244f +0, 66150, 66150, 2205, 4410, 0xbb72413d +0, 68355, 68355, 2205, 4410, 0xaa5f5b86 +0, 70560, 70560, 2205, 4410, 0x94e7aea7 +0, 72765, 72765, 2205, 4410, 0xad497ca0 +0, 74970, 74970, 2205, 4410, 0x1de10c9e +0, 77175, 77175, 2205, 4410, 0x9f55efa8 +0, 79380, 79380, 2205, 4410, 0x220a072a +0, 81585, 81585, 2205, 4410, 0xa7dafb29 +0, 83790, 83790, 2205, 4410, 0xd5e29c7a +0, 85995, 85995, 2205, 4410, 0xb8465006 +0, 88200, 88200, 2205, 4410, 0x518669c7 +0, 90405, 90405, 2205, 4410, 0xb5b5efca +0, 92610, 92610, 2205, 4410, 0x8600015d +0, 94815, 94815, 2205, 4410, 0xe2f68fe9 +0, 97020, 97020, 2205, 4410, 0x8d3458d9 +0, 99225, 99225, 2205, 4410, 0xf1ff4775 +0, 101430, 101430, 2205, 4410, 0x830f67c9 +0, 103635, 103635, 2205, 4410, 0x110e0bc1 +0, 105840, 105840, 2205, 4410, 0x71682f47 +0, 108045, 108045, 2205, 4410, 0x38119095 +0, 110250, 110250, 2205, 4410, 0xd2494db6 +0, 112455, 112455, 2205, 4410, 0x8b552509 +0, 114660, 114660, 2205, 4410, 0x71e52909 +0, 116865, 116865, 2205, 4410, 0x9f0a6f4d +0, 119070, 119070, 2205, 4410, 0x901302f2 +0, 121275, 121275, 2205, 4410, 0x855d5222 +0, 123480, 123480, 2205, 4410, 0x324bb2fe +0, 125685, 125685, 2205, 4410, 0xe85f583f +0, 127890, 127890, 2205, 4410, 0x2cbc67c4 +0, 130095, 130095, 2205, 4410, 0xc82e6aa1 +0, 132300, 132300, 2205, 4410, 0xb9fc423c +0, 134505, 134505, 2205, 4410, 0x6b9b4ef9 +0, 136710, 136710, 2205, 4410, 0x39290f10 +0, 138915, 138915, 2205, 4410, 0xad718eb4 +0, 141120, 141120, 2205, 4410, 0x82f463ac +0, 143325, 143325, 2205, 4410, 0xfac87cac +0, 145530, 145530, 2205, 4410, 0x9e8bcca7 +0, 147735, 147735, 2205, 4410, 0x52f79c99 +0, 149940, 149940, 2205, 4410, 0xf2d14de2 +0, 152145, 152145, 2205, 4410, 0x367f95e1 +0, 154350, 154350, 2205, 4410, 0x8bfac293 +0, 156555, 156555, 2205, 4410, 0x01ea5040 +0, 158760, 158760, 2205, 4410, 0x8ff5e212 +0, 160965, 160965, 2205, 4410, 0x93f32824 +0, 163170, 163170, 2205, 4410, 0x998f90dc +0, 165375, 165375, 2205, 4410, 0x65231170 +0, 167580, 167580, 2205, 4410, 0xc79039a1 +0, 169785, 169785, 2205, 4410, 0x0b0e58bd +0, 171990, 171990, 2205, 4410, 0xc24ab4fa +0, 174195, 174195, 2205, 4410, 0xd3796a8e +0, 176400, 176400, 2205, 4410, 0xa37f8295 +0, 178605, 178605, 2205, 4410, 0xb760fed7 +0, 180810, 180810, 2205, 4410, 0x05495a34 +0, 183015, 183015, 2205, 4410, 0x6f203437 +0, 185220, 185220, 2205, 4410, 0x71299402 +0, 187425, 187425, 2205, 4410, 0x72e7b346 +0, 189630, 189630, 2205, 4410, 0x879b0dae +0, 191835, 191835, 2205, 4410, 0x041aa1bd +0, 194040, 194040, 2205, 4410, 0x18a962e6 +0, 196245, 196245, 2205, 4410, 0x21d20539 +0, 198450, 198450, 2205, 4410, 0x8f449267 +0, 200655, 200655, 2205, 4410, 0xecdc01d6 +0, 202860, 202860, 2205, 4410, 0x458abd5a +0, 205065, 205065, 2205, 4410, 0xa070ea63 +0, 207270, 207270, 2205, 4410, 0xc25b26ce +0, 209475, 209475, 2205, 4410, 0x4d9237ca +0, 211680, 211680, 2205, 4410, 0x748e1801 +0, 213885, 213885, 2205, 4410, 0xc96b69e6 +0, 216090, 216090, 2205, 4410, 0x6663186c +0, 218295, 218295, 2205, 4410, 0x7f6d3081 +0, 220500, 220500, 2205, 4410, 0x1a0343b5 +0, 222705, 222705, 2205, 4410, 0xc48e338c +0, 224910, 224910, 2205, 4410, 0x26fc03c8 +0, 227115, 227115, 2205, 4410, 0x69be7e2d +0, 229320, 229320, 2205, 4410, 0x69a74da1 +0, 231525, 231525, 2205, 4410, 0x85bd2ab3 +0, 233730, 233730, 2205, 4410, 0xeff05426 +0, 235935, 235935, 2205, 4410, 0x292829e0 +0, 238140, 238140, 2205, 4410, 0x8f741798 +0, 240345, 240345, 2205, 4410, 0x6b9337e9 +0, 242550, 242550, 2205, 4410, 0xe4e1703f +0, 244755, 244755, 2205, 4410, 0x043d6c35 +0, 246960, 246960, 2205, 4410, 0x3a8988e7 +0, 249165, 249165, 2205, 4410, 0x1fa7d2a9 +0, 251370, 251370, 2205, 4410, 0xe28799e3 +0, 253575, 253575, 2205, 4410, 0xc2df4470 +0, 255780, 255780, 2205, 4410, 0x694d0cf5 +0, 257985, 257985, 2205, 4410, 0x5aac2dcf +0, 260190, 260190, 2205, 4410, 0x259fa2db +0, 262395, 262395, 2205, 4410, 0xd16d6803 +0, 264600, 264600, 2205, 4410, 0xa4b3478a +0, 266805, 266805, 2205, 4410, 0xdbe0443d +0, 269010, 269010, 2205, 4410, 0x26c16119 +0, 271215, 271215, 2205, 4410, 0x0c06475c +0, 273420, 273420, 2205, 4410, 0x6ffaba2d +0, 275625, 275625, 2205, 4410, 0x5b287192 +0, 277830, 277830, 2205, 4410, 0xf2cf2651 +0, 280035, 280035, 2205, 4410, 0x3857673a +0, 282240, 282240, 2205, 4410, 0x5b555feb +0, 284445, 284445, 2205, 4410, 0x93f997af +0, 286650, 286650, 2205, 4410, 0xb3ba8d35 +0, 288855, 288855, 2205, 4410, 0x66433944 +0, 291060, 291060, 2205, 4410, 0xf0005a5f +0, 293265, 293265, 2205, 4410, 0xb948541f +0, 295470, 295470, 2205, 4410, 0xc8f1b16f +0, 297675, 297675, 2205, 4410, 0x7d4b7506 +0, 299880, 299880, 2205, 4410, 0xac723c55 +0, 302085, 302085, 2205, 4410, 0x2926fab5 +0, 304290, 304290, 2205, 4410, 0x31684995 +0, 306495, 306495, 2205, 4410, 0x35ebfca4 +0, 308700, 308700, 2205, 4410, 0x9cd42c18 +0, 310905, 310905, 2205, 4410, 0xd7ecd7b1 +0, 313110, 313110, 2205, 4410, 0x5e13c602 +0, 315315, 315315, 2205, 4410, 0xe955b5e3 +0, 317520, 317520, 2205, 4410, 0xefad19a1 +0, 319725, 319725, 2205, 4410, 0x435950de +0, 321930, 321930, 2205, 4410, 0x9d624ebe +0, 324135, 324135, 2205, 4410, 0x774a9158 +0, 326340, 326340, 2205, 4410, 0x8c41e66a +0, 328545, 328545, 2205, 4410, 0x70112740 +0, 330750, 330750, 2205, 4410, 0x55abc7a2 +0, 332955, 332955, 2205, 4410, 0x0ec3183c +0, 335160, 335160, 2205, 4410, 0x54609c56 +0, 337365, 337365, 2205, 4410, 0x60d49f92 +0, 339570, 339570, 2205, 4410, 0x5fb061c8 +0, 341775, 341775, 2205, 4410, 0x6e119c98 +0, 343980, 343980, 2205, 4410, 0x3f39fc69 +0, 346185, 346185, 2205, 4410, 0xef466d0e +0, 348390, 348390, 2205, 4410, 0xf4cb6fe1 +0, 350595, 350595, 2205, 4410, 0xc4434439 +0, 352800, 352800, 2205, 4410, 0xd02329d2 +0, 355005, 355005, 2205, 4410, 0x216cffaf +0, 357210, 357210, 2205, 4410, 0x7e59e8c1 +0, 359415, 359415, 2205, 4410, 0xc7c3346d +0, 361620, 361620, 2205, 4410, 0x5b3723af +0, 363825, 363825, 2205, 4410, 0x76097270 +0, 366030, 366030, 2205, 4410, 0xae39a233 +0, 368235, 368235, 2205, 4410, 0x686a471c +0, 370440, 370440, 2205, 4410, 0x3af3c5e0 +0, 372645, 372645, 2205, 4410, 0x11ac711e +0, 374850, 374850, 2205, 4410, 0xcd8da8ce +0, 377055, 377055, 2205, 4410, 0x21296e3a +0, 379260, 379260, 2205, 4410, 0x77168188 +0, 381465, 381465, 2205, 4410, 0x5fcf59cd +0, 383670, 383670, 2205, 4410, 0x390c8717 +0, 385875, 385875, 2205, 4410, 0x3d5d5b3c +0, 388080, 388080, 2205, 4410, 0x3b8f13d3 +0, 390285, 390285, 2205, 4410, 0x5b002c2f +0, 392490, 392490, 2205, 4410, 0x9e1d2b08 +0, 394695, 394695, 2205, 4410, 0x69454ebd +0, 396900, 396900, 2205, 4410, 0x62a54bec +0, 399105, 399105, 2205, 4410, 0x4d231fdb +0, 401310, 401310, 2205, 4410, 0x65624ff7 +0, 403515, 403515, 2205, 4410, 0x6fc66932 +0, 405720, 405720, 2205, 4410, 0x23200cf6 +0, 407925, 407925, 2205, 4410, 0xf8033122 +0, 410130, 410130, 2205, 4410, 0x0fce0744 +0, 412335, 412335, 2205, 4410, 0x9302683e +0, 414540, 414540, 2205, 4410, 0xd2380245 +0, 416745, 416745, 2205, 4410, 0x482e0872 +0, 418950, 418950, 2205, 4410, 0xe98e6461 +0, 421155, 421155, 2205, 4410, 0x1db404e3 +0, 423360, 423360, 2205, 4410, 0x47a26d45 +0, 425565, 425565, 2205, 4410, 0x449a348a +0, 427770, 427770, 2205, 4410, 0xee874f84 +0, 429975, 429975, 2205, 4410, 0xc4ecf965 +0, 432180, 432180, 2205, 4410, 0xcc450bc8 +0, 434385, 434385, 2205, 4410, 0xb18d044b +0, 436590, 436590, 2205, 4410, 0x895435e8 +0, 438795, 438795, 2205, 4410, 0x57e7574e +0, 441000, 441000, 2205, 4410, 0x8041ad3d +0, 443205, 443205, 2205, 4410, 0x853d1616 +0, 445410, 445410, 2205, 4410, 0xa11bb32b +0, 447615, 447615, 2205, 4410, 0xe10ea0de +0, 449820, 449820, 2205, 4410, 0xdf2ee328 +0, 452025, 452025, 2205, 4410, 0xd5a6dcae +0, 454230, 454230, 2205, 4410, 0xd176c00b +0, 456435, 456435, 2205, 4410, 0x9cd6bcf3 +0, 458640, 458640, 2205, 4410, 0x2569690a +0, 460845, 460845, 2205, 4410, 0x6824aa1d +0, 463050, 463050, 2205, 4410, 0xa9110afa +0, 465255, 465255, 2205, 4410, 0x115c25be +0, 467460, 467460, 2205, 4410, 0x1100f085 +0, 469665, 469665, 2205, 4410, 0x00000000 +0, 471870, 471870, 2205, 4410, 0x00000000 +0, 474075, 474075, 2205, 4410, 0x00000000 +0, 476280, 476280, 2205, 4410, 0x00000000 +0, 478485, 478485, 2205, 4410, 0x00000000 +0, 480690, 480690, 2205, 4410, 0x00000000 +0, 482895, 482895, 2205, 4410, 0x00000000 +0, 485100, 485100, 2205, 4410, 0x00000000 +0, 487305, 487305, 2205, 4410, 0x00000000 +0, 489510, 489510, 2205, 4410, 0x00000000 +0, 491715, 491715, 2205, 4410, 0x00000000 +0, 493920, 493920, 2205, 4410, 0x00000000 +0, 496125, 496125, 2205, 4410, 0x00000000 +0, 498330, 498330, 2205, 4410, 0x00000000 +0, 500535, 500535, 2205, 4410, 0x00000000 +0, 502740, 502740, 2205, 4410, 0x00000000 +0, 504945, 504945, 2205, 4410, 0x00000000 +0, 507150, 507150, 2205, 4410, 0x00000000 +0, 509355, 509355, 2205, 4410, 0x00000000 +0, 511560, 511560, 2205, 4410, 0x00000000 +0, 513765, 513765, 2205, 4410, 0x00000000 +0, 515970, 515970, 2205, 4410, 0x00000000 +0, 518175, 518175, 2205, 4410, 0x00000000 +0, 520380, 520380, 2205, 4410, 0x00000000 +0, 522585, 522585, 2205, 4410, 0x00000000 +0, 524790, 524790, 2205, 4410, 0x00000000 +0, 526995, 526995, 2205, 4410, 0x00000000 +0, 529200, 529200, 2205, 4410, 0x00000000 +0, 531405, 531405, 2205, 4410, 0x00000000 diff --git a/tests/ref/fate/sierra-vmd-video b/tests/ref/fate/sierra-vmd-video new file mode 100644 index 0000000000..5b9dde1b32 --- /dev/null +++ b/tests/ref/fate/sierra-vmd-video @@ -0,0 +1,118 @@ +#tb 0: 1/10 +0, 0, 0, 1, 230400, 0x0224ab01 +0, 1, 1, 1, 230400, 0x449e4d81 +0, 2, 2, 1, 230400, 0x3e15e07a +0, 3, 3, 1, 230400, 0xdabe4172 +0, 4, 4, 1, 230400, 0x0947b7db +0, 5, 5, 1, 230400, 0x934e243b +0, 6, 6, 1, 230400, 0x6b5c5b6c +0, 7, 7, 1, 230400, 0x4bf7bbb5 +0, 8, 8, 1, 230400, 0x423eec8e +0, 9, 9, 1, 230400, 0x63663b5e +0, 10, 10, 1, 230400, 0x9c258a67 +0, 11, 11, 1, 230400, 0x1c92b6e0 +0, 12, 12, 1, 230400, 0xdd0a0e28 +0, 13, 13, 1, 230400, 0x51d64af1 +0, 14, 14, 1, 230400, 0x5776ac12 +0, 15, 15, 1, 230400, 0x49070132 +0, 16, 16, 1, 230400, 0xa59635ab +0, 17, 17, 1, 230400, 0xb1f99504 +0, 18, 18, 1, 230400, 0x61fac725 +0, 19, 19, 1, 230400, 0xc32c28d5 +0, 20, 20, 1, 230400, 0x2b7a91d6 +0, 21, 21, 1, 230400, 0x917be717 +0, 22, 22, 1, 230400, 0xd3c5a2ff +0, 23, 23, 1, 230400, 0x0678a707 +0, 24, 24, 1, 230400, 0x122504e6 +0, 25, 25, 1, 230400, 0x76aebdae +0, 26, 26, 1, 230400, 0x81357545 +0, 27, 27, 1, 230400, 0x38baeebd +0, 28, 28, 1, 230400, 0x1c5c44d4 +0, 29, 29, 1, 230400, 0x60e189cc +0, 30, 30, 1, 230400, 0xb1f4381c +0, 31, 31, 1, 230400, 0xb5048fed +0, 32, 32, 1, 230400, 0xc947c30e +0, 33, 33, 1, 230400, 0xe8e31c07 +0, 34, 34, 1, 230400, 0x6d49dd02 +0, 35, 35, 1, 230400, 0x293e15d3 +0, 36, 36, 1, 230400, 0x354d792e +0, 37, 37, 1, 230400, 0x35468780 +0, 38, 38, 1, 230400, 0x365d3991 +0, 39, 39, 1, 230400, 0xc9debef2 +0, 40, 40, 1, 230400, 0x4c4634c2 +0, 41, 41, 1, 230400, 0x347c2dca +0, 42, 42, 1, 230400, 0x1efa0aaa +0, 43, 43, 1, 230400, 0xa79a0b5a +0, 44, 44, 1, 230400, 0xfdb2dcdb +0, 45, 45, 1, 230400, 0x42dbea33 +0, 46, 46, 1, 230400, 0x2a207e43 +0, 47, 47, 1, 230400, 0x86573783 +0, 48, 48, 1, 230400, 0xc3968473 +0, 49, 49, 1, 230400, 0x8f62a7b4 +0, 50, 50, 1, 230400, 0x5a2e3073 +0, 51, 51, 1, 230400, 0xd24f5e2c +0, 52, 52, 1, 230400, 0x1df3c67d +0, 53, 53, 1, 230400, 0xe4fd884d +0, 57, 57, 1, 230400, 0x9a228555 +0, 58, 58, 1, 230400, 0x9eba8ed5 +0, 59, 59, 1, 230400, 0x3d808a3d +0, 60, 60, 1, 230400, 0xf57e866d +0, 61, 61, 1, 230400, 0x85f594f5 +0, 62, 62, 1, 230400, 0xb09f99dd +0, 63, 63, 1, 230400, 0x2b368475 +0, 64, 64, 1, 230400, 0xa2417afd +0, 65, 65, 1, 230400, 0x590b709d +0, 66, 66, 1, 230400, 0x5d617705 +0, 67, 67, 1, 230400, 0xabf981ad +0, 68, 68, 1, 230400, 0x5a8590cd +0, 69, 69, 1, 230400, 0x1bff853d +0, 70, 70, 1, 230400, 0x71d08055 +0, 71, 71, 1, 230400, 0x2ebd817d +0, 72, 72, 1, 230400, 0x6e838255 +0, 73, 73, 1, 230400, 0x043984cd +0, 74, 74, 1, 230400, 0x7ff18495 +0, 75, 75, 1, 230400, 0xa43b8385 +0, 76, 76, 1, 230400, 0x72b5825d +0, 77, 77, 1, 230400, 0x3a178085 +0, 78, 78, 1, 230400, 0x67748245 +0, 79, 79, 1, 230400, 0xeddf81d5 +0, 80, 80, 1, 230400, 0x8b088665 +0, 81, 81, 1, 230400, 0x6c408e15 +0, 82, 82, 1, 230400, 0x81f196dd +0, 83, 83, 1, 230400, 0xab9f953d +0, 84, 84, 1, 230400, 0xa5f69795 +0, 85, 85, 1, 230400, 0xa772950d +0, 86, 86, 1, 230400, 0x6a5596d5 +0, 87, 87, 1, 230400, 0x1355958d +0, 88, 88, 1, 230400, 0x4134981d +0, 89, 89, 1, 230400, 0x8b929515 +0, 90, 90, 1, 230400, 0x482f95c5 +0, 91, 91, 1, 230400, 0x7a9795d5 +0, 92, 92, 1, 230400, 0x21c29abd +0, 93, 93, 1, 230400, 0x9ae6a475 +0, 94, 94, 1, 230400, 0x3734aee5 +0, 95, 95, 1, 230400, 0xa0a1b365 +0, 96, 96, 1, 230400, 0x2dcab1c5 +0, 97, 97, 1, 230400, 0x9c8b6c44 +0, 98, 98, 1, 230400, 0x5da75feb +0, 99, 99, 1, 230400, 0x4d02f8e3 +0, 100, 100, 1, 230400, 0x66824f3a +0, 101, 101, 1, 230400, 0x0c9257e2 +0, 102, 102, 1, 230400, 0xb2927092 +0, 103, 103, 1, 230400, 0xb5dc6e9a +0, 104, 104, 1, 230400, 0x6e567bc6 +0, 105, 105, 1, 230400, 0xbf9e0f7a +0, 106, 106, 1, 230400, 0xb16f684a +0, 107, 107, 1, 230400, 0xf9e55e81 +0, 108, 108, 1, 230400, 0xd8d0bcba +0, 109, 109, 1, 230400, 0x44720ac0 +0, 110, 110, 1, 230400, 0x7d4c2058 +0, 113, 113, 1, 230400, 0xb0973eb9 +0, 114, 114, 1, 230400, 0x405a13ce +0, 115, 115, 1, 230400, 0x6422f00a +0, 116, 116, 1, 230400, 0x924b6c1e +0, 145, 145, 1, 230400, 0xcf7809c0 +0, 146, 146, 1, 230400, 0x883a3863 +0, 147, 147, 1, 230400, 0x6adc9e03 +0, 148, 148, 1, 230400, 0x4f5ab7a8 +0, 214, 214, 1, 230400, 0xdc0aab94 -- cgit v1.2.3 From 7abf789975a77dde774a26d392188ea46fc08110 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 15:15:35 +0100 Subject: fate: make smjpeg a demux test These codecs are covered elsewhere so make this a pure demux test. Also rename it accordingly. Signed-off-by: Mans Rullgard --- tests/fate/demux.mak | 4 +- tests/ref/fate/smjpeg | 425 -------------------------------------------- tests/ref/fate/smjpeg-demux | 425 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 427 insertions(+), 427 deletions(-) delete mode 100644 tests/ref/fate/smjpeg create mode 100644 tests/ref/fate/smjpeg-demux (limited to 'tests') diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 92aa812471..ab4e80d7c0 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -58,8 +58,8 @@ fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy FATE_AVCONV += fate-siff fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -FATE_AVCONV += fate-smjpeg -fate-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vcodec copy +FATE_AVCONV += fate-smjpeg-demux +fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy FATE_AVCONV += fate-westwood-aud fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy diff --git a/tests/ref/fate/smjpeg b/tests/ref/fate/smjpeg deleted file mode 100644 index 7aac52febc..0000000000 --- a/tests/ref/fate/smjpeg +++ /dev/null @@ -1,425 +0,0 @@ -#tb 0: 1/1000 -#tb 1: 1/22050 -0, 0, 0, 0, 734, 0x5a042c2c -1, 0, 0, 512, 1024, 0x00000000 -1, 507, 507, 512, 1024, 0x00000000 -1, 1014, 1014, 512, 1024, 0xd89a448e -1, 1521, 1521, 512, 1024, 0x695b369c -1, 2029, 2029, 512, 1024, 0xc8ba5707 -0, 111, 111, 0, 763, 0xb5893f2f -1, 2558, 2558, 512, 1024, 0xdf241fc6 -1, 3065, 3065, 512, 1024, 0x61cf4166 -1, 3572, 3572, 512, 1024, 0x97cbc386 -1, 4079, 4079, 512, 1024, 0x44899d04 -1, 4586, 4586, 512, 1024, 0xa7cbaa62 -0, 222, 222, 0, 3023, 0x0f3907d3 -1, 5116, 5116, 512, 1024, 0xa7aea60c -1, 5623, 5623, 512, 1024, 0xd7b18a89 -1, 6130, 6130, 512, 1024, 0x268e81f6 -1, 6637, 6637, 512, 1024, 0x9cf83a2f -1, 7166, 7166, 512, 1024, 0x5559b508 -0, 333, 333, 0, 4800, 0x22e6e18a -1, 7673, 7673, 512, 1024, 0xe1b9e71c -1, 8181, 8181, 512, 1024, 0xdcee733e -1, 8688, 8688, 512, 1024, 0xe5918f60 -1, 9195, 9195, 512, 1024, 0x29dbd209 -1, 9724, 9724, 512, 1024, 0x9bcbcf16 -0, 444, 444, 0, 6417, 0x427adde5 -1, 10231, 10231, 512, 1024, 0x86f5f458 -1, 10738, 10738, 512, 1024, 0xabcbda86 -1, 11246, 11246, 512, 1024, 0xc51f77b9 -1, 11775, 11775, 512, 1024, 0xf6b3a504 -0, 555, 555, 0, 6776, 0x7a74c6ad -1, 12282, 12282, 512, 1024, 0x1af3e40e -1, 12789, 12789, 512, 1024, 0x3866b03b -1, 13296, 13296, 512, 1024, 0xbc005403 -1, 13803, 13803, 512, 1024, 0xe9dfcc51 -1, 14333, 14333, 512, 1024, 0x83c837cb -0, 666, 666, 0, 6808, 0x1f6eb7c3 -1, 14840, 14840, 512, 1024, 0xfa649580 -1, 15347, 15347, 512, 1024, 0x519452ea -1, 15854, 15854, 512, 1024, 0xd4978774 -1, 16383, 16383, 512, 1024, 0xe2a3b1cd -1, 16890, 16890, 512, 1024, 0x9a9472ad -0, 777, 777, 0, 6726, 0x452087e6 -1, 17397, 17397, 512, 1024, 0xa12d4060 -1, 17905, 17905, 512, 1024, 0x31fb0646 -1, 18412, 18412, 512, 1024, 0xfc44343f -1, 18941, 18941, 512, 1024, 0x0847751a -1, 19448, 19448, 512, 1024, 0x227968a2 -0, 888, 888, 0, 6829, 0xee82b109 -1, 19955, 19955, 512, 1024, 0x7cce9f1c -1, 20462, 20462, 512, 1024, 0xb8356713 -1, 20992, 20992, 512, 1024, 0xb29f6e6f -1, 21499, 21499, 512, 1024, 0x9e1430ab -1, 22006, 22006, 512, 1024, 0x26d85423 -0, 999, 999, 0, 7055, 0xf41f1108 -1, 22513, 22513, 512, 1024, 0x6496547d -1, 23020, 23020, 512, 1024, 0x316b1a86 -1, 23549, 23549, 512, 1024, 0x3cd83afc -1, 24057, 24057, 512, 1024, 0x993ff633 -0, 1111, 1111, 0, 6977, 0xf8fe1ede -1, 24564, 24564, 512, 1024, 0x0708d1a2 -1, 25071, 25071, 512, 1024, 0xd7230db9 -1, 25578, 25578, 512, 1024, 0xbb0779ca -1, 26107, 26107, 512, 1024, 0xc6094e1b -1, 26614, 26614, 512, 1024, 0x15a8b039 -0, 1222, 1222, 0, 6942, 0x9ad105c6 -1, 27122, 27122, 512, 1024, 0xd6dbe88c -1, 27629, 27629, 512, 1024, 0x7e8d1140 -1, 28158, 28158, 512, 1024, 0xef88e525 -1, 28665, 28665, 512, 1024, 0x44e21149 -1, 29172, 29172, 512, 1024, 0x65b0f5f4 -0, 1333, 1333, 0, 6926, 0xe239dad6 -1, 29679, 29679, 512, 1024, 0xb955f687 -1, 30186, 30186, 512, 1024, 0xc85fba9c -1, 30716, 30716, 512, 1024, 0xf59655ad -1, 31223, 31223, 512, 1024, 0x6de80bf1 -1, 31730, 31730, 512, 1024, 0x2dcf6e41 -0, 1444, 1444, 0, 6966, 0x81dcfab1 -1, 32237, 32237, 512, 1024, 0xd0ddcf8a -1, 32766, 32766, 512, 1024, 0x00135c2d -1, 33273, 33273, 512, 1024, 0x697f8efd -1, 33781, 33781, 512, 1024, 0x7a9bada5 -0, 1555, 1555, 0, 6896, 0x31e6cc02 -1, 34288, 34288, 512, 1024, 0x0d22783c -1, 34795, 34795, 512, 1024, 0x7726d07d -1, 35324, 35324, 512, 1024, 0xa2f14f67 -1, 35831, 35831, 512, 1024, 0x7f51060d -1, 36338, 36338, 512, 1024, 0xc4ec6aea -0, 1666, 1666, 0, 6889, 0x1cc1006e -1, 36846, 36846, 512, 1024, 0x9bb37ca4 -1, 37375, 37375, 512, 1024, 0x9b085577 -1, 37882, 37882, 512, 1024, 0x8812f8af -1, 38389, 38389, 512, 1024, 0x788f5221 -1, 38896, 38896, 512, 1024, 0x3a2ce642 -0, 1777, 1777, 0, 6933, 0xc303f87f -1, 39403, 39403, 512, 1024, 0x72415692 -1, 39933, 39933, 512, 1024, 0xe3dcc105 -1, 40440, 40440, 512, 1024, 0xb26c0599 -1, 40947, 40947, 512, 1024, 0x5c9e55eb -1, 41454, 41454, 512, 1024, 0x8fe88707 -0, 1888, 1888, 0, 7034, 0xb4970a20 -1, 41983, 41983, 512, 1024, 0xc5d7beb6 -1, 42490, 42490, 512, 1024, 0xe1d3a3b4 -1, 42998, 42998, 512, 1024, 0x012da0c6 -1, 43505, 43505, 512, 1024, 0x8d010922 -1, 44012, 44012, 512, 1024, 0x3366eb0d -0, 1999, 1999, 0, 6961, 0xf064095d -1, 44541, 44541, 512, 1024, 0xc9381a27 -1, 45048, 45048, 512, 1024, 0x0774f685 -1, 45555, 45555, 512, 1024, 0xc5cae0a5 -1, 46062, 46062, 512, 1024, 0xa6f4737c -0, 2111, 2111, 0, 7089, 0x5ba350f9 -1, 46592, 46592, 512, 1024, 0x8fb6d0d1 -1, 47099, 47099, 512, 1024, 0x05f579c2 -1, 47606, 47606, 512, 1024, 0x56905d99 -1, 48113, 48113, 512, 1024, 0x002ee18d -1, 48620, 48620, 512, 1024, 0xeb37ef51 -0, 2222, 2222, 0, 7078, 0xa83f3e88 -1, 49149, 49149, 512, 1024, 0x38025635 -1, 49657, 49657, 512, 1024, 0x4fe643c8 -1, 50164, 50164, 512, 1024, 0x11d66ab1 -1, 50671, 50671, 512, 1024, 0xcc3051e9 -1, 51178, 51178, 512, 1024, 0xcd93e854 -0, 2333, 2333, 0, 7147, 0xcda66cfc -1, 51707, 51707, 512, 1024, 0x38f1196d -1, 52214, 52214, 512, 1024, 0x657a15fc -1, 52722, 52722, 512, 1024, 0x669ce2a9 -1, 53229, 53229, 512, 1024, 0x95862dda -1, 53758, 53758, 512, 1024, 0x1726a7b2 -0, 2444, 2444, 0, 7173, 0xb7455859 -1, 54265, 54265, 512, 1024, 0xd6ece2a1 -1, 54772, 54772, 512, 1024, 0x33ab9553 -1, 55279, 55279, 512, 1024, 0xd50c73a6 -1, 55787, 55787, 512, 1024, 0xfe25b63a -1, 56316, 56316, 512, 1024, 0x7e2959e3 -0, 2555, 2555, 0, 7213, 0x97b89994 -1, 56823, 56823, 512, 1024, 0xa4c07b34 -1, 57330, 57330, 512, 1024, 0xd6d8f15c -1, 57837, 57837, 512, 1024, 0x1eccddd7 -1, 58366, 58366, 512, 1024, 0x2b69f9cb -0, 2666, 2666, 0, 7170, 0xca8b2948 -1, 58874, 58874, 512, 1024, 0x667b775f -1, 59381, 59381, 512, 1024, 0xad3b84e9 -1, 59888, 59888, 512, 1024, 0x4f29fc67 -1, 60395, 60395, 512, 1024, 0x8d611ab7 -1, 60924, 60924, 512, 1024, 0x278966ea -0, 2777, 2777, 0, 7174, 0xc7cc6bbb -1, 61431, 61431, 512, 1024, 0xaf33812b -1, 61938, 61938, 512, 1024, 0xa55f4265 -1, 62446, 62446, 512, 1024, 0x023cb51c -1, 62975, 62975, 512, 1024, 0x1d1f1005 -1, 63482, 63482, 512, 1024, 0x874cccf7 -0, 2888, 2888, 0, 7235, 0xc2e68d2b -1, 63989, 63989, 512, 1024, 0xda705428 -1, 64496, 64496, 512, 1024, 0x48d9b440 -1, 65003, 65003, 512, 1024, 0xa14e0712 -1, 65533, 65533, 512, 1024, 0x7efbad1f -1, 66040, 66040, 512, 1024, 0xdb82c17f -0, 3000, 3000, 0, 7261, 0x8204a423 -1, 66547, 66547, 512, 1024, 0xcbe87613 -1, 67054, 67054, 512, 1024, 0x3a63df1d -1, 67583, 67583, 512, 1024, 0xd5636bba -1, 68090, 68090, 512, 1024, 0x9397af23 -0, 3111, 3111, 0, 7353, 0xacc7e7c0 -1, 68598, 68598, 512, 1024, 0x32a07c98 -1, 69105, 69105, 512, 1024, 0x202ca667 -1, 69612, 69612, 512, 1024, 0xdf969011 -1, 70141, 70141, 512, 1024, 0xc434d238 -1, 70648, 70648, 512, 1024, 0xe9ad7562 -0, 3222, 3222, 0, 7065, 0x45035c5c -1, 71155, 71155, 512, 1024, 0xb51b6b50 -1, 71663, 71663, 512, 1024, 0xe70aecd3 -1, 72192, 72192, 512, 1024, 0x03c816b2 -1, 72699, 72699, 512, 1024, 0x869fdf25 -1, 73206, 73206, 512, 1024, 0xd40a0a62 -0, 3333, 3333, 0, 7269, 0x72edbb76 -1, 73713, 73713, 512, 1024, 0x5af7dd35 -1, 74220, 74220, 512, 1024, 0x891ffc72 -1, 74750, 74750, 512, 1024, 0x1ff68a08 -1, 75257, 75257, 512, 1024, 0x5a7517a9 -1, 75764, 75764, 512, 1024, 0x0f959f74 -0, 3444, 3444, 0, 7220, 0xb926772f -1, 76271, 76271, 512, 1024, 0xe92a12a2 -1, 76778, 76778, 512, 1024, 0x38000e55 -1, 77307, 77307, 512, 1024, 0x39fbdd70 -1, 77814, 77814, 512, 1024, 0xca3d9184 -1, 78322, 78322, 512, 1024, 0x66c8995b -0, 3555, 3555, 0, 7326, 0x0a66c632 -1, 78829, 78829, 512, 1024, 0xac25acea -1, 79358, 79358, 512, 1024, 0x3cd1046c -1, 79865, 79865, 512, 1024, 0x6a1df31c -1, 80372, 80372, 512, 1024, 0x21ca10a1 -0, 3666, 3666, 0, 7225, 0xe39076ab -1, 80879, 80879, 512, 1024, 0x1aeccedc -1, 81387, 81387, 512, 1024, 0xddea1335 -1, 81916, 81916, 512, 1024, 0x19f5ca9f -1, 82423, 82423, 512, 1024, 0x88e95e43 -1, 82930, 82930, 512, 1024, 0x726284fe -0, 3777, 3777, 0, 7265, 0xe0209036 -1, 83437, 83437, 512, 1024, 0x6b85b40e -1, 83966, 83966, 512, 1024, 0x111fee2a -1, 84474, 84474, 512, 1024, 0x3656b588 -1, 84981, 84981, 512, 1024, 0xa5a2b552 -1, 85488, 85488, 512, 1024, 0x38fb2467 -0, 3888, 3888, 0, 7337, 0x7a5dc093 -1, 85995, 85995, 512, 1024, 0xaa919ccc -1, 86524, 86524, 512, 1024, 0x15993dbc -1, 87031, 87031, 512, 1024, 0xbe01a7b9 -1, 87539, 87539, 512, 1024, 0xefe93c09 -1, 88046, 88046, 512, 1024, 0x1bb566e5 -0, 4000, 4000, 0, 7246, 0x519a7a3c -1, 88575, 88575, 512, 1024, 0x15ce6237 -1, 89082, 89082, 512, 1024, 0xa8552e66 -1, 89589, 89589, 512, 1024, 0x9d80187e -1, 90096, 90096, 512, 1024, 0x5df3fc30 -1, 90603, 90603, 512, 1024, 0x1a312aa5 -0, 4111, 4111, 0, 7266, 0x352c8078 -1, 91133, 91133, 512, 1024, 0x6bb8e302 -1, 91640, 91640, 512, 1024, 0xbd9684bb -1, 92147, 92147, 512, 1024, 0x78b0b166 -1, 92654, 92654, 512, 1024, 0xd9af5eae -0, 4222, 4222, 0, 7323, 0xcaf69d7c -1, 93183, 93183, 512, 1024, 0xdb90fe82 -1, 93690, 93690, 512, 1024, 0x327614e9 -1, 94198, 94198, 512, 1024, 0x1f19b7fe -1, 94705, 94705, 512, 1024, 0x46c53f96 -1, 95212, 95212, 512, 1024, 0x921b2189 -0, 4333, 4333, 0, 7309, 0x98c1e6f7 -1, 95741, 95741, 512, 1024, 0xa8fbc85a -1, 96248, 96248, 512, 1024, 0xabfdaaae -1, 96755, 96755, 512, 1024, 0x6acc7387 -1, 97263, 97263, 512, 1024, 0x0d9c27b5 -1, 97792, 97792, 512, 1024, 0xba4dd809 -0, 4444, 4444, 0, 7121, 0x913d5bd6 -1, 98299, 98299, 512, 1024, 0x2a2ad521 -1, 98806, 98806, 512, 1024, 0x892de38a -1, 99313, 99313, 512, 1024, 0xdc97a2eb -1, 99820, 99820, 512, 1024, 0x4f614ca4 -1, 100350, 100350, 512, 1024, 0x9c8a77ea -0, 4555, 4555, 111, 7088, 0x56302362 -1, 100857, 100857, 512, 1024, 0x2d30e646 -1, 101364, 101364, 512, 1024, 0x74e800a7 -1, 101871, 101871, 512, 1024, 0x1e01fb02 -1, 102378, 102378, 512, 1024, 0x4ed2c1d8 -0, 4666, 4666, 111, 7104, 0xc0d14f78 -1, 102907, 102907, 512, 1024, 0xf2fdbe63 -1, 103415, 103415, 512, 1024, 0x8d6f63a1 -1, 103922, 103922, 512, 1024, 0xded468d9 -1, 104429, 104429, 512, 1024, 0xccad839e -1, 104958, 104958, 512, 1024, 0xdde7c082 -0, 4777, 4777, 111, 7169, 0xd03c825b -1, 105465, 105465, 512, 1024, 0x548613c5 -1, 105972, 105972, 512, 1024, 0x383909bd -1, 106479, 106479, 512, 1024, 0xfd37627b -1, 106987, 106987, 512, 1024, 0x6d95a481 -1, 107516, 107516, 512, 1024, 0x56aa87fa -0, 4888, 4888, 111, 7038, 0x1ecc201d -1, 108023, 108023, 512, 1024, 0x7b67258c -1, 108530, 108530, 512, 1024, 0x7dd99a92 -1, 109037, 109037, 512, 1024, 0x4a66d102 -1, 109566, 109566, 512, 1024, 0x7b3fce51 -1, 110074, 110074, 512, 1024, 0xbbd968aa -0, 5000, 5000, 111, 7015, 0x83c94454 -1, 110581, 110581, 512, 1024, 0x8283ec36 -1, 111088, 111088, 512, 1024, 0x3c96493d -1, 111595, 111595, 512, 1024, 0xfa4f8cf8 -1, 112124, 112124, 512, 1024, 0xe2cf872d -1, 112631, 112631, 512, 1024, 0x0a9e7aa6 -0, 5111, 5111, 111, 6983, 0x9e51f54d -1, 113139, 113139, 512, 1024, 0x6e7a0550 -1, 113646, 113646, 512, 1024, 0x3acfea2f -1, 114175, 114175, 512, 1024, 0x7111d0fa -1, 114682, 114682, 512, 1024, 0xe9a1eca9 -0, 5222, 5222, 111, 7088, 0x70d33de1 -1, 115189, 115189, 512, 1024, 0x24da6c46 -1, 115696, 115696, 512, 1024, 0x117cff37 -1, 116204, 116204, 512, 1024, 0x0f27cab6 -1, 116733, 116733, 512, 1024, 0x69b6b4e6 -1, 117240, 117240, 512, 1024, 0x1e6cc841 -0, 5333, 5333, 111, 7096, 0x4d0f81b5 -1, 117747, 117747, 512, 1024, 0xb01e2365 -1, 118254, 118254, 512, 1024, 0x14e200d3 -1, 118783, 118783, 512, 1024, 0xd1184c98 -1, 119291, 119291, 512, 1024, 0xef9140e9 -1, 119798, 119798, 512, 1024, 0x4cbb645e -0, 5444, 5444, 111, 7106, 0xd1a83ddc -1, 120305, 120305, 512, 1024, 0xe7fe2f06 -1, 120812, 120812, 512, 1024, 0xf8c45028 -1, 121341, 121341, 512, 1024, 0x561358f4 -1, 121848, 121848, 512, 1024, 0xd0129b77 -1, 122355, 122355, 512, 1024, 0xcc636e88 -0, 5555, 5555, 111, 7219, 0x20f47fe4 -1, 122863, 122863, 512, 1024, 0xe9406321 -1, 123392, 123392, 512, 1024, 0x9f16a041 -1, 123899, 123899, 512, 1024, 0x468bf409 -1, 124406, 124406, 512, 1024, 0x3df70f7b -1, 124913, 124913, 512, 1024, 0xa880b11b -0, 5666, 5666, 111, 7184, 0x45dc6a0e -1, 125420, 125420, 512, 1024, 0x3286c489 -1, 125950, 125950, 512, 1024, 0x39fe9ebc -1, 126457, 126457, 512, 1024, 0xc533d83b -1, 126964, 126964, 512, 1024, 0x153b195d -0, 5777, 5777, 111, 7222, 0x488c6499 -1, 127471, 127471, 512, 1024, 0xd84786a1 -1, 127978, 127978, 512, 1024, 0xdc295aaa -1, 128507, 128507, 512, 1024, 0xfb764d8c -1, 129015, 129015, 512, 1024, 0xeebc9db9 -1, 129522, 129522, 512, 1024, 0x7ba9403e -0, 5888, 5888, 111, 7254, 0xbd097ba7 -1, 130029, 130029, 512, 1024, 0x4e5571ec -1, 130558, 130558, 512, 1024, 0xd965fad4 -1, 131065, 131065, 512, 1024, 0x87e259f2 -1, 131572, 131572, 512, 1024, 0xae7e533b -1, 132080, 132080, 512, 1024, 0x313cf4d6 -0, 6000, 6000, 111, 7189, 0x46e06d43 -1, 132587, 132587, 512, 1024, 0xe1844c90 -1, 133116, 133116, 512, 1024, 0xbb057b44 -1, 133623, 133623, 512, 1024, 0xa5099687 -1, 134130, 134130, 512, 1024, 0xbff10707 -1, 134637, 134637, 512, 1024, 0x37c4ffc0 -0, 6111, 6111, 111, 7283, 0x19dd7319 -1, 135167, 135167, 512, 1024, 0xf9fb6caa -1, 135674, 135674, 512, 1024, 0x3b6a3a1f -1, 136181, 136181, 512, 1024, 0x83431edb -1, 136688, 136688, 512, 1024, 0x1eb713cf -1, 137195, 137195, 512, 1024, 0xd7b07a6d -0, 6222, 6222, 111, 7161, 0x23171d02 -1, 137724, 137724, 512, 1024, 0x81ae3391 -1, 138231, 138231, 512, 1024, 0xf150130a -1, 138739, 138739, 512, 1024, 0x09678eaa -1, 139246, 139246, 512, 1024, 0xb94e06f1 -0, 6333, 6333, 111, 6976, 0xcc610c26 -1, 139775, 139775, 512, 1024, 0x67b1dbc9 -1, 140282, 140282, 512, 1024, 0xd6edc235 -1, 140789, 140789, 512, 1024, 0x34e4c499 -1, 141296, 141296, 512, 1024, 0xeefd89c0 -1, 141804, 141804, 512, 1024, 0x38afdaf1 -0, 6444, 6444, 111, 7056, 0x6cd917b0 -1, 142333, 142333, 512, 1024, 0x29a60d76 -1, 142840, 142840, 512, 1024, 0xe28a4372 -1, 143347, 143347, 512, 1024, 0x7089454d -1, 143854, 143854, 512, 1024, 0x0c01bb7b -1, 144383, 144383, 512, 1024, 0xbd776a72 -0, 6555, 6555, 111, 6736, 0x02b78951 -1, 144891, 144891, 512, 1024, 0x86776fd0 -1, 145398, 145398, 512, 1024, 0xb37c88f7 -1, 145905, 145905, 512, 1024, 0x5f90aaf8 -1, 146412, 146412, 512, 1024, 0x203d4222 -1, 146941, 146941, 512, 1024, 0x382692a6 -0, 6666, 6666, 111, 6540, 0x767e0854 -1, 147448, 147448, 512, 1024, 0xf37c95fd -1, 147956, 147956, 512, 1024, 0x6c0b8877 -1, 148463, 148463, 512, 1024, 0x2e54a8b6 -1, 148992, 148992, 512, 1024, 0x7f266488 -0, 6777, 6777, 111, 6170, 0xc84962fb -1, 149499, 149499, 512, 1024, 0xfbf20f9a -1, 150006, 150006, 512, 1024, 0xf2985cc0 -1, 150513, 150513, 512, 1024, 0xc7075340 -1, 151020, 151020, 512, 1024, 0xe4585695 -1, 151550, 151550, 512, 1024, 0xbdffa380 -0, 6888, 6888, 111, 6169, 0x27e06c03 -1, 152057, 152057, 512, 1024, 0x2422a8a9 -1, 152564, 152564, 512, 1024, 0x59cbd75f -1, 153071, 153071, 512, 1024, 0x04ad1a8c -1, 153578, 153578, 512, 1024, 0x33c09191 -1, 154107, 154107, 512, 1024, 0x55efa6fd -0, 7000, 7000, 111, 5864, 0xd14db83f -1, 154615, 154615, 512, 1024, 0xf73d0e5d -1, 155122, 155122, 512, 1024, 0x6141ebae -1, 155629, 155629, 512, 1024, 0x7db17a68 -1, 156158, 156158, 512, 1024, 0xa6c690b6 -1, 156665, 156665, 512, 1024, 0xa6fd6725 -0, 7111, 7111, 111, 5375, 0x4a21055d -1, 157172, 157172, 512, 1024, 0x50a90b9b -1, 157680, 157680, 512, 1024, 0xef990dc8 -1, 158187, 158187, 512, 1024, 0x75adf6b5 -1, 158716, 158716, 512, 1024, 0x61eac43e -1, 159223, 159223, 512, 1024, 0x67797a19 -0, 7222, 7222, 111, 5206, 0x95ead3cb -1, 159730, 159730, 512, 1024, 0xf325277a -1, 160237, 160237, 512, 1024, 0x18bf254a -1, 160767, 160767, 512, 1024, 0x2ce6bee3 -1, 161274, 161274, 512, 1024, 0x8d320860 -0, 7333, 7333, 111, 5220, 0xcfdcc37e -1, 161781, 161781, 512, 1024, 0xc979b6e8 -1, 162288, 162288, 512, 1024, 0xdb644b41 -1, 162795, 162795, 512, 1024, 0xe1b368ba -1, 163324, 163324, 512, 1024, 0xacc53d15 -1, 163832, 163832, 512, 1024, 0x42ea8c18 -0, 7444, 7444, 111, 4946, 0x2d864a77 -1, 164339, 164339, 512, 1024, 0xe52c99a4 -1, 164846, 164846, 512, 1024, 0xd7db54a6 -1, 165375, 165375, 512, 1024, 0x7f27a7e3 -1, 165882, 165882, 512, 1024, 0xf7ffeaa9 -1, 166389, 166389, 512, 1024, 0x792b6088 -0, 7555, 7555, 111, 4390, 0x2ab9f462 -1, 166896, 166896, 512, 1024, 0x61d99724 -1, 167404, 167404, 512, 1024, 0x5213720e -1, 167933, 167933, 512, 1024, 0xac09dd30 -1, 168440, 168440, 512, 1024, 0x960bf6bb -1, 168947, 168947, 512, 1024, 0xc90168e1 -0, 7666, 7666, 111, 4051, 0x1d09592e -1, 169454, 169454, 512, 1024, 0x43b45768 -1, 169983, 169983, 512, 1024, 0x935d60a1 -1, 170491, 170491, 512, 1024, 0x9a342ef2 -1, 170998, 170998, 512, 1024, 0xc894709f -0, 7777, 7777, 111, 3680, 0x39bd6a12 -1, 171505, 171505, 512, 1024, 0x59b43b07 -1, 172012, 172012, 512, 1024, 0x36a1a98d -1, 172541, 172541, 512, 1024, 0x9e1a121c -1, 173048, 173048, 512, 1024, 0x02208b78 -1, 173556, 173556, 512, 1024, 0xd1d7b274 -0, 7888, 7888, 111, 2910, 0x6337ece9 -1, 174063, 174063, 512, 1024, 0xdacd5096 -1, 174592, 174592, 512, 1024, 0x51b71ead -1, 175099, 175099, 512, 1024, 0xd009a7ca -1, 175606, 175606, 512, 1024, 0xb6d5a938 -1, 176113, 176113, 512, 1024, 0xf3d45e47 -0, 8000, 8000, 111, 2153, 0xf4e3bc17 -1, 176621, 176621, 512, 1024, 0xea8e04fc -1, 177150, 177150, 512, 1024, 0x0b928bd8 -1, 177657, 177657, 512, 1024, 0x0f02caec -1, 178164, 178164, 512, 1024, 0xe2b137a8 -1, 178671, 178671, 512, 1024, 0xd5f94892 diff --git a/tests/ref/fate/smjpeg-demux b/tests/ref/fate/smjpeg-demux new file mode 100644 index 0000000000..637f28c663 --- /dev/null +++ b/tests/ref/fate/smjpeg-demux @@ -0,0 +1,425 @@ +#tb 0: 1/1000 +#tb 1: 1/1000 +0, 0, 0, 0, 734, 0x5a042c2c +1, 0, 0, 23, 260, 0x00000000 +1, 23, 23, 23, 260, 0x00000000 +1, 46, 46, 23, 260, 0xac9e0a9b +1, 69, 69, 23, 260, 0x89256f5b +1, 92, 92, 23, 260, 0x8e646e36 +0, 111, 111, 0, 763, 0xb5893f2f +1, 116, 116, 23, 260, 0x3ab972fc +1, 139, 139, 23, 260, 0xaea86bb2 +1, 162, 162, 23, 260, 0x2366447a +1, 185, 185, 23, 260, 0x82c14f9c +1, 208, 208, 23, 260, 0xcdcf6fa8 +0, 222, 222, 0, 3023, 0x0f3907d3 +1, 232, 232, 23, 260, 0xb3ed64bd +1, 255, 255, 23, 260, 0xac304b92 +1, 278, 278, 23, 260, 0xc8bc553b +1, 301, 301, 23, 260, 0xd35572b4 +1, 325, 325, 23, 260, 0x182f6190 +0, 333, 333, 0, 4800, 0x22e6e18a +1, 348, 348, 23, 260, 0xbf9145c0 +1, 371, 371, 23, 260, 0x0ec85a7e +1, 394, 394, 23, 260, 0x3684720e +1, 417, 417, 23, 260, 0xe985616a +1, 441, 441, 23, 260, 0x12b147dc +0, 444, 444, 0, 6417, 0x427adde5 +1, 464, 464, 23, 260, 0xb8b55dd9 +1, 487, 487, 23, 260, 0xfd4a7007 +1, 510, 510, 23, 260, 0xfcc05c9a +1, 534, 534, 23, 260, 0x20f74aea +0, 555, 555, 0, 6776, 0x7a74c6ad +1, 557, 557, 23, 260, 0x025359ca +1, 580, 580, 23, 260, 0xace44ba1 +1, 603, 603, 23, 260, 0x03506929 +1, 626, 626, 23, 260, 0x8a926f17 +1, 650, 650, 23, 260, 0x4a7061e7 +0, 666, 666, 0, 6808, 0x1f6eb7c3 +1, 673, 673, 23, 260, 0xf8b66cc9 +1, 696, 696, 23, 260, 0xe8c96dec +1, 719, 719, 23, 260, 0x672a54a6 +1, 743, 743, 23, 260, 0xe97b5698 +1, 766, 766, 23, 260, 0x377f684d +0, 777, 777, 0, 6726, 0x452087e6 +1, 789, 789, 23, 260, 0xe9a66786 +1, 812, 812, 23, 260, 0xf8e17080 +1, 835, 835, 23, 260, 0x65eb662a +1, 859, 859, 23, 260, 0xd8d361e9 +1, 882, 882, 23, 260, 0xb8115a0b +0, 888, 888, 0, 6829, 0xee82b109 +1, 905, 905, 23, 260, 0xa5a85461 +1, 928, 928, 23, 260, 0xf401663b +1, 952, 952, 23, 260, 0x042f714e +1, 975, 975, 23, 260, 0xdf195820 +1, 998, 998, 23, 260, 0x0a67653c +0, 999, 999, 0, 7055, 0xf41f1108 +1, 1021, 1021, 23, 260, 0xe9b44d02 +1, 1044, 1044, 23, 260, 0xbd4747b9 +1, 1068, 1068, 23, 260, 0x3ef66738 +1, 1091, 1091, 23, 260, 0x0f4a6e44 +0, 1111, 1111, 0, 6977, 0xf8fe1ede +1, 1114, 1114, 23, 260, 0xaa3d6eb6 +1, 1137, 1137, 23, 260, 0xb9a46c4a +1, 1160, 1160, 23, 260, 0x4f974c2e +1, 1184, 1184, 23, 260, 0x9e714a00 +1, 1207, 1207, 23, 260, 0x601a7152 +0, 1222, 1222, 0, 6942, 0x9ad105c6 +1, 1230, 1230, 23, 260, 0xaf317064 +1, 1253, 1253, 23, 260, 0x163d4829 +1, 1277, 1277, 23, 260, 0xc56b4f1a +1, 1300, 1300, 23, 260, 0x7623729c +1, 1323, 1323, 23, 260, 0xa514694f +0, 1333, 1333, 0, 6926, 0xe239dad6 +1, 1346, 1346, 23, 260, 0x93ee4ad8 +1, 1369, 1369, 23, 260, 0x6d8e573f +1, 1393, 1393, 23, 260, 0x13256d68 +1, 1416, 1416, 23, 260, 0x187761a2 +1, 1439, 1439, 23, 260, 0x426045e7 +0, 1444, 1444, 0, 6966, 0x81dcfab1 +1, 1462, 1462, 23, 260, 0x7e7e5891 +1, 1486, 1486, 23, 260, 0xd6926dcc +1, 1509, 1509, 23, 260, 0xf0196061 +1, 1532, 1532, 23, 260, 0x7cac49a3 +0, 1555, 1555, 0, 6896, 0x31e6cc02 +1, 1555, 1555, 23, 260, 0x24f4549a +1, 1578, 1578, 23, 260, 0x937f551d +1, 1602, 1602, 23, 260, 0x9bf462c5 +1, 1625, 1625, 23, 260, 0xd1e07436 +1, 1648, 1648, 23, 260, 0xdab36215 +0, 1666, 1666, 0, 6889, 0x1cc1006e +1, 1671, 1671, 23, 260, 0xabc5662b +1, 1695, 1695, 23, 260, 0xa24f6bf1 +1, 1718, 1718, 23, 260, 0x39e664b2 +1, 1741, 1741, 23, 260, 0xf5dc54ca +1, 1764, 1764, 23, 260, 0xc3b16974 +0, 1777, 1777, 0, 6933, 0xc303f87f +1, 1787, 1787, 23, 260, 0x6cf46bca +1, 1811, 1811, 23, 260, 0x7a6b69b9 +1, 1834, 1834, 23, 260, 0xc02f69b9 +1, 1857, 1857, 23, 260, 0x7fc764a9 +1, 1880, 1880, 23, 260, 0xd9705b09 +0, 1888, 1888, 0, 7034, 0xb4970a20 +1, 1904, 1904, 23, 260, 0x17b05f49 +1, 1927, 1927, 23, 260, 0x10ad647c +1, 1950, 1950, 23, 260, 0xf9636d69 +1, 1973, 1973, 23, 260, 0x622b5ad9 +1, 1996, 1996, 23, 260, 0x175b646d +0, 1999, 1999, 0, 6961, 0xf064095d +1, 2020, 2020, 23, 260, 0x722b5827 +1, 2043, 2043, 23, 260, 0x83614974 +1, 2066, 2066, 23, 260, 0x80366587 +1, 2089, 2089, 23, 260, 0x050f6bf9 +0, 2111, 2111, 0, 7089, 0x5ba350f9 +1, 2113, 2113, 23, 260, 0x949d6735 +1, 2136, 2136, 23, 260, 0x62cd7184 +1, 2159, 2159, 23, 260, 0x21e45713 +1, 2182, 2182, 23, 260, 0x56314509 +1, 2205, 2205, 23, 260, 0x7a1570d3 +0, 2222, 2222, 0, 7078, 0xa83f3e88 +1, 2229, 2229, 23, 260, 0x205a6ffb +1, 2252, 2252, 23, 260, 0xead94483 +1, 2275, 2275, 23, 260, 0x93c84f10 +1, 2298, 2298, 23, 260, 0xdf45726f +1, 2321, 2321, 23, 260, 0x35016f1e +0, 2333, 2333, 0, 7147, 0xcda66cfc +1, 2345, 2345, 23, 260, 0xa8114bcd +1, 2368, 2368, 23, 260, 0x14c45130 +1, 2391, 2391, 23, 260, 0x97b07052 +1, 2414, 2414, 23, 260, 0x039b6c77 +1, 2438, 2438, 23, 260, 0x46f74635 +0, 2444, 2444, 0, 7173, 0xb7455859 +1, 2461, 2461, 23, 260, 0x4116540d +1, 2484, 2484, 23, 260, 0x26747067 +1, 2507, 2507, 23, 260, 0x37f16485 +1, 2530, 2530, 23, 260, 0x631d4a33 +1, 2554, 2554, 23, 260, 0x14ed598d +0, 2555, 2555, 0, 7213, 0x97b89994 +1, 2577, 2577, 23, 260, 0x3f9349e7 +1, 2600, 2600, 23, 260, 0x91295757 +1, 2623, 2623, 23, 260, 0x95de72bc +1, 2647, 2647, 23, 260, 0xc7ee5ddb +0, 2666, 2666, 0, 7170, 0xca8b2948 +1, 2670, 2670, 23, 260, 0x38e965cd +1, 2693, 2693, 23, 260, 0xfae169e9 +1, 2716, 2716, 23, 260, 0x9c226143 +1, 2739, 2739, 23, 260, 0x1a804dbe +1, 2763, 2763, 23, 260, 0x4aeb633c +0, 2777, 2777, 0, 7174, 0xc7cc6bbb +1, 2786, 2786, 23, 260, 0xa66e6bbb +1, 2809, 2809, 23, 260, 0x51d17109 +1, 2832, 2832, 23, 260, 0x2bc86b9b +1, 2856, 2856, 23, 260, 0xe56e6378 +1, 2879, 2879, 23, 260, 0x95665b47 +0, 2888, 2888, 0, 7235, 0xc2e68d2b +1, 2902, 2902, 23, 260, 0x1c255fdb +1, 2925, 2925, 23, 260, 0x3a2456cb +1, 2948, 2948, 23, 260, 0xe18e7270 +1, 2972, 2972, 23, 260, 0x55b65c60 +1, 2995, 2995, 23, 260, 0x62be6515 +0, 3000, 3000, 0, 7261, 0x8204a423 +1, 3018, 3018, 23, 260, 0xdba25d09 +1, 3041, 3041, 23, 260, 0xd7cc4e40 +1, 3065, 3065, 23, 260, 0x335661be +1, 3088, 3088, 23, 260, 0xc3286de3 +0, 3111, 3111, 0, 7353, 0xacc7e7c0 +1, 3111, 3111, 23, 260, 0x47e76e35 +1, 3134, 3134, 23, 260, 0x4b716f77 +1, 3157, 3157, 23, 260, 0x0716519e +1, 3181, 3181, 23, 260, 0x032b4490 +1, 3204, 3204, 23, 260, 0x15f067e8 +0, 3222, 3222, 0, 7065, 0x45035c5c +1, 3227, 3227, 23, 260, 0x16766ffa +1, 3250, 3250, 23, 260, 0xc94154ac +1, 3274, 3274, 23, 260, 0x74764bcd +1, 3297, 3297, 23, 260, 0x3fad6f8f +1, 3320, 3320, 23, 260, 0x5fa972a9 +0, 3333, 3333, 0, 7269, 0x72edbb76 +1, 3343, 3343, 23, 260, 0xde2a4b7b +1, 3366, 3366, 23, 260, 0xd8494408 +1, 3390, 3390, 23, 260, 0x843d71a6 +1, 3413, 3413, 23, 260, 0x87fd6b60 +1, 3436, 3436, 23, 260, 0x1cc04a39 +0, 3444, 3444, 0, 7220, 0xb926772f +1, 3459, 3459, 23, 260, 0x9ca24d94 +1, 3482, 3482, 23, 260, 0x820a7087 +1, 3506, 3506, 23, 260, 0x631166b2 +1, 3529, 3529, 23, 260, 0x2f20492a +1, 3552, 3552, 23, 260, 0x932156d0 +0, 3555, 3555, 0, 7326, 0x0a66c632 +1, 3575, 3575, 23, 260, 0xdad54c90 +1, 3599, 3599, 23, 260, 0xcce84fc9 +1, 3622, 3622, 23, 260, 0xba317486 +1, 3645, 3645, 23, 260, 0xf5a4626a +0, 3666, 3666, 0, 7225, 0xe39076ab +1, 3668, 3668, 23, 260, 0x324669fd +1, 3691, 3691, 23, 260, 0xc7d37113 +1, 3715, 3715, 23, 260, 0xc6e0644f +1, 3738, 3738, 23, 260, 0x1b91522e +1, 3761, 3761, 23, 260, 0x9b84667d +0, 3777, 3777, 0, 7265, 0xe0209036 +1, 3784, 3784, 23, 260, 0xed7e66eb +1, 3808, 3808, 23, 260, 0xaf806d1f +1, 3831, 3831, 23, 260, 0x13a66941 +1, 3854, 3854, 23, 260, 0x13095a41 +1, 3877, 3877, 23, 260, 0x5ba05491 +0, 3888, 3888, 0, 7337, 0x7a5dc093 +1, 3900, 3900, 23, 260, 0xbf785887 +1, 3924, 3924, 23, 260, 0x21965973 +1, 3947, 3947, 23, 260, 0xd9aa7134 +1, 3970, 3970, 23, 260, 0x3add62bc +1, 3993, 3993, 23, 260, 0xb9626260 +0, 4000, 4000, 0, 7246, 0x519a7a3c +1, 4017, 4017, 23, 260, 0x5b08629f +1, 4040, 4040, 23, 260, 0x43a34659 +1, 4063, 4063, 23, 260, 0x68575bda +1, 4086, 4086, 23, 260, 0xd98b715a +1, 4109, 4109, 23, 260, 0x7d816a77 +0, 4111, 4111, 0, 7266, 0x352c8078 +1, 4133, 4133, 23, 260, 0x16af6ff1 +1, 4156, 4156, 23, 260, 0x6d4557a7 +1, 4179, 4179, 23, 260, 0x0743401a +1, 4202, 4202, 23, 260, 0x410563d8 +0, 4222, 4222, 0, 7323, 0xcaf69d7c +1, 4226, 4226, 23, 260, 0x561371d1 +1, 4249, 4249, 23, 260, 0x3ef15872 +1, 4272, 4272, 23, 260, 0x1dd04972 +1, 4295, 4295, 23, 260, 0xed226c62 +1, 4318, 4318, 23, 260, 0x20857046 +0, 4333, 4333, 0, 7309, 0x98c1e6f7 +1, 4342, 4342, 23, 260, 0xed7f4724 +1, 4365, 4365, 23, 260, 0x7a7445cf +1, 4388, 4388, 23, 260, 0x06ad6a93 +1, 4411, 4411, 23, 260, 0xdd1b6c91 +1, 4435, 4435, 23, 260, 0x05b94d27 +0, 4444, 4444, 0, 7121, 0x913d5bd6 +1, 4458, 4458, 23, 260, 0x12cc5062 +1, 4481, 4481, 23, 260, 0x44526d0f +1, 4504, 4504, 23, 260, 0xf2ac6d95 +1, 4527, 4527, 23, 260, 0x27174b0f +1, 4551, 4551, 23, 260, 0xcf125efe +0, 4555, 4555, 111, 7088, 0x56302362 +1, 4574, 4574, 23, 260, 0xb8ce45a1 +1, 4597, 4597, 23, 260, 0x91895627 +1, 4620, 4620, 23, 260, 0x6edb706a +1, 4643, 4643, 23, 260, 0x4e16674b +0, 4666, 4666, 111, 7104, 0xc0d14f78 +1, 4667, 4667, 23, 260, 0xa9d66370 +1, 4690, 4690, 23, 260, 0x8f007043 +1, 4713, 4713, 23, 260, 0xdc1a5583 +1, 4736, 4736, 23, 260, 0x2f025511 +1, 4760, 4760, 23, 260, 0x2a4d6ddb +0, 4777, 4777, 111, 7169, 0xd03c825b +1, 4783, 4783, 23, 260, 0x54806f14 +1, 4806, 4806, 23, 260, 0xe0ac6d80 +1, 4829, 4829, 23, 260, 0xd9cf6c97 +1, 4852, 4852, 23, 260, 0xba705b6d +1, 4876, 4876, 23, 260, 0x0be158e0 +0, 4888, 4888, 111, 7038, 0x1ecc201d +1, 4899, 4899, 23, 260, 0x32b3645d +1, 4922, 4922, 23, 260, 0x4a0a55b4 +1, 4945, 4945, 23, 260, 0x078b6fd8 +1, 4969, 4969, 23, 260, 0xc2816368 +1, 4992, 4992, 23, 260, 0xbdee5e4d +0, 5000, 5000, 111, 7015, 0x83c94454 +1, 5015, 5015, 23, 260, 0x475366aa +1, 5038, 5038, 23, 260, 0x2f9a44b9 +1, 5061, 5061, 23, 260, 0x91745ee5 +1, 5085, 5085, 23, 260, 0xc29b6e16 +1, 5108, 5108, 23, 260, 0x6ebb6b0e +0, 5111, 5111, 111, 6983, 0x9e51f54d +1, 5131, 5131, 23, 260, 0x4e7d7043 +1, 5154, 5154, 23, 260, 0x10b45caf +1, 5178, 5178, 23, 260, 0x1b1e4e54 +1, 5201, 5201, 23, 260, 0xcc7b6443 +0, 5222, 5222, 111, 7088, 0x70d33de1 +1, 5224, 5224, 23, 260, 0x29936fdd +1, 5247, 5247, 23, 260, 0x395256e3 +1, 5270, 5270, 23, 260, 0x50fb459f +1, 5294, 5294, 23, 260, 0x0bef64ec +1, 5317, 5317, 23, 260, 0xadd372dd +0, 5333, 5333, 111, 7096, 0x4d0f81b5 +1, 5340, 5340, 23, 260, 0xc49e56dc +1, 5363, 5363, 23, 260, 0x44e749c1 +1, 5387, 5387, 23, 260, 0x030e6c8a +1, 5410, 5410, 23, 260, 0x82a47261 +1, 5433, 5433, 23, 260, 0xa3764fcc +0, 5444, 5444, 111, 7106, 0xd1a83ddc +1, 5456, 5456, 23, 260, 0xb1a1498a +1, 5479, 5479, 23, 260, 0xbf9c7184 +1, 5503, 5503, 23, 260, 0xa45f6da8 +1, 5526, 5526, 23, 260, 0x9a2e4d51 +1, 5549, 5549, 23, 260, 0xa15c56ed +0, 5555, 5555, 111, 7219, 0x20f47fe4 +1, 5572, 5572, 23, 260, 0x7029496c +1, 5596, 5596, 23, 260, 0xf3595213 +1, 5619, 5619, 23, 260, 0x0dab6c5a +1, 5642, 5642, 23, 260, 0x0e2367da +1, 5665, 5665, 23, 260, 0xbb56610a +0, 5666, 5666, 111, 7184, 0x45dc6a0e +1, 5688, 5688, 23, 260, 0xcc916c92 +1, 5712, 5712, 23, 260, 0x886c5ba9 +1, 5735, 5735, 23, 260, 0x1b255a69 +1, 5758, 5758, 23, 260, 0xb7a66792 +0, 5777, 5777, 111, 7222, 0x488c6499 +1, 5781, 5781, 23, 260, 0x7d946b0e +1, 5804, 5804, 23, 260, 0x07d16714 +1, 5828, 5828, 23, 260, 0x77ef6755 +1, 5851, 5851, 23, 260, 0xb2fe6849 +1, 5874, 5874, 23, 260, 0x601b5325 +0, 5888, 5888, 111, 7254, 0xbd097ba7 +1, 5897, 5897, 23, 260, 0x309c68d0 +1, 5921, 5921, 23, 260, 0x7bbe5d49 +1, 5944, 5944, 23, 260, 0x77bc6e47 +1, 5967, 5967, 23, 260, 0x3e0a6b0b +1, 5990, 5990, 23, 260, 0x2ae458c4 +0, 6000, 6000, 111, 7189, 0x46e06d43 +1, 6013, 6013, 23, 260, 0x17576d4f +1, 6037, 6037, 23, 260, 0x496c4bbd +1, 6060, 6060, 23, 260, 0x972758a0 +1, 6083, 6083, 23, 260, 0xa9897452 +1, 6106, 6106, 23, 260, 0xf58c6b92 +0, 6111, 6111, 111, 7283, 0x19dd7319 +1, 6130, 6130, 23, 260, 0x8368709a +1, 6153, 6153, 23, 260, 0x3890643f +1, 6176, 6176, 23, 260, 0xdcc1472c +1, 6199, 6199, 23, 260, 0xb601605c +0, 6222, 6222, 111, 7161, 0x23171d02 +1, 6222, 6222, 23, 260, 0xfafd6e13 +1, 6246, 6246, 23, 260, 0x20a55dbf +1, 6269, 6269, 23, 260, 0x84a147e6 +1, 6292, 6292, 23, 260, 0xe2c75bfd +1, 6315, 6315, 23, 260, 0x52f672c4 +0, 6333, 6333, 111, 6976, 0xcc610c26 +1, 6339, 6339, 23, 260, 0x98af579a +1, 6362, 6362, 23, 260, 0xf2034f37 +1, 6385, 6385, 23, 260, 0x75576856 +1, 6408, 6408, 23, 260, 0x4a796f1b +1, 6431, 6431, 23, 260, 0x3a7a5612 +0, 6444, 6444, 111, 7056, 0x6cd917b0 +1, 6455, 6455, 23, 260, 0x1c0646bd +1, 6478, 6478, 23, 260, 0xfccd6e2c +1, 6501, 6501, 23, 260, 0x2bdd7139 +1, 6524, 6524, 23, 260, 0xadb4519a +1, 6548, 6548, 23, 260, 0x8ef655b5 +0, 6555, 6555, 111, 6736, 0x02b78951 +1, 6571, 6571, 23, 260, 0x157852f6 +1, 6594, 6594, 23, 260, 0xec3a4aa8 +1, 6617, 6617, 23, 260, 0x5fa77041 +1, 6640, 6640, 23, 260, 0xe862690f +1, 6664, 6664, 23, 260, 0xad1759ce +0, 6666, 6666, 111, 6540, 0x767e0854 +1, 6687, 6687, 23, 260, 0x856f6d2e +1, 6710, 6710, 23, 260, 0x19496938 +1, 6733, 6733, 23, 260, 0xf3135c06 +1, 6757, 6757, 23, 260, 0xbec861ab +0, 6777, 6777, 111, 6170, 0xc84962fb +1, 6780, 6780, 23, 260, 0x97486f09 +1, 6803, 6803, 23, 260, 0x2dcb64ed +1, 6826, 6826, 23, 260, 0xac196fe8 +1, 6849, 6849, 23, 260, 0xa7d460f8 +1, 6873, 6873, 23, 260, 0x02e55631 +0, 6888, 6888, 111, 6169, 0x27e06c03 +1, 6896, 6896, 23, 260, 0x92556737 +1, 6919, 6919, 23, 260, 0x9ab25599 +1, 6942, 6942, 23, 260, 0x48017498 +1, 6965, 6965, 23, 260, 0x3f376d65 +1, 6989, 6989, 23, 260, 0x553750e2 +0, 7000, 7000, 111, 5864, 0xd14db83f +1, 7012, 7012, 23, 260, 0x430a6cb9 +1, 7035, 7035, 23, 260, 0x0d4f3b7e +1, 7058, 7058, 23, 260, 0xc5ee5733 +1, 7082, 7082, 23, 260, 0xec33744f +1, 7105, 7105, 23, 260, 0xb7ca6c50 +0, 7111, 7111, 111, 5375, 0x4a21055d +1, 7128, 7128, 23, 260, 0xca8e6e09 +1, 7151, 7151, 23, 260, 0xde7b67d9 +1, 7174, 7174, 23, 260, 0x1eeb47c6 +1, 7198, 7198, 23, 260, 0x97e355f6 +1, 7221, 7221, 23, 260, 0x4cb871da +0, 7222, 7222, 111, 5206, 0x95ead3cb +1, 7244, 7244, 23, 260, 0xf9d65f42 +1, 7267, 7267, 23, 260, 0x4df447f9 +1, 7291, 7291, 23, 260, 0x6da55c39 +1, 7314, 7314, 23, 260, 0xf8487192 +0, 7333, 7333, 111, 5220, 0xcfdcc37e +1, 7337, 7337, 23, 260, 0xa5ef5e84 +1, 7360, 7360, 23, 260, 0xc750404d +1, 7383, 7383, 23, 260, 0xe62d5ba7 +1, 7407, 7407, 23, 260, 0xa362739c +1, 7430, 7430, 23, 260, 0x784c57f9 +0, 7444, 7444, 111, 4946, 0x2d864a77 +1, 7453, 7453, 23, 260, 0xac224b6f +1, 7476, 7476, 23, 260, 0x34506907 +1, 7500, 7500, 23, 260, 0x94207121 +1, 7523, 7523, 23, 260, 0x018754e6 +1, 7546, 7546, 23, 260, 0xa5355133 +0, 7555, 7555, 111, 4390, 0x2ab9f462 +1, 7569, 7569, 23, 260, 0x93724dac +1, 7592, 7592, 23, 260, 0x41e24c4c +1, 7616, 7616, 23, 260, 0x1b2a7301 +1, 7639, 7639, 23, 260, 0xcce36e61 +1, 7662, 7662, 23, 260, 0xb323585a +0, 7666, 7666, 111, 4051, 0x1d09592e +1, 7685, 7685, 23, 260, 0x6f7c624d +1, 7709, 7709, 23, 260, 0x87b96a4a +1, 7732, 7732, 23, 260, 0xf567622a +1, 7755, 7755, 23, 260, 0x52ce5d35 +0, 7777, 7777, 111, 3680, 0x39bd6a12 +1, 7778, 7778, 23, 260, 0x58a46c28 +1, 7801, 7801, 23, 260, 0x8e3e6d9a +1, 7825, 7825, 23, 260, 0x5ef66906 +1, 7848, 7848, 23, 260, 0x351b5f9f +1, 7871, 7871, 23, 260, 0x90b9588a +0, 7888, 7888, 111, 2910, 0x6337ece9 +1, 7894, 7894, 23, 260, 0x34e8615f +1, 7918, 7918, 23, 260, 0xcef75ab9 +1, 7941, 7941, 23, 260, 0x471f6bc8 +1, 7964, 7964, 23, 260, 0xd4756c62 +1, 7987, 7987, 23, 260, 0x7c554702 +0, 8000, 8000, 111, 2153, 0xf4e3bc17 +1, 8010, 8010, 23, 260, 0x185272f1 +1, 8034, 8034, 23, 260, 0x0c364348 +1, 8057, 8057, 23, 260, 0x24354467 +1, 8080, 8080, 23, 260, 0x837d5472 +1, 8103, 8103, 23, 260, 0xece2344f -- cgit v1.2.3 From 0ff0af731ce4544f84b2f748dcc699717a2df8d6 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 15 May 2012 11:52:28 +0100 Subject: fate: use diff -b in oneline comparison This is simpler and should take care of any problems with mixed line ending styles. Signed-off-by: Mans Rullgard --- tests/fate-run.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/fate-run.sh b/tests/fate-run.sh index a45e9a95b3..636fc2d599 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -61,9 +61,7 @@ stddev(){ } oneline(){ - val=$(cat "$2") - test x"$val" = x"$1" || { r=$?; printf -- '-%s\n+%s\n' "$ref" "$val"; } - return ${r:-0} + printf '%s\n' "$1" | diff -u -b - "$2" } run(){ -- cgit v1.2.3