Skip to content

F
ffmpeg.wasm-core
Commit 8e576d58 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  libavutil: add utility functions to simplify allocation of audio buffers.
  libavutil: add planar sample formats and av_sample_fmt_is_planar()
  avconv: fix segfault at EOF with delayed pictures
  pcmdec: remove unneeded resetting of samples pointer
  avconv: remove a now unused parameter from output_packet().
  avconv: formatting fixes in output_packet()
  avconv: declare some variables in blocks where they are used
  avconv: use the same behavior when decoding audio/video/subs
  bethsoftvideo: return proper consumed size for palette packets.
  cdg: skip packets that don't contain a cdg command.
  crcenc: add flags
  avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
  tiffenc: add a private option for selecting compression algorithm
  md5enc: add flags
  ARM: remove needless .text/.align directives

Conflicts:
	doc/APIchanges
	libavcodec/tiffenc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cdgraphics
	tests/ref/fate/film-cvid-pcm-stereo-8bit
	tests/ref/fate/mpeg2-field-enc
	tests/ref/fate/nuv
	tests/ref/fate/tiertex-seq
	tests/ref/fate/tscc-32bit
	tests/ref/fate/vmnc-32bit
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7ffa9ea0 bbb46f3e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 969 additions and 1259 deletions
avconv.c
View file @ 8e576d58
...@@ -1219,7 +1219,8 @@ static void do_video_out(AVFormatContext *s, ...@@ -1219,7 +1219,8 @@ static void do_video_out(AVFormatContext *s,
format_video_sync = video_sync_method; format_video_sync = video_sync_method;
if (format_video_sync < 0) if (format_video_sync < 0)
format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? 2 : 1; format_video_sync = (s->oformat->flags & AVFMT_NOTIMESTAMPS) ? 0 :
(s->oformat->flags & AVFMT_VARIABLE_FPS) ? 2 : 1;
if (format_video_sync) { if (format_video_sync) {
double vdelta = sync_ipts - ost->sync_opts; double vdelta = sync_ipts - ost->sync_opts;
...@@ -1710,15 +1711,13 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1710,15 +1711,13 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
pkt); pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
pkt->data += ret;
pkt->size -= ret;
*got_output = decoded_data_size > 0; *got_output = decoded_data_size > 0;
/* Some bug in mpeg audio decoder gives */ /* Some bug in mpeg audio decoder gives */
/* decoded_data_size < 0, it seems they are overflows */ /* decoded_data_size < 0, it seems they are overflows */
if (!*got_output) { if (!*got_output) {
/* no audio frame */ /* no audio frame */
return 0; return ret;
} }
decoded_data_buf = (uint8_t *)samples; decoded_data_buf = (uint8_t *)samples;
...@@ -1791,7 +1790,7 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1791,7 +1790,7 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
do_audio_out(output_files[ost->file_index].ctx, ost, ist, do_audio_out(output_files[ost->file_index].ctx, ost, ist,
decoded_data_buf, decoded_data_size); decoded_data_buf, decoded_data_size);
} }
return 0; return ret;
} }
static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *pkt_pts) static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *pkt_pts)
...@@ -1819,7 +1818,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int ...@@ -1819,7 +1818,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
if (!*got_output) { if (!*got_output) {
/* no picture yet */ /* no picture yet */
av_freep(&decoded_frame); av_freep(&decoded_frame);
return 0; return ret;
} }
ist->next_pts = ist->pts = decoded_frame->best_effort_timestamp; ist->next_pts = ist->pts = decoded_frame->best_effort_timestamp;
if (ist->st->codec->time_base.num != 0) { if (ist->st->codec->time_base.num != 0) {
...@@ -1898,9 +1897,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1898,9 +1897,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!*got_output) if (!*got_output)
return 0; return ret;
pkt->size = 0;
rate_emu_sleep(ist); rate_emu_sleep(ist);
...@@ -1914,23 +1911,21 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1914,23 +1911,21 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
} }
avsubtitle_free(&subtitle); avsubtitle_free(&subtitle);
return 0; return ret;
} }
/* pkt = NULL means EOF (needed to flush decoder buffers) */ /* pkt = NULL means EOF (needed to flush decoder buffers) */
static int output_packet(InputStream *ist, int ist_index, static int output_packet(InputStream *ist,
OutputStream *ost_table, int nb_ostreams, OutputStream *ost_table, int nb_ostreams,
const AVPacket *pkt) const AVPacket *pkt)
{ {
OutputStream *ost; int i;
int ret = 0, i;
int got_output; int got_output;
int64_t pkt_pts = AV_NOPTS_VALUE; int64_t pkt_pts = AV_NOPTS_VALUE;
AVPacket avpkt; AVPacket avpkt;
if(ist->next_pts == AV_NOPTS_VALUE) if (ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts; ist->next_pts = ist->pts;
if (pkt == NULL) { if (pkt == NULL) {
/* EOF handling */ /* EOF handling */
...@@ -1949,13 +1944,16 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -1949,13 +1944,16 @@ static int output_packet(InputStream *ist, int ist_index,
//while we have more to decode or while the decoder did output something on EOF //while we have more to decode or while the decoder did output something on EOF
while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) { while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
int ret = 0;
handle_eof: handle_eof:
ist->pts= ist->next_pts;
if(avpkt.size && avpkt.size != pkt->size) ist->pts = ist->next_pts;
if (avpkt.size && avpkt.size != pkt->size) {
av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING, av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
"Multiple frames in a packet from stream %d\n", pkt->stream_index); "Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning=1; ist->showed_multi_packet_warning = 1;
}
switch(ist->st->codec->codec_type) { switch(ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
...@@ -1973,13 +1971,15 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -1973,13 +1971,15 @@ static int output_packet(InputStream *ist, int ist_index,
if (ret < 0) if (ret < 0)
return ret; return ret;
// touch data and size only if not EOF
if (pkt) {
avpkt.data += ret;
avpkt.size -= ret;
}
if (!got_output) { if (!got_output) {
if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) continue;
continue;
goto discard_packet;
} }
} }
discard_packet:
/* handle stream copy */ /* handle stream copy */
if (!ist->decoding_needed) { if (!ist->decoding_needed) {
...@@ -2000,7 +2000,7 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -2000,7 +2000,7 @@ static int output_packet(InputStream *ist, int ist_index,
} }
} }
for (i = 0; pkt && i < nb_ostreams; i++) { for (i = 0; pkt && i < nb_ostreams; i++) {
ost = &ost_table[i]; OutputStream *ost = &ost_table[i];
if (!check_output_constraints(ist, ost) || ost->encoding_needed) if (!check_output_constraints(ist, ost) || ost->encoding_needed)
continue; continue;
...@@ -2636,7 +2636,7 @@ static int transcode(OutputFile *output_files, ...@@ -2636,7 +2636,7 @@ static int transcode(OutputFile *output_files,
} }
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size); //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
if (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) { if (output_packet(ist, output_streams, nb_output_streams, &pkt) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n", av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
ist->file_index, ist->st->index); ist->file_index, ist->st->index);
...@@ -2657,7 +2657,7 @@ static int transcode(OutputFile *output_files, ...@@ -2657,7 +2657,7 @@ static int transcode(OutputFile *output_files,
for (i = 0; i < nb_input_streams; i++) { for (i = 0; i < nb_input_streams; i++) {
ist = &input_streams[i]; ist = &input_streams[i];
if (ist->decoding_needed) { if (ist->decoding_needed) {
output_packet(ist, i, output_streams, nb_output_streams, NULL); output_packet(ist, output_streams, nb_output_streams, NULL);
} }
} }
flush_encoders(output_streams, nb_output_streams); flush_encoders(output_streams, nb_output_streams);
......
doc/APIchanges
View file @ 8e576d58
...@@ -19,6 +19,13 @@ API changes, most recent first: ...@@ -19,6 +19,13 @@ API changes, most recent first:
2011-10-20 - b35e9e1 - lavu 51.22.0 2011-10-20 - b35e9e1 - lavu 51.22.0
Add av_strtok() to avstring.h. Add av_strtok() to avstring.h.
2011-xx-xx - xxxxxxx - lavu 51.18.0
Add av_samples_get_buffer_size(), av_samples_fill_arrays(), and
av_samples_alloc(), to samplefmt.h.
2011-xx-xx - xxxxxxx - lavu 51.17.0
Add planar sample formats and av_sample_fmt_is_planar() to samplefmt.h.
2011-xx-xx - xxxxxxx - lavc 53.21.0 2011-xx-xx - xxxxxxx - lavc 53.21.0
Move some AVCodecContext fields to a new private struct, AVCodecInternal, Move some AVCodecContext fields to a new private struct, AVCodecInternal,
which is accessed from a new field, AVCodecContext.internal. which is accessed from a new field, AVCodecContext.internal.
......
ffmpeg.c
View file @ 8e576d58
...@@ -1246,7 +1246,8 @@ static void do_video_out(AVFormatContext *s, ...@@ -1246,7 +1246,8 @@ static void do_video_out(AVFormatContext *s,
format_video_sync = video_sync_method; format_video_sync = video_sync_method;
if (format_video_sync < 0) if (format_video_sync < 0)
format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? 2 : 1; format_video_sync = (s->oformat->flags & AVFMT_NOTIMESTAMPS) ? 0 :
(s->oformat->flags & AVFMT_VARIABLE_FPS) ? 2 : 1;
if (format_video_sync) { if (format_video_sync) {
double vdelta = sync_ipts - ost->sync_opts + duration; double vdelta = sync_ipts - ost->sync_opts + duration;
...@@ -1735,15 +1736,13 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1735,15 +1736,13 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
pkt); pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
pkt->data += ret;
pkt->size -= ret;
*got_output = decoded_data_size > 0; *got_output = decoded_data_size > 0;
/* Some bug in mpeg audio decoder gives */ /* Some bug in mpeg audio decoder gives */
/* decoded_data_size < 0, it seems they are overflows */ /* decoded_data_size < 0, it seems they are overflows */
if (!*got_output) { if (!*got_output) {
/* no audio frame */ /* no audio frame */
return 0; return ret;
} }
decoded_data_buf = (uint8_t *)samples; decoded_data_buf = (uint8_t *)samples;
...@@ -1816,7 +1815,7 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1816,7 +1815,7 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
do_audio_out(output_files[ost->file_index].ctx, ost, ist, do_audio_out(output_files[ost->file_index].ctx, ost, ist,
decoded_data_buf, decoded_data_size); decoded_data_buf, decoded_data_size);
} }
return 0; return ret;
} }
static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *pkt_pts, int64_t *pkt_dts) static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *pkt_pts, int64_t *pkt_dts)
...@@ -1852,7 +1851,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int ...@@ -1852,7 +1851,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
if (!*got_output) { if (!*got_output) {
/* no picture yet */ /* no picture yet */
av_freep(&decoded_frame); av_freep(&decoded_frame);
return 0; return ret;
} }
if(decoded_frame->best_effort_timestamp != AV_NOPTS_VALUE) if(decoded_frame->best_effort_timestamp != AV_NOPTS_VALUE)
...@@ -1943,9 +1942,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1943,9 +1942,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!*got_output) if (!*got_output)
return 0; return ret;
pkt->size = 0;
rate_emu_sleep(ist); rate_emu_sleep(ist);
...@@ -1959,15 +1956,14 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1959,15 +1956,14 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
} }
avsubtitle_free(&subtitle); avsubtitle_free(&subtitle);
return 0; return ret;
} }
/* pkt = NULL means EOF (needed to flush decoder buffers) */ /* pkt = NULL means EOF (needed to flush decoder buffers) */
static int output_packet(InputStream *ist, int ist_index, static int output_packet(InputStream *ist,
OutputStream *ost_table, int nb_ostreams, OutputStream *ost_table, int nb_ostreams,
const AVPacket *pkt) const AVPacket *pkt)
{ {
OutputStream *ost;
int ret = 0, i; int ret = 0, i;
int got_output; int got_output;
int64_t pkt_dts = AV_NOPTS_VALUE; int64_t pkt_dts = AV_NOPTS_VALUE;
...@@ -1975,8 +1971,8 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -1975,8 +1971,8 @@ static int output_packet(InputStream *ist, int ist_index,
AVPacket avpkt; AVPacket avpkt;
if(ist->next_pts == AV_NOPTS_VALUE) if (ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts; ist->next_pts = ist->pts;
if (pkt == NULL) { if (pkt == NULL) {
/* EOF handling */ /* EOF handling */
...@@ -1999,12 +1995,14 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -1999,12 +1995,14 @@ static int output_packet(InputStream *ist, int ist_index,
//while we have more to decode or while the decoder did output something on EOF //while we have more to decode or while the decoder did output something on EOF
while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) { while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
handle_eof: handle_eof:
ist->pts= ist->next_pts;
if(avpkt.size && avpkt.size != pkt->size) ist->pts = ist->next_pts;
if (avpkt.size && avpkt.size != pkt->size) {
av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING, av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
"Multiple frames in a packet from stream %d\n", pkt->stream_index); "Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning=1; ist->showed_multi_packet_warning = 1;
}
switch(ist->st->codec->codec_type) { switch(ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
...@@ -2022,13 +2020,17 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -2022,13 +2020,17 @@ static int output_packet(InputStream *ist, int ist_index,
if (ret < 0) if (ret < 0)
return ret; return ret;
// touch data and size only if not EOF
if (pkt) {
if(ist->st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
ret = avpkt.size;
avpkt.data += ret;
avpkt.size -= ret;
}
if (!got_output) { if (!got_output) {
if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) continue;
continue;
goto discard_packet;
} }
} }
discard_packet:
/* handle stream copy */ /* handle stream copy */
if (!ist->decoding_needed) { if (!ist->decoding_needed) {
...@@ -2049,7 +2051,7 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -2049,7 +2051,7 @@ static int output_packet(InputStream *ist, int ist_index,
} }
} }
for (i = 0; pkt && i < nb_ostreams; i++) { for (i = 0; pkt && i < nb_ostreams; i++) {
ost = &ost_table[i]; OutputStream *ost = &ost_table[i];
if (!check_output_constraints(ist, ost) || ost->encoding_needed) if (!check_output_constraints(ist, ost) || ost->encoding_needed)
continue; continue;
...@@ -2753,7 +2755,7 @@ static int transcode(OutputFile *output_files, int nb_output_files, ...@@ -2753,7 +2755,7 @@ static int transcode(OutputFile *output_files, int nb_output_files,
} }
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size); //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
if (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) { if (output_packet(ist, output_streams, nb_output_streams, &pkt) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n", av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
ist->file_index, ist->st->index); ist->file_index, ist->st->index);
...@@ -2774,7 +2776,7 @@ static int transcode(OutputFile *output_files, int nb_output_files, ...@@ -2774,7 +2776,7 @@ static int transcode(OutputFile *output_files, int nb_output_files,
for (i = 0; i < nb_input_streams; i++) { for (i = 0; i < nb_input_streams; i++) {
ist = &input_streams[i]; ist = &input_streams[i];
if (ist->decoding_needed) { if (ist->decoding_needed) {
output_packet(ist, i, output_streams, nb_output_streams, NULL); output_packet(ist, output_streams, nb_output_streams, NULL);
} }
} }
flush_encoders(output_streams, nb_output_streams); flush_encoders(output_streams, nb_output_streams);
......
libavcodec/arm/dsputil_armv6.S
View file @ 8e576d58
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
preserve8 preserve8
.text
.macro call_2x_pixels type, subp .macro call_2x_pixels type, subp
function ff_\type\()_pixels16\subp\()_armv6, export=1 function ff_\type\()_pixels16\subp\()_armv6, export=1
push {r0-r3, lr} push {r0-r3, lr}
......
libavcodec/arm/dsputil_neon.S
View file @ 8e576d58
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "asm.S" #include "asm.S"
preserve8 preserve8
.text
function ff_clear_block_neon, export=1 function ff_clear_block_neon, export=1
vmov.i16 q0, #0 vmov.i16 q0, #0
......
libavcodec/arm/fft_neon.S
View file @ 8e576d58
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#define M_SQRT1_2 0.70710678118654752440 #define M_SQRT1_2 0.70710678118654752440
.text
function fft4_neon function fft4_neon
vld1.32 {d0-d3}, [r0,:128] vld1.32 {d0-d3}, [r0,:128]
......
libavcodec/arm/fmtconvert_neon.S
View file @ 8e576d58
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "asm.S" #include "asm.S"
preserve8 preserve8
.text
function ff_float_to_int16_neon, export=1 function ff_float_to_int16_neon, export=1
subs r2, r2, #8 subs r2, r2, #8
......
libavcodec/arm/h264dsp_neon.S
View file @ 8e576d58
...@@ -392,9 +392,6 @@ function ff_\type\()_h264_chroma_mc2_neon, export=1 ...@@ -392,9 +392,6 @@ function ff_\type\()_h264_chroma_mc2_neon, export=1
endfunc endfunc
.endm .endm
.text
.align
h264_chroma_mc8 put h264_chroma_mc8 put
h264_chroma_mc8 avg h264_chroma_mc8 avg
h264_chroma_mc4 put h264_chroma_mc4 put
......
libavcodec/arm/h264idct_neon.S
View file @ 8e576d58
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "asm.S" #include "asm.S"
preserve8 preserve8
.text
function ff_h264_idct_add_neon, export=1 function ff_h264_idct_add_neon, export=1
vld1.64 {d0-d3}, [r1,:128] vld1.64 {d0-d3}, [r1,:128]
......
libavcodec/arm/int_neon.S
View file @ 8e576d58
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
preserve8 preserve8
.fpu neon .fpu neon
.text
function ff_scalarproduct_int16_neon, export=1 function ff_scalarproduct_int16_neon, export=1
vmov.i16 q0, #0 vmov.i16 q0, #0
......
libavcodec/arm/mdct_neon.S
View file @ 8e576d58
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
preserve8 preserve8
.text
#define ff_fft_calc_neon X(ff_fft_calc_neon) #define ff_fft_calc_neon X(ff_fft_calc_neon)
function ff_imdct_half_neon, export=1 function ff_imdct_half_neon, export=1
......
libavcodec/arm/simple_idct_arm.S
View file @ 8e576d58
...@@ -53,8 +53,6 @@ ...@@ -53,8 +53,6 @@
#define COL_SHIFTED_1 524288 /* 1<< (COL_SHIFT-1) */ #define COL_SHIFTED_1 524288 /* 1<< (COL_SHIFT-1) */
.text
function ff_simple_idct_arm, export=1 function ff_simple_idct_arm, export=1
@@ void simple_idct_arm(int16_t *block) @@ void simple_idct_arm(int16_t *block)
@@ save stack for reg needed (take all of them), @@ save stack for reg needed (take all of them),
......
libavcodec/bethsoftvideo.c
View file @ 8e576d58
...@@ -47,15 +47,20 @@ static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx) ...@@ -47,15 +47,20 @@ static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static void set_palette(AVFrame * frame, const uint8_t * palette_buffer) static int set_palette(AVFrame * frame, const uint8_t * palette_buffer, int buf_size)
{ {
uint32_t * palette = (uint32_t *)frame->data[1]; uint32_t * palette = (uint32_t *)frame->data[1];
int a; int a;
if (buf_size < 256*3)
return AVERROR_INVALIDDATA;
for(a = 0; a < 256; a++){ for(a = 0; a < 256; a++){
palette[a] = 0xFF << 24 | AV_RB24(&palette_buffer[a * 3]) * 4; palette[a] = 0xFF << 24 | AV_RB24(&palette_buffer[a * 3]) * 4;
palette[a] |= palette[a] >> 6 & 0x30303; palette[a] |= palette[a] >> 6 & 0x30303;
} }
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
return 256*3;
} }
static int bethsoftvid_decode_frame(AVCodecContext *avctx, static int bethsoftvid_decode_frame(AVCodecContext *avctx,
...@@ -82,8 +87,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, ...@@ -82,8 +87,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
switch(block_type = *buf++){ switch(block_type = *buf++){
case PALETTE_BLOCK: case PALETTE_BLOCK:
set_palette(&vid->frame, buf); return set_palette(&vid->frame, buf, buf_size);
return 0;
case VIDEO_YOFF_P_FRAME: case VIDEO_YOFF_P_FRAME:
yoffset = bytestream_get_le16(&buf); yoffset = bytestream_get_le16(&buf);
if(yoffset >= avctx->height) if(yoffset >= avctx->height)
......
libavcodec/pcm.c
View file @ 8e576d58
...@@ -384,7 +384,6 @@ static int pcm_decode_frame(AVCodecContext *avctx, ...@@ -384,7 +384,6 @@ static int pcm_decode_frame(AVCodecContext *avctx,
#endif /* HAVE_BIGENDIAN */ #endif /* HAVE_BIGENDIAN */
case CODEC_ID_PCM_U8: case CODEC_ID_PCM_U8:
memcpy(samples, src, n*sample_size); memcpy(samples, src, n*sample_size);
samples += n * sample_size;
break; break;
case CODEC_ID_PCM_ZORK: case CODEC_ID_PCM_ZORK:
for (; n > 0; n--) { for (; n > 0; n--) {
...@@ -430,7 +429,6 @@ static int pcm_decode_frame(AVCodecContext *avctx, ...@@ -430,7 +429,6 @@ static int pcm_decode_frame(AVCodecContext *avctx,
} }
break; break;
} }
samples = (uint8_t *) dst_int32_t;
break; break;
} }
case CODEC_ID_PCM_LXF: case CODEC_ID_PCM_LXF:
...@@ -453,7 +451,6 @@ static int pcm_decode_frame(AVCodecContext *avctx, ...@@ -453,7 +451,6 @@ static int pcm_decode_frame(AVCodecContext *avctx,
((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4); ((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4);
} }
} }
samples = (uint8_t *) dst_int32_t;
break; break;
} }
default: default:
......
libavcodec/tiffenc.c
View file @ 8e576d58
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
* @author Bartlomiej Wolowiec * @author Bartlomiej Wolowiec
*/ */
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
...@@ -44,7 +47,7 @@ static const uint8_t type_sizes2[6] = { ...@@ -44,7 +47,7 @@ static const uint8_t type_sizes2[6] = {
}; };
typedef struct TiffEncoderContext { typedef struct TiffEncoderContext {
AVClass *avclass; AVClass *class; ///< for private options
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame picture;
...@@ -230,7 +233,6 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf, ...@@ -230,7 +233,6 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
p->key_frame = 1; p->key_frame = 1;
avctx->coded_frame= &s->picture; avctx->coded_frame= &s->picture;
s->compr = TIFF_PACKBITS;
if (avctx->compression_level == 0) { if (avctx->compression_level == 0) {
s->compr = TIFF_RAW; s->compr = TIFF_RAW;
} else if(avctx->compression_level == 2) { } else if(avctx->compression_level == 2) {
...@@ -453,11 +455,26 @@ fail: ...@@ -453,11 +455,26 @@ fail:
return ret; return ret;
} }
static const AVOption options[]={ #define OFFSET(x) offsetof(TiffEncoderContext, x)
{"dpi", "set the image resolution (in dpi)", offsetof(TiffEncoderContext, dpi), AV_OPT_TYPE_INT, {.dbl = 72}, 1, 0x10000, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_ENCODING_PARAM}, #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
{NULL} static const AVOption options[] = {
{"dpi", "set the image resolution (in dpi)", OFFSET(dpi), AV_OPT_TYPE_INT, {.dbl = 72}, 1, 0x10000, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_ENCODING_PARAM},
{ "compression_algo", NULL, OFFSET(compr), AV_OPT_TYPE_INT, {TIFF_PACKBITS}, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" },
{ "packbits", NULL, 0, AV_OPT_TYPE_CONST, {TIFF_PACKBITS}, 0, 0, VE, "compression_algo" },
{ "raw", NULL, 0, AV_OPT_TYPE_CONST, {TIFF_RAW}, 0, 0, VE, "compression_algo" },
{ "lzw", NULL, 0, AV_OPT_TYPE_CONST, {TIFF_LZW}, 0, 0, VE, "compression_algo" },
#if CONFIG_ZLIB
{ "deflate", NULL, 0, AV_OPT_TYPE_CONST, {TIFF_DEFLATE}, 0, 0, VE, "compression_algo" },
#endif
{ NULL },
};
static const AVClass tiffenc_class = {
.class_name = "TIFF encoder",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
}; };
static const AVClass class = { "tiff", av_default_item_name, options, LIBAVUTIL_VERSION_INT };
AVCodec ff_tiff_encoder = { AVCodec ff_tiff_encoder = {
.name = "tiff", .name = "tiff",
...@@ -473,5 +490,5 @@ AVCodec ff_tiff_encoder = { ...@@ -473,5 +490,5 @@ AVCodec ff_tiff_encoder = {
PIX_FMT_YUV411P, PIX_FMT_RGB48LE, PIX_FMT_YUV411P, PIX_FMT_RGB48LE,
PIX_FMT_NONE}, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"), .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.priv_class= &class, .priv_class = &tiffenc_class,
}; };
libavfilter/af_aconvert.c
View file @ 8e576d58
...@@ -270,7 +270,7 @@ static int init_buffers(AVFilterLink *inlink, int nb_samples) ...@@ -270,7 +270,7 @@ static int init_buffers(AVFilterLink *inlink, int nb_samples)
int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout); int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
if (av_samples_alloc(data, linesize, nb_channels, nb_samples, if (av_samples_alloc(data, linesize, nb_channels, nb_samples,
inlink->format, inlink->planar, 16) < 0) inlink->format, 16) < 0)
goto fail_no_mem; goto fail_no_mem;
aconvert->mix_samplesref = aconvert->mix_samplesref =
avfilter_get_audio_buffer_ref_from_arrays(data, linesize, AV_PERM_WRITE, avfilter_get_audio_buffer_ref_from_arrays(data, linesize, AV_PERM_WRITE,
......
libavfilter/asrc_abuffer.c
View file @ 8e576d58
...@@ -241,7 +241,7 @@ int av_asrc_buffer_add_buffer(AVFilterContext *ctx, ...@@ -241,7 +241,7 @@ int av_asrc_buffer_add_buffer(AVFilterContext *ctx,
av_samples_fill_arrays(data, linesize, av_samples_fill_arrays(data, linesize,
buf, nb_channels, nb_samples, buf, nb_channels, nb_samples,
sample_fmt, planar, 16); sample_fmt, 16);
return av_asrc_buffer_add_samples(ctx, return av_asrc_buffer_add_samples(ctx,
data, linesize, nb_samples, data, linesize, nb_samples,
......
libavfilter/defaults.c
View file @ 8e576d58
...@@ -91,7 +91,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per ...@@ -91,7 +91,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per
/* Calculate total buffer size, round to multiple of 16 to be SIMD friendly */ /* Calculate total buffer size, round to multiple of 16 to be SIMD friendly */
if (av_samples_alloc(data, linesize, if (av_samples_alloc(data, linesize,
nb_channels, nb_samples, link->format, nb_channels, nb_samples, link->format,
link->planar, 16) < 0) 16) < 0)
return NULL; return NULL;
samplesref = samplesref =
......
libavformat/cdg.c
View file @ 8e576d58
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "avformat.h" #include "avformat.h"
#define CDG_PACKET_SIZE 24 #define CDG_PACKET_SIZE 24
#define CDG_COMMAND 0x09
#define CDG_MASK 0x3F
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
...@@ -49,7 +51,12 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -49,7 +51,12 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret; int ret;
ret = av_get_packet(s->pb, pkt, CDG_PACKET_SIZE); while (1) {
ret = av_get_packet(s->pb, pkt, CDG_PACKET_SIZE);
if (ret < 1 || (pkt->data[0] & CDG_MASK) == CDG_COMMAND)
break;
av_free_packet(pkt);
}
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->dts=pkt->pts= s->streams[0]->cur_dts; pkt->dts=pkt->pts= s->streams[0]->cur_dts;
......
libavformat/crcenc.c
View file @ 8e576d58
...@@ -64,4 +64,5 @@ AVOutputFormat ff_crc_muxer = { ...@@ -64,4 +64,5 @@ AVOutputFormat ff_crc_muxer = {
.write_header = crc_write_header, .write_header = crc_write_header,
.write_packet = crc_write_packet, .write_packet = crc_write_packet,
.write_trailer = crc_write_trailer, .write_trailer = crc_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
}; };
libavformat/framecrcenc.c
View file @ 8e576d58
...@@ -40,4 +40,5 @@ AVOutputFormat ff_framecrc_muxer = { ...@@ -40,4 +40,5 @@ AVOutputFormat ff_framecrc_muxer = {
.audio_codec = CODEC_ID_PCM_S16LE, .audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO, .video_codec = CODEC_ID_RAWVIDEO,
.write_packet = framecrc_write_packet, .write_packet = framecrc_write_packet,
.flags = AVFMT_VARIABLE_FPS,
}; };
libavformat/md5enc.c
View file @ 8e576d58
...@@ -75,6 +75,7 @@ AVOutputFormat ff_md5_muxer = { ...@@ -75,6 +75,7 @@ AVOutputFormat ff_md5_muxer = {
.write_header = write_header, .write_header = write_header,
.write_packet = write_packet, .write_packet = write_packet,
.write_trailer = write_trailer, .write_trailer = write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -102,5 +103,6 @@ AVOutputFormat ff_framemd5_muxer = { ...@@ -102,5 +103,6 @@ AVOutputFormat ff_framemd5_muxer = {
.audio_codec = CODEC_ID_PCM_S16LE, .audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO, .video_codec = CODEC_ID_RAWVIDEO,
.write_packet = framemd5_write_packet, .write_packet = framemd5_write_packet,
.flags = AVFMT_VARIABLE_FPS,
}; };
#endif #endif
libavutil/avutil.h
View file @ 8e576d58
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MAJOR 51
#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MINOR 27
#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
......
libavutil/samplefmt.c
View file @ 8e576d58
...@@ -25,15 +25,21 @@ ...@@ -25,15 +25,21 @@
typedef struct SampleFmtInfo { typedef struct SampleFmtInfo {
char name[4]; char name[4];
int bits; int bits;
int planar;
} SampleFmtInfo; } SampleFmtInfo;
/** this table gives more information about formats */ /** this table gives more information about formats */
static const SampleFmtInfo sample_fmt_info[AV_SAMPLE_FMT_NB] = { static const SampleFmtInfo sample_fmt_info[AV_SAMPLE_FMT_NB] = {
[AV_SAMPLE_FMT_U8] = { .name = "u8", .bits = 8 }, [AV_SAMPLE_FMT_U8] = { .name = "u8", .bits = 8, .planar = 0 },
[AV_SAMPLE_FMT_S16] = { .name = "s16", .bits = 16 }, [AV_SAMPLE_FMT_S16] = { .name = "s16", .bits = 16, .planar = 0 },
[AV_SAMPLE_FMT_S32] = { .name = "s32", .bits = 32 }, [AV_SAMPLE_FMT_S32] = { .name = "s32", .bits = 32, .planar = 0 },
[AV_SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32 }, [AV_SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32, .planar = 0 },
[AV_SAMPLE_FMT_DBL] = { .name = "dbl", .bits = 64 }, [AV_SAMPLE_FMT_DBL] = { .name = "dbl", .bits = 64, .planar = 0 },
[AV_SAMPLE_FMT_U8P] = { .name = "u8p", .bits = 8, .planar = 1 },
[AV_SAMPLE_FMT_S16P] = { .name = "s16p", .bits = 16, .planar = 1 },
[AV_SAMPLE_FMT_S32P] = { .name = "s32p", .bits = 32, .planar = 1 },
[AV_SAMPLE_FMT_FLTP] = { .name = "fltp", .bits = 32, .planar = 1 },
[AV_SAMPLE_FMT_DBLP] = { .name = "dblp", .bits = 64, .planar = 1 },
}; };
const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt) const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt)
...@@ -80,51 +86,74 @@ int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt) ...@@ -80,51 +86,74 @@ int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt)
} }
#endif #endif
int av_samples_fill_arrays(uint8_t *pointers[8], int linesizes[8], int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt)
uint8_t *buf, int nb_channels, int nb_samples, {
enum AVSampleFormat sample_fmt, int planar, int align) if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB)
return 0;
return sample_fmt_info[sample_fmt].planar;
}
int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
enum AVSampleFormat sample_fmt, int align)
{ {
int i, linesize; int line_size;
int sample_size = av_get_bytes_per_sample(sample_fmt); int sample_size = av_get_bytes_per_sample(sample_fmt);
int planar = av_sample_fmt_is_planar(sample_fmt);
if (nb_channels * (uint64_t)nb_samples * sample_size >= INT_MAX - align*(uint64_t)nb_channels) /* validate parameter ranges */
if (!sample_size || nb_samples <= 0 || nb_channels <= 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
linesize = planar ? FFALIGN(nb_samples*sample_size, align) :
FFALIGN(nb_samples*sample_size*nb_channels, align);
if (pointers) {
pointers[0] = buf;
for (i = 1; planar && i < nb_channels; i++) {
pointers[i] = pointers[i-1] + linesize;
}
memset(&pointers[i], 0, (8-i) * sizeof(pointers[0]));
}
if (linesizes) { /* check for integer overflow */
linesizes[0] = linesize; if (nb_channels > INT_MAX / align ||
for (i = 1; planar && i < nb_channels; i++) (int64_t)nb_channels * nb_samples > (INT_MAX - (align * nb_channels)) / sample_size)
linesizes[i] = linesizes[0]; return AVERROR(EINVAL);
memset(&linesizes[i], 0, (8-i) * sizeof(linesizes[0]));
} line_size = planar ? FFALIGN(nb_samples * sample_size, align) :
FFALIGN(nb_samples * sample_size * nb_channels, align);
if (linesize)
*linesize = line_size;
return planar ? linesize * nb_channels : linesize; return planar ? line_size * nb_channels : line_size;
} }
int av_samples_alloc(uint8_t *pointers[8], int linesizes[8], int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
int nb_channels, int nb_samples, uint8_t *buf, int nb_channels, int nb_samples,
enum AVSampleFormat sample_fmt, int planar, enum AVSampleFormat sample_fmt, int align)
int align) {
int ch, planar, buf_size;
planar = av_sample_fmt_is_planar(sample_fmt);
buf_size = av_samples_get_buffer_size(linesize, nb_channels, nb_samples,
sample_fmt, align);
if (buf_size < 0)
return buf_size;
audio_data[0] = buf;
for (ch = 1; planar && ch < nb_channels; ch++)
audio_data[ch] = audio_data[ch-1] + *linesize;
return 0;
}
int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
int nb_samples, enum AVSampleFormat sample_fmt, int align)
{ {
uint8_t *buf; uint8_t *buf;
int size = av_samples_fill_arrays(NULL, NULL, int size = av_samples_get_buffer_size(NULL, nb_channels, nb_samples,
NULL, nb_channels, nb_samples, sample_fmt, align);
sample_fmt, planar, align); if (size < 0)
return size;
buf = av_mallocz(size); buf = av_mallocz(size);
if (!buf) if (!buf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
return av_samples_fill_arrays(pointers, linesizes, size = av_samples_fill_arrays(audio_data, linesize, buf, nb_channels,
buf, nb_channels, nb_samples, nb_samples, sample_fmt, align);
sample_fmt, planar, align); if (size < 0) {
av_free(buf);
return size;
}
return 0;
} }
libavutil/samplefmt.h
View file @ 8e576d58
...@@ -31,6 +31,13 @@ enum AVSampleFormat { ...@@ -31,6 +31,13 @@ enum AVSampleFormat {
AV_SAMPLE_FMT_S32, ///< signed 32 bits AV_SAMPLE_FMT_S32, ///< signed 32 bits
AV_SAMPLE_FMT_FLT, ///< float AV_SAMPLE_FMT_FLT, ///< float
AV_SAMPLE_FMT_DBL, ///< double AV_SAMPLE_FMT_DBL, ///< double
AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar
AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar
AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar
AV_SAMPLE_FMT_FLTP, ///< float, planar
AV_SAMPLE_FMT_DBLP, ///< double, planar
AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking dynamically AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking dynamically
}; };
...@@ -78,48 +85,64 @@ int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt); ...@@ -78,48 +85,64 @@ int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt); int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
/** /**
* Fill channel data pointers and linesizes for samples with sample * Check if the sample format is planar.
*
* @param sample_fmt the sample format to inspect
* @return 1 if the sample format is planar, 0 if it is interleaved
*/
int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
/**
* Get the required buffer size for the given audio parameters.
*
* @param[out] linesize calculated linesize, may be NULL
* @param nb_channels the number of channels
* @param nb_samples the number of samples in a single channel
* @param sample_fmt the sample format
* @return required buffer size, or negative error code on failure
*/
int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
enum AVSampleFormat sample_fmt, int align);
/**
* Fill channel data pointers and linesize for samples with sample
* format sample_fmt. * format sample_fmt.
* *
* The pointers array is filled with the pointers to the samples data: * The pointers array is filled with the pointers to the samples data:
* for planar, set the start point of each plane's data within the buffer, * for planar, set the start point of each channel's data within the buffer,
* for packed, set the start point of the entire buffer only. * for packed, set the start point of the entire buffer only.
* *
* The linesize array is filled with the aligned size of each samples * The linesize array is filled with the aligned size of each channel's data
* plane, that is linesize[i] will contain the linesize of the plane i, * buffer for planar layout, or the aligned size of the buffer for all channels
* and will be zero for all the unused planes. All linesize values are * for packed layout.
* equal.
* *
* @param pointers array to be filled with the pointer for each plane, may be NULL * @param[out] audio_data array to be filled with the pointer for each channel
* @param linesizes array to be filled with the linesize, may be NULL * @param[out] linesize calculated linesize
* @param buf the pointer to a buffer containing the samples * @param buf the pointer to a buffer containing the samples
* @param nb_samples the number of samples in a single channel * @param nb_channels the number of channels
* @param planar 1 if the samples layout is planar, 0 if it is packed * @param nb_samples the number of samples in a single channel
* @param nb_channels the number of channels * @param sample_fmt the sample format
* @return the total size of the buffer, a negative * @param align buffer size alignment (1 = no alignment required)
* error code in case of failure * @return 0 on success or a negative error code on failure
*/ */
int av_samples_fill_arrays(uint8_t *pointers[8], int linesizes[8], int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, uint8_t *buf,
uint8_t *buf, int nb_channels, int nb_samples, int nb_channels, int nb_samples,
enum AVSampleFormat sample_fmt, int planar, int align); enum AVSampleFormat sample_fmt, int align);
/** /**
* Allocate a samples buffer for nb_samples samples, and * Allocate a samples buffer for nb_samples samples, and fill data pointers and
* fill pointers and linesizes accordingly. * linesize accordingly.
* The allocated samples buffer has to be freed by using * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
* av_freep(&pointers[0]).
* *
* @param nb_channels number of audio channels * @param[out] audio_data array to be filled with the pointer for each channel
* @param nb_samples number of samples per channel * @param[out] linesize aligned size for audio buffer(s)
* @param planar 1 if the samples layout is planar, 0 if packed, * @param nb_channels number of audio channels
* @param align the value to use for buffer size alignment * @param nb_samples number of samples per channel
* @return the size in bytes required for the samples buffer, a negative * @param align buffer size alignment (1 = no alignment required)
* error code in case of failure * @return 0 on success or a negative error code on failure
* @see av_samples_fill_arrays() * @see av_samples_fill_arrays()
*/ */
int av_samples_alloc(uint8_t *pointers[8], int linesizes[8], int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
int nb_channels, int nb_samples, int nb_samples, enum AVSampleFormat sample_fmt, int align);
enum AVSampleFormat sample_fmt, int planar,
int align);
#endif /* AVCORE_SAMPLEFMT_H */ #endif /* AVUTIL_SAMPLEFMT_H */
tests/fate.mak
View file @ 8e576d58
...@@ -201,7 +201,7 @@ fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec ...@@ -201,7 +201,7 @@ fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec
FATE_TESTS += fate-nsv-demux FATE_TESTS += fate-nsv-demux
fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
FATE_TESTS += fate-nuv FATE_TESTS += fate-nuv
fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -vsync 0
FATE_TESTS += fate-oma-demux FATE_TESTS += fate-oma-demux
fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
FATE_TESTS += fate-pcm_dvd FATE_TESTS += fate-pcm_dvd
...@@ -271,7 +271,7 @@ fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rg ...@@ -271,7 +271,7 @@ fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rg
FATE_TESTS += fate-real-14_4 FATE_TESTS += fate-real-14_4
fate-real-14_4: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le fate-real-14_4: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le
FATE_TESTS += fate-real-rv40 FATE_TESTS += fate-real-rv40
fate-real-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an fate-real-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0
FATE_TESTS += fate-redcode-demux FATE_TESTS += fate-redcode-demux
fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy
FATE_TESTS += fate-rl2 FATE_TESTS += fate-rl2
......
tests/fate/vp8.mak
View file @ 8e576d58
...@@ -10,7 +10,7 @@ define FATE_VP8_FULL ...@@ -10,7 +10,7 @@ define FATE_VP8_FULL
$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
FATE_VP8 += fate-vp8-sign-bias$(1) FATE_VP8 += fate-vp8-sign-bias$(1)
fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf -vsync 0
fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
endef endef
......
tests/ref/fate/cdgraphics
View file @ 8e576d58
This diff is collapsed.
tests/ref/fate/deluxepaint-anm
View file @ 8e576d58
...@@ -69,87 +69,55 @@ ...@@ -69,87 +69,55 @@
0, 204000, 192000, 0xdd7f371d 0, 204000, 192000, 0xdd7f371d
0, 207000, 192000, 0xeed134c6 0, 207000, 192000, 0xeed134c6
0, 210000, 192000, 0x362931f5 0, 210000, 192000, 0x362931f5
0, 213000, 192000, 0x362931f5 0, 213000, 192000, 0xfb41331d
0, 216000, 192000, 0x362931f5 0, 216000, 192000, 0x087433f8
0, 219000, 192000, 0x362931f5 0, 219000, 192000, 0xf36b34a6
0, 222000, 192000, 0x362931f5 0, 222000, 192000, 0x652a33cd
0, 225000, 192000, 0x362931f5 0, 225000, 192000, 0x652a33cd
0, 228000, 192000, 0x362931f5 0, 228000, 192000, 0xe50c336a
0, 231000, 192000, 0x362931f5 0, 231000, 192000, 0x652a33cd
0, 234000, 192000, 0x362931f5 0, 234000, 192000, 0xeed134c6
0, 237000, 192000, 0x362931f5 0, 237000, 192000, 0x652a33cd
0, 240000, 192000, 0x362931f5 0, 240000, 192000, 0x5d7633e5
0, 243000, 192000, 0x362931f5 0, 243000, 192000, 0x845233b5
0, 246000, 192000, 0x362931f5 0, 246000, 192000, 0x9d1c349b
0, 249000, 192000, 0x362931f5 0, 249000, 192000, 0x25843317
0, 252000, 192000, 0x362931f5 0, 252000, 192000, 0xc84b375c
0, 255000, 192000, 0x362931f5 0, 255000, 192000, 0xaf2b3410
0, 258000, 192000, 0x362931f5 0, 258000, 192000, 0xaf2b3410
0, 261000, 192000, 0x362931f5 0, 261000, 192000, 0x26d23594
0, 264000, 192000, 0x362931f5 0, 264000, 192000, 0xaf2b3410
0, 267000, 192000, 0x362931f5 0, 267000, 192000, 0x26d23594
0, 270000, 192000, 0x362931f5 0, 270000, 192000, 0xaf2b3410
0, 273000, 192000, 0x362931f5 0, 273000, 192000, 0x72c4dfb9
0, 276000, 192000, 0x362931f5 0, 276000, 192000, 0x3c72e390
0, 279000, 192000, 0x362931f5 0, 279000, 192000, 0xb4466634
0, 282000, 192000, 0x362931f5 0, 282000, 192000, 0x84f064f5
0, 285000, 192000, 0x362931f5 0, 285000, 192000, 0xad43f3f5
0, 288000, 192000, 0x362931f5 0, 288000, 192000, 0xa8644d57
0, 291000, 192000, 0x362931f5 0, 291000, 192000, 0xfac35238
0, 294000, 192000, 0x362931f5 0, 294000, 192000, 0xe9374d1e
0, 297000, 192000, 0x362931f5 0, 297000, 192000, 0x0bd14cfa
0, 300000, 192000, 0x362931f5 0, 300000, 192000, 0x7e51a437
0, 303000, 192000, 0x362931f5 0, 303000, 192000, 0x92678dfa
0, 306000, 192000, 0x362931f5 0, 306000, 192000, 0x43338d41
0, 309000, 192000, 0xfb41331d 0, 309000, 192000, 0x00000000
0, 312000, 192000, 0x087433f8 0, 312000, 192000, 0x00000000
0, 315000, 192000, 0xf36b34a6 0, 315000, 192000, 0x00000000
0, 318000, 192000, 0x652a33cd 0, 318000, 192000, 0x00000000
0, 321000, 192000, 0x652a33cd 0, 321000, 192000, 0x00000000
0, 324000, 192000, 0xe50c336a 0, 324000, 192000, 0x00000000
0, 327000, 192000, 0x652a33cd 0, 327000, 192000, 0x00000000
0, 330000, 192000, 0xeed134c6 0, 330000, 192000, 0x00000000
0, 333000, 192000, 0x652a33cd 0, 333000, 192000, 0x00000000
0, 336000, 192000, 0x5d7633e5 0, 336000, 192000, 0x00000000
0, 339000, 192000, 0x845233b5 0, 339000, 192000, 0x00000000
0, 342000, 192000, 0x9d1c349b 0, 342000, 192000, 0x00000000
0, 345000, 192000, 0x25843317 0, 345000, 192000, 0x00000000
0, 348000, 192000, 0xc84b375c 0, 348000, 192000, 0x00000000
0, 351000, 192000, 0xaf2b3410 0, 351000, 192000, 0x00000000
0, 354000, 192000, 0xaf2b3410 0, 354000, 192000, 0x00000000
0, 357000, 192000, 0x26d23594 0, 357000, 192000, 0x00000000
0, 360000, 192000, 0xaf2b3410 0, 360000, 192000, 0x00000000
0, 363000, 192000, 0x26d23594 0, 363000, 192000, 0x00000000
0, 366000, 192000, 0xaf2b3410 0, 366000, 192000, 0x82a79641
0, 369000, 192000, 0x72c4dfb9
0, 372000, 192000, 0x3c72e390
0, 375000, 192000, 0xb4466634
0, 378000, 192000, 0x84f064f5
0, 381000, 192000, 0xad43f3f5
0, 384000, 192000, 0xa8644d57
0, 387000, 192000, 0xfac35238
0, 390000, 192000, 0xe9374d1e
0, 393000, 192000, 0x0bd14cfa
0, 396000, 192000, 0x7e51a437
0, 399000, 192000, 0x92678dfa
0, 402000, 192000, 0x43338d41
0, 405000, 192000, 0x00000000
0, 408000, 192000, 0x00000000
0, 411000, 192000, 0x00000000
0, 414000, 192000, 0x00000000
0, 417000, 192000, 0x00000000
0, 420000, 192000, 0x00000000
0, 423000, 192000, 0x00000000
0, 426000, 192000, 0x00000000
0, 429000, 192000, 0x00000000
0, 432000, 192000, 0x00000000
0, 435000, 192000, 0x00000000
0, 438000, 192000, 0x00000000
0, 441000, 192000, 0x00000000
0, 444000, 192000, 0x00000000
0, 447000, 192000, 0x00000000
0, 450000, 192000, 0x00000000
0, 453000, 192000, 0x00000000
0, 456000, 192000, 0x00000000
0, 459000, 192000, 0x00000000
0, 462000, 192000, 0x82a79641
tests/ref/fate/film-cvid-pcm-stereo-8bit
View file @ 8e576d58
This diff is collapsed.
tests/ref/fate/mpeg2-field-enc
View file @ 8e576d58
0, 0, 622080, 0xb3b66c5c 0, 0, 622080, 0xb3b66c5c
0, 3600, 622080, 0xb3b66c5c 0, 3600, 622080, 0x088ec02b
0, 7200, 622080, 0xb3b66c5c 0, 7200, 622080, 0x7a36db21
0, 10800, 622080, 0xb3b66c5c 0, 10800, 622080, 0x541b286f
0, 14400, 622080, 0xb3b66c5c 0, 14400, 622080, 0xb6c3e590
0, 18000, 622080, 0xb3b66c5c 0, 18000, 622080, 0x39dbed51
0, 21600, 622080, 0xb3b66c5c 0, 21600, 622080, 0x973dc728
0, 25200, 622080, 0xb3b66c5c 0, 25200, 622080, 0xd7a4f804
0, 28800, 622080, 0xb3b66c5c 0, 28800, 622080, 0xa2484762
0, 32400, 622080, 0xb3b66c5c 0, 32400, 622080, 0x0cd268d1
0, 36000, 622080, 0x088ec02b 0, 36000, 622080, 0x72eb663d
0, 39600, 622080, 0x7a36db21 0, 39600, 622080, 0x8fdbac59
0, 43200, 622080, 0x541b286f 0, 43200, 622080, 0xa6f4feb9
0, 46800, 622080, 0xb6c3e590 0, 46800, 622080, 0xadb828c6
0, 50400, 622080, 0x39dbed51 0, 50400, 622080, 0xea630a63
0, 54000, 622080, 0x973dc728 0, 54000, 622080, 0xa901d925
0, 57600, 622080, 0xd7a4f804 0, 57600, 622080, 0xac5e7087
0, 61200, 622080, 0xa2484762 0, 61200, 622080, 0x10274a2b
0, 64800, 622080, 0x0cd268d1 0, 64800, 622080, 0x143d541c
0, 68400, 622080, 0x72eb663d 0, 68400, 622080, 0xee94c93a
0, 72000, 622080, 0x8fdbac59 0, 72000, 622080, 0xca030208
0, 75600, 622080, 0xa6f4feb9 0, 75600, 622080, 0x26f30ead
0, 79200, 622080, 0xadb828c6 0, 79200, 622080, 0xfc22f32c
0, 82800, 622080, 0xea630a63 0, 82800, 622080, 0x940a5ff8
0, 86400, 622080, 0xa901d925 0, 86400, 622080, 0x2164f805
0, 90000, 622080, 0xac5e7087 0, 90000, 622080, 0xa76f5aba
0, 93600, 622080, 0x10274a2b 0, 93600, 622080, 0x8c311471
0, 97200, 622080, 0x143d541c 0, 97200, 622080, 0xa45e1d95
0, 100800, 622080, 0xee94c93a 0, 100800, 622080, 0x6cc61d6c
0, 104400, 622080, 0xca030208 0, 104400, 622080, 0x6983b417
0, 108000, 622080, 0x26f30ead 0, 108000, 622080, 0x982363c0
0, 111600, 622080, 0xfc22f32c
0, 115200, 622080, 0x940a5ff8
0, 118800, 622080, 0x2164f805
0, 122400, 622080, 0xa76f5aba
0, 126000, 622080, 0x8c311471
0, 129600, 622080, 0xa45e1d95
0, 133200, 622080, 0x6cc61d6c
0, 136800, 622080, 0x6983b417
0, 140400, 622080, 0x982363c0
tests/ref/fate/nuv
View file @ 8e576d58
0, 0, 460800, 0x54aedafe 0, 0, 460800, 0x54aedafe
1, 0, 4096, 0x00000000 1, 0, 4096, 0x00000000
1, 2090, 4096, 0x4dfae7a6 1, 2090, 4096, 0x4dfae7a6
0, 3003, 460800, 0x54aedafe 0, 3003, 460800, 0xb7aa8b56
1, 4180, 4096, 0x3fd9f5c6 1, 4180, 4096, 0x3fd9f5c6
0, 6006, 460800, 0x54aedafe 0, 6006, 460800, 0x283ea3b5
1, 6269, 4096, 0x7b86e310 1, 6269, 4096, 0x7b86e310
1, 8359, 4096, 0x611cece5 1, 8359, 4096, 0x611cece5
0, 9009, 460800, 0x54aedafe 0, 9009, 460800, 0x283ea3b5
1, 10449, 4096, 0xb7d8e872 1, 10449, 4096, 0xb7d8e872
0, 12012, 460800, 0xb7aa8b56 0, 12012, 460800, 0x10e577de
1, 12539, 4096, 0x072ef72b 1, 12539, 4096, 0x072ef72b
1, 14629, 4096, 0xb3560144 1, 14629, 4096, 0xb3560144
0, 15015, 460800, 0x283ea3b5 0, 15015, 460800, 0x4e091ee2
1, 16718, 4096, 0x0a3d119e 1, 16718, 4096, 0x0a3d119e
0, 18018, 460800, 0x283ea3b5 0, 18018, 460800, 0x2ea88828
1, 18808, 4096, 0xbe391aa4 1, 18808, 4096, 0xbe391aa4
1, 20898, 4096, 0x28f7c6e5 1, 20898, 4096, 0x28f7c6e5
0, 21021, 460800, 0x10e577de 0, 21021, 460800, 0x4b7f4df0
1, 22988, 4096, 0xca9d9df2 1, 22988, 4096, 0xca9d9df2
0, 24024, 460800, 0x4e091ee2 0, 24024, 460800, 0xa57f20d0
1, 25078, 4096, 0x5c6b95a9 1, 25078, 4096, 0x5c6b95a9
0, 27027, 460800, 0x2ea88828
1, 27167, 4096, 0x0bdfc0bf 1, 27167, 4096, 0x0bdfc0bf
1, 29257, 4096, 0xd95a9277 1, 29257, 4096, 0xd95a9277
0, 30030, 460800, 0x4b7f4df0
1, 31347, 4096, 0xae2bef2c 1, 31347, 4096, 0xae2bef2c
0, 33033, 460800, 0xa57f20d0
1, 33437, 4096, 0xbf031e83 1, 33437, 4096, 0xbf031e83
1, 35527, 4096, 0x4c83e2d1 1, 35527, 4096, 0x4c83e2d1
tests/ref/fate/quickdraw
View file @ 8e576d58
0, 0, 921600, 0xc0e68764 0, 0, 921600, 0xc0e68764
0, 6000, 921600, 0x01a16629 0, 6000, 921600, 0x01a16629
0, 12000, 921600, 0x01a16629
tests/ref/fate/tiertex-seq
View file @ 8e576d58
...@@ -2,147 +2,95 @@ ...@@ -2,147 +2,95 @@
1, 0, 1764, 0x00000000 1, 0, 1764, 0x00000000
0, 3600, 98304, 0xb20c19d0 0, 3600, 98304, 0xb20c19d0
1, 3600, 1764, 0x80a253d9 1, 3600, 1764, 0x80a253d9
0, 7200, 98304, 0xb20c19d0 0, 7200, 98304, 0x6b8538c0
1, 7200, 1764, 0x95a16721 1, 7200, 1764, 0x95a16721
0, 10800, 98304, 0xb20c19d0 0, 10800, 98304, 0x172207e3
1, 10800, 1764, 0x0f0d4cb6 1, 10800, 1764, 0x0f0d4cb6
0, 14400, 98304, 0xb20c19d0 0, 14400, 98304, 0x63fb7dc1
1, 14400, 1764, 0x75026779 1, 14400, 1764, 0x75026779
0, 18000, 98304, 0x6b8538c0 0, 18000, 98304, 0x37cf1601
1, 18000, 1764, 0xb4356e37 1, 18000, 1764, 0xb4356e37
0, 21600, 98304, 0x6b8538c0 0, 21600, 98304, 0x82941990
1, 21600, 1764, 0xfafa64cb 1, 21600, 1764, 0xfafa64cb
0, 25200, 98304, 0x6b8538c0 0, 25200, 98304, 0xe0a5309e
1, 25200, 1764, 0xe8fd7970 1, 25200, 1764, 0xe8fd7970
0, 28800, 98304, 0x172207e3 0, 28800, 98304, 0x164cb67d
1, 28800, 1764, 0x666879b7 1, 28800, 1764, 0x666879b7
0, 32400, 98304, 0x172207e3 0, 32400, 98304, 0xed2189f8
1, 32400, 1764, 0xf2cd7770 1, 32400, 1764, 0xf2cd7770
0, 36000, 98304, 0x172207e3 0, 36000, 98304, 0x7215e529
1, 36000, 1764, 0x54317a1c 1, 36000, 1764, 0x54317a1c
0, 39600, 98304, 0x172207e3 0, 39600, 98304, 0x170c783b
1, 39600, 1764, 0x9c396930 1, 39600, 1764, 0x9c396930
0, 43200, 98304, 0x63fb7dc1 0, 43200, 98304, 0xf6bd74c7
1, 43200, 1764, 0x87115ec4 1, 43200, 1764, 0x87115ec4
0, 46800, 98304, 0x63fb7dc1 0, 46800, 98304, 0x1efd38c4
1, 46800, 1764, 0x0c9b69b6 1, 46800, 1764, 0x0c9b69b6
0, 50400, 98304, 0x63fb7dc1 0, 50400, 98304, 0x29c26bba
1, 50400, 1764, 0x8c3a758a 1, 50400, 1764, 0x8c3a758a
0, 54000, 98304, 0x37cf1601 0, 54000, 98304, 0x880a6313
1, 54000, 1764, 0x605d776a 1, 54000, 1764, 0x605d776a
0, 57600, 98304, 0x37cf1601 0, 57600, 98304, 0x73f5bb00
1, 57600, 1764, 0x0556852d 1, 57600, 1764, 0x0556852d
0, 61200, 98304, 0x37cf1601 0, 61200, 98304, 0xc85b19ec
1, 61200, 1764, 0x7d4363f8 1, 61200, 1764, 0x7d4363f8
0, 64800, 98304, 0x37cf1601 0, 64800, 98304, 0x00000000
1, 64800, 1764, 0xc5cd75d0 1, 64800, 1764, 0xc5cd75d0
0, 68400, 98304, 0x82941990 0, 68400, 98304, 0x00000000
1, 68400, 1764, 0x3ff3646d 1, 68400, 1764, 0x3ff3646d
0, 72000, 98304, 0x82941990 0, 72000, 98304, 0x00000000
1, 72000, 1764, 0x10136d25 1, 72000, 1764, 0x10136d25
0, 75600, 98304, 0x82941990
1, 75600, 1764, 0xeb1a6cd0 1, 75600, 1764, 0xeb1a6cd0
0, 79200, 98304, 0x82941990
1, 79200, 1764, 0xef937ed1 1, 79200, 1764, 0xef937ed1
0, 82800, 98304, 0xe0a5309e
1, 82800, 1764, 0x2d2b6f79 1, 82800, 1764, 0x2d2b6f79
0, 86400, 98304, 0xe0a5309e
1, 86400, 1764, 0x6f457231 1, 86400, 1764, 0x6f457231
0, 90000, 98304, 0xe0a5309e
1, 90000, 1764, 0x56267c9d 1, 90000, 1764, 0x56267c9d
0, 93600, 98304, 0x164cb67d
1, 93600, 1764, 0xd49e79c8 1, 93600, 1764, 0xd49e79c8
0, 97200, 98304, 0x164cb67d
1, 97200, 1764, 0xc726703d 1, 97200, 1764, 0xc726703d
0, 100800, 98304, 0x164cb67d
1, 100800, 1764, 0x2abf8074 1, 100800, 1764, 0x2abf8074
0, 104400, 98304, 0x164cb67d
1, 104400, 1764, 0xb50c556d 1, 104400, 1764, 0xb50c556d
0, 108000, 98304, 0xed2189f8
1, 108000, 1764, 0xc1f2523c 1, 108000, 1764, 0xc1f2523c
0, 111600, 98304, 0xed2189f8
1, 111600, 1764, 0x850a6f93 1, 111600, 1764, 0x850a6f93
0, 115200, 98304, 0xed2189f8
1, 115200, 1764, 0x8da76c31 1, 115200, 1764, 0x8da76c31
0, 118800, 98304, 0x7215e529
1, 118800, 1764, 0xfcccdf13 1, 118800, 1764, 0xfcccdf13
0, 122400, 98304, 0x7215e529
1, 122400, 1764, 0x00000000 1, 122400, 1764, 0x00000000
0, 126000, 98304, 0x7215e529
1, 126000, 1764, 0x00000000 1, 126000, 1764, 0x00000000
0, 129600, 98304, 0x7215e529
1, 129600, 1764, 0x00000000 1, 129600, 1764, 0x00000000
0, 133200, 98304, 0x170c783b
1, 133200, 1764, 0x00000000 1, 133200, 1764, 0x00000000
0, 136800, 98304, 0x170c783b
1, 136800, 1764, 0x00000000 1, 136800, 1764, 0x00000000
0, 140400, 98304, 0x170c783b
1, 140400, 1764, 0x00000000 1, 140400, 1764, 0x00000000
0, 144000, 98304, 0xf6bd74c7
1, 144000, 1764, 0x00000000 1, 144000, 1764, 0x00000000
0, 147600, 98304, 0xf6bd74c7
1, 147600, 1764, 0x00000000 1, 147600, 1764, 0x00000000
0, 151200, 98304, 0xf6bd74c7
1, 151200, 1764, 0x00000000 1, 151200, 1764, 0x00000000
0, 154800, 98304, 0xf6bd74c7
1, 154800, 1764, 0x00000000 1, 154800, 1764, 0x00000000
0, 158400, 98304, 0x1efd38c4
1, 158400, 1764, 0x00000000 1, 158400, 1764, 0x00000000
0, 162000, 98304, 0x1efd38c4
1, 162000, 1764, 0x00000000 1, 162000, 1764, 0x00000000
0, 165600, 98304, 0x1efd38c4
1, 165600, 1764, 0x00000000 1, 165600, 1764, 0x00000000
0, 169200, 98304, 0x1efd38c4
1, 169200, 1764, 0x00000000 1, 169200, 1764, 0x00000000
0, 172800, 98304, 0x29c26bba
1, 172800, 1764, 0x00000000 1, 172800, 1764, 0x00000000
0, 176400, 98304, 0x29c26bba
1, 176400, 1764, 0x00000000 1, 176400, 1764, 0x00000000
0, 180000, 98304, 0x29c26bba
1, 180000, 1764, 0x00000000 1, 180000, 1764, 0x00000000
0, 183600, 98304, 0x880a6313
1, 183600, 1764, 0x00000000 1, 183600, 1764, 0x00000000
0, 187200, 98304, 0x880a6313
1, 187200, 1764, 0x00000000 1, 187200, 1764, 0x00000000
0, 190800, 98304, 0x880a6313
1, 190800, 1764, 0x00000000 1, 190800, 1764, 0x00000000
0, 194400, 98304, 0x880a6313
1, 194400, 1764, 0x00000000 1, 194400, 1764, 0x00000000
0, 198000, 98304, 0x73f5bb00
1, 198000, 1764, 0x00000000 1, 198000, 1764, 0x00000000
0, 201600, 98304, 0x73f5bb00
1, 201600, 1764, 0x00000000 1, 201600, 1764, 0x00000000
0, 205200, 98304, 0x73f5bb00
1, 205200, 1764, 0x00000000 1, 205200, 1764, 0x00000000
0, 208800, 98304, 0xc85b19ec
1, 208800, 1764, 0x00000000 1, 208800, 1764, 0x00000000
0, 212400, 98304, 0xc85b19ec
1, 212400, 1764, 0x00000000 1, 212400, 1764, 0x00000000
0, 216000, 98304, 0xc85b19ec
1, 216000, 1764, 0x00000000 1, 216000, 1764, 0x00000000
0, 219600, 98304, 0xc85b19ec
1, 219600, 1764, 0x00000000 1, 219600, 1764, 0x00000000
0, 223200, 98304, 0x00000000
1, 223200, 1764, 0x00000000 1, 223200, 1764, 0x00000000
0, 226800, 98304, 0x00000000
1, 226800, 1764, 0x00000000 1, 226800, 1764, 0x00000000
0, 230400, 98304, 0x00000000
1, 230400, 1764, 0x00000000 1, 230400, 1764, 0x00000000
0, 234000, 98304, 0x00000000
1, 234000, 1764, 0x00000000 1, 234000, 1764, 0x00000000
0, 237600, 98304, 0x00000000
1, 237600, 1764, 0x00000000 1, 237600, 1764, 0x00000000
0, 241200, 98304, 0x00000000
1, 241200, 1764, 0x00000000 1, 241200, 1764, 0x00000000
0, 244800, 98304, 0x00000000
1, 244800, 1764, 0x00000000 1, 244800, 1764, 0x00000000
0, 248400, 98304, 0x00000000
1, 248400, 1764, 0x00000000 1, 248400, 1764, 0x00000000
0, 252000, 98304, 0x00000000
1, 252000, 1764, 0x00000000 1, 252000, 1764, 0x00000000
0, 255600, 98304, 0x00000000
1, 255600, 1764, 0x00000000 1, 255600, 1764, 0x00000000
0, 259200, 98304, 0x00000000
1, 259200, 1764, 0x00000000 1, 259200, 1764, 0x00000000
1, 262800, 1764, 0x00000000 1, 262800, 1764, 0x00000000
1, 266400, 1764, 0x00000000 1, 266400, 1764, 0x00000000
......
tests/ref/fate/tscc-32bit
View file @ 8e576d58
...@@ -9,152 +9,148 @@ ...@@ -9,152 +9,148 @@
0, 48000, 2359296, 0xe990f855 0, 48000, 2359296, 0xe990f855
0, 54000, 2359296, 0x3ec2c64e 0, 54000, 2359296, 0x3ec2c64e
0, 60000, 2359296, 0xda3ba3cf 0, 60000, 2359296, 0xda3ba3cf
0, 66000, 2359296, 0xda3ba3cf 0, 66000, 2359296, 0x60a070fd
0, 72000, 2359296, 0xda3ba3cf 0, 72000, 2359296, 0x42e5fedc
0, 78000, 2359296, 0xda3ba3cf 0, 78000, 2359296, 0x42e5fedc
0, 84000, 2359296, 0x60a070fd 0, 84000, 2359296, 0x699cf990
0, 90000, 2359296, 0x42e5fedc 0, 90000, 2359296, 0x699cf990
0, 96000, 2359296, 0x42e5fedc 0, 96000, 2359296, 0x699cf990
0, 102000, 2359296, 0x699cf990 0, 102000, 2359296, 0x699cf990
0, 108000, 2359296, 0x699cf990 0, 108000, 2359296, 0x699cf990
0, 114000, 2359296, 0x699cf990 0, 114000, 2359296, 0x699cf990
0, 120000, 2359296, 0x699cf990 0, 120000, 2359296, 0x699cf990
0, 126000, 2359296, 0x699cf990 0, 126000, 2359296, 0x1524160c
0, 132000, 2359296, 0x699cf990 0, 132000, 2359296, 0x1524160c
0, 138000, 2359296, 0x699cf990 0, 138000, 2359296, 0x1524160c
0, 144000, 2359296, 0x1524160c 0, 144000, 2359296, 0x1524160c
0, 150000, 2359296, 0x1524160c 0, 150000, 2359296, 0x1524160c
0, 156000, 2359296, 0x1524160c 0, 156000, 2359296, 0x1524160c
0, 162000, 2359296, 0x1524160c 0, 162000, 2359296, 0x1524160c
0, 168000, 2359296, 0x1524160c 0, 168000, 2359296, 0x33df0c8c
0, 174000, 2359296, 0x1524160c 0, 174000, 2359296, 0x33df0c8c
0, 180000, 2359296, 0x1524160c 0, 180000, 2359296, 0x33df0c8c
0, 186000, 2359296, 0x33df0c8c 0, 186000, 2359296, 0x33df0c8c
0, 192000, 2359296, 0x33df0c8c 0, 192000, 2359296, 0x33df0c8c
0, 198000, 2359296, 0x33df0c8c 0, 198000, 2359296, 0x33df0c8c
0, 204000, 2359296, 0x33df0c8c 0, 204000, 2359296, 0x33df0c8c
0, 210000, 2359296, 0x33df0c8c 0, 210000, 2359296, 0xfe3d29f8
0, 216000, 2359296, 0x33df0c8c 0, 216000, 2359296, 0xfe3d29f8
0, 222000, 2359296, 0x33df0c8c 0, 222000, 2359296, 0xfe3d29f8
0, 228000, 2359296, 0xfe3d29f8 0, 228000, 2359296, 0xfe3d29f8
0, 234000, 2359296, 0xfe3d29f8 0, 234000, 2359296, 0xfe3d29f8
0, 240000, 2359296, 0xfe3d29f8 0, 240000, 2359296, 0xfe3d29f8
0, 246000, 2359296, 0xfe3d29f8 0, 246000, 2359296, 0xfe3d29f8
0, 252000, 2359296, 0xfe3d29f8 0, 252000, 2359296, 0x1b9d197f
0, 258000, 2359296, 0xfe3d29f8 0, 258000, 2359296, 0x1b9d197f
0, 264000, 2359296, 0xfe3d29f8 0, 264000, 2359296, 0x1b9d197f
0, 270000, 2359296, 0x1b9d197f 0, 270000, 2359296, 0x1b9d197f
0, 276000, 2359296, 0x1b9d197f 0, 276000, 2359296, 0x1b9d197f
0, 282000, 2359296, 0x1b9d197f 0, 282000, 2359296, 0x1b9d197f
0, 288000, 2359296, 0x1b9d197f 0, 288000, 2359296, 0x1b9d197f
0, 294000, 2359296, 0x1b9d197f 0, 294000, 2359296, 0x48c126fb
0, 300000, 2359296, 0x1b9d197f 0, 300000, 2359296, 0x48c126fb
0, 306000, 2359296, 0x1b9d197f 0, 306000, 2359296, 0x48c126fb
0, 312000, 2359296, 0x48c126fb 0, 312000, 2359296, 0x48c126fb
0, 318000, 2359296, 0x48c126fb 0, 318000, 2359296, 0x48c126fb
0, 324000, 2359296, 0x48c126fb 0, 324000, 2359296, 0x48c126fb
0, 330000, 2359296, 0x48c126fb 0, 330000, 2359296, 0x48c126fb
0, 336000, 2359296, 0x48c126fb 0, 336000, 2359296, 0xcaa31c7c
0, 342000, 2359296, 0x48c126fb 0, 342000, 2359296, 0xcaa31c7c
0, 348000, 2359296, 0x48c126fb 0, 348000, 2359296, 0xcaa31c7c
0, 354000, 2359296, 0xcaa31c7c 0, 354000, 2359296, 0xcaa31c7c
0, 360000, 2359296, 0xcaa31c7c 0, 360000, 2359296, 0xcaa31c7c
0, 366000, 2359296, 0xcaa31c7c 0, 366000, 2359296, 0xcaa31c7c
0, 372000, 2359296, 0xcaa31c7c 0, 372000, 2359296, 0xcaa31c7c
0, 378000, 2359296, 0xcaa31c7c 0, 378000, 2359296, 0xc6a333ee
0, 384000, 2359296, 0xcaa31c7c 0, 384000, 2359296, 0xc6a333ee
0, 390000, 2359296, 0xcaa31c7c 0, 390000, 2359296, 0xc6a333ee
0, 396000, 2359296, 0xc6a333ee 0, 396000, 2359296, 0xc6a333ee
0, 402000, 2359296, 0xc6a333ee 0, 402000, 2359296, 0xc6a333ee
0, 408000, 2359296, 0xc6a333ee 0, 408000, 2359296, 0xc6a333ee
0, 414000, 2359296, 0xc6a333ee 0, 414000, 2359296, 0xc6a333ee
0, 420000, 2359296, 0xc6a333ee 0, 420000, 2359296, 0xb96d1583
0, 426000, 2359296, 0xc6a333ee 0, 426000, 2359296, 0xb96d1583
0, 432000, 2359296, 0xc6a333ee 0, 432000, 2359296, 0xb96d1583
0, 438000, 2359296, 0xb96d1583 0, 438000, 2359296, 0xb96d1583
0, 444000, 2359296, 0xb96d1583 0, 444000, 2359296, 0xb96d1583
0, 450000, 2359296, 0xb96d1583 0, 450000, 2359296, 0xb96d1583
0, 456000, 2359296, 0xb96d1583 0, 456000, 2359296, 0xb96d1583
0, 462000, 2359296, 0xb96d1583 0, 462000, 2359296, 0x878135ec
0, 468000, 2359296, 0xb96d1583 0, 468000, 2359296, 0x878135ec
0, 474000, 2359296, 0xb96d1583 0, 474000, 2359296, 0x878135ec
0, 480000, 2359296, 0x878135ec 0, 480000, 2359296, 0x878135ec
0, 486000, 2359296, 0x878135ec 0, 486000, 2359296, 0x878135ec
0, 492000, 2359296, 0x878135ec 0, 492000, 2359296, 0x878135ec
0, 498000, 2359296, 0x878135ec 0, 498000, 2359296, 0x878135ec
0, 504000, 2359296, 0x878135ec 0, 504000, 2359296, 0x76922870
0, 510000, 2359296, 0x878135ec 0, 510000, 2359296, 0x76922870
0, 516000, 2359296, 0x878135ec 0, 516000, 2359296, 0x76922870
0, 522000, 2359296, 0x878135ec 0, 522000, 2359296, 0x76922870
0, 528000, 2359296, 0x76922870 0, 528000, 2359296, 0x76922870
0, 534000, 2359296, 0x76922870 0, 534000, 2359296, 0x76922870
0, 540000, 2359296, 0x76922870 0, 540000, 2359296, 0x76922870
0, 546000, 2359296, 0x76922870 0, 546000, 2359296, 0xb0e031f0
0, 552000, 2359296, 0x76922870 0, 552000, 2359296, 0xb0e031f0
0, 558000, 2359296, 0x76922870 0, 558000, 2359296, 0xb0e031f0
0, 564000, 2359296, 0x76922870 0, 564000, 2359296, 0xb0e031f0
0, 570000, 2359296, 0xb0e031f0 0, 570000, 2359296, 0xb0e031f0
0, 576000, 2359296, 0xb0e031f0 0, 576000, 2359296, 0xb0e031f0
0, 582000, 2359296, 0xb0e031f0 0, 582000, 2359296, 0xb0e031f0
0, 588000, 2359296, 0xb0e031f0 0, 588000, 2359296, 0xb2ef2a6e
0, 594000, 2359296, 0xb0e031f0 0, 594000, 2359296, 0xb2ef2a6e
0, 600000, 2359296, 0xb0e031f0 0, 600000, 2359296, 0xb2ef2a6e
0, 606000, 2359296, 0xb0e031f0 0, 606000, 2359296, 0x083c2474
0, 612000, 2359296, 0xb2ef2a6e 0, 612000, 2359296, 0x083c2474
0, 618000, 2359296, 0xb2ef2a6e 0, 618000, 2359296, 0x083c2474
0, 624000, 2359296, 0xb2ef2a6e 0, 624000, 2359296, 0x083c2474
0, 630000, 2359296, 0x083c2474 0, 630000, 2359296, 0xbdfe2ef3
0, 636000, 2359296, 0x083c2474 0, 636000, 2359296, 0xbdfe2ef3
0, 642000, 2359296, 0x083c2474 0, 642000, 2359296, 0xbdfe2ef3
0, 648000, 2359296, 0x083c2474 0, 648000, 2359296, 0xbdfe2ef3
0, 654000, 2359296, 0xbdfe2ef3 0, 654000, 2359296, 0xbdfe2ef3
0, 660000, 2359296, 0xbdfe2ef3 0, 660000, 2359296, 0xbdfe2ef3
0, 666000, 2359296, 0xbdfe2ef3 0, 666000, 2359296, 0xbdfe2ef3
0, 672000, 2359296, 0xbdfe2ef3 0, 672000, 2359296, 0x934b1484
0, 678000, 2359296, 0xbdfe2ef3 0, 678000, 2359296, 0x934b1484
0, 684000, 2359296, 0xbdfe2ef3 0, 684000, 2359296, 0x934b1484
0, 690000, 2359296, 0xbdfe2ef3 0, 690000, 2359296, 0x934b1484
0, 696000, 2359296, 0x934b1484 0, 696000, 2359296, 0x3e0d1a7e
0, 702000, 2359296, 0x934b1484 0, 702000, 2359296, 0x3e0d1a7e
0, 708000, 2359296, 0x934b1484 0, 708000, 2359296, 0x3e0d1a7e
0, 714000, 2359296, 0x934b1484 0, 714000, 2359296, 0x3ce539e8
0, 720000, 2359296, 0x3e0d1a7e 0, 720000, 2359296, 0x3ce539e8
0, 726000, 2359296, 0x3e0d1a7e 0, 726000, 2359296, 0x3ce539e8
0, 732000, 2359296, 0x3e0d1a7e 0, 732000, 2359296, 0x3ce539e8
0, 738000, 2359296, 0x3ce539e8 0, 738000, 2359296, 0x3ce539e8
0, 744000, 2359296, 0x3ce539e8 0, 744000, 2359296, 0x3ce539e8
0, 750000, 2359296, 0x3ce539e8 0, 750000, 2359296, 0x3ce539e8
0, 756000, 2359296, 0x3ce539e8 0, 756000, 2359296, 0xd46c2f69
0, 762000, 2359296, 0x3ce539e8 0, 762000, 2359296, 0xd46c2f69
0, 768000, 2359296, 0x3ce539e8 0, 768000, 2359296, 0xd46c2f69
0, 774000, 2359296, 0x3ce539e8 0, 774000, 2359296, 0xd46c2f69
0, 780000, 2359296, 0xd46c2f69 0, 780000, 2359296, 0xd46c2f69
0, 786000, 2359296, 0xd46c2f69 0, 786000, 2359296, 0xd46c2f69
0, 792000, 2359296, 0xd46c2f69 0, 792000, 2359296, 0xd46c2f69
0, 798000, 2359296, 0xd46c2f69 0, 798000, 2359296, 0x8d2933ee
0, 804000, 2359296, 0xd46c2f69 0, 804000, 2359296, 0x8d2933ee
0, 810000, 2359296, 0xd46c2f69 0, 810000, 2359296, 0x8d2933ee
0, 816000, 2359296, 0xd46c2f69 0, 816000, 2359296, 0x8d2933ee
0, 822000, 2359296, 0x8d2933ee 0, 822000, 2359296, 0x8d2933ee
0, 828000, 2359296, 0x8d2933ee 0, 828000, 2359296, 0x8d2933ee
0, 834000, 2359296, 0x8d2933ee 0, 834000, 2359296, 0x8d2933ee
0, 840000, 2359296, 0x8d2933ee 0, 840000, 2359296, 0xb6092b6d
0, 846000, 2359296, 0x8d2933ee 0, 846000, 2359296, 0xb6092b6d
0, 852000, 2359296, 0x8d2933ee 0, 852000, 2359296, 0xb6092b6d
0, 858000, 2359296, 0x8d2933ee 0, 858000, 2359296, 0xb6092b6d
0, 864000, 2359296, 0xb6092b6d 0, 864000, 2359296, 0xb6092b6d
0, 870000, 2359296, 0xb6092b6d 0, 870000, 2359296, 0xb6092b6d
0, 876000, 2359296, 0xb6092b6d 0, 876000, 2359296, 0xb6092b6d
0, 882000, 2359296, 0xb6092b6d 0, 882000, 2359296, 0xe4ef27fa
0, 888000, 2359296, 0xb6092b6d 0, 888000, 2359296, 0xe4ef27fa
0, 894000, 2359296, 0xb6092b6d 0, 894000, 2359296, 0xe4ef27fa
0, 900000, 2359296, 0xb6092b6d 0, 900000, 2359296, 0xe4ef27fa
0, 906000, 2359296, 0xe4ef27fa 0, 906000, 2359296, 0xe4ef27fa
0, 912000, 2359296, 0xe4ef27fa 0, 912000, 2359296, 0xe4ef27fa
0, 918000, 2359296, 0xe4ef27fa 0, 918000, 2359296, 0xe4ef27fa
0, 924000, 2359296, 0xe4ef27fa 0, 924000, 2359296, 0x5e5b2672
0, 930000, 2359296, 0xe4ef27fa 0, 930000, 2359296, 0x5e5b2672
0, 936000, 2359296, 0xe4ef27fa
0, 942000, 2359296, 0xe4ef27fa
0, 948000, 2359296, 0x5e5b2672
0, 954000, 2359296, 0x5e5b2672
tests/ref/fate/vmnc-32bit
View file @ 8e576d58
...@@ -2,171 +2,48 @@ ...@@ -2,171 +2,48 @@
0, 18000, 3655644, 0x87973530 0, 18000, 3655644, 0x87973530
0, 36000, 3655644, 0x3c3167fd 0, 36000, 3655644, 0x3c3167fd
0, 54000, 3655644, 0x87973530 0, 54000, 3655644, 0x87973530
0, 72000, 3655644, 0x87973530 0, 72000, 3655644, 0x3c3167fd
0, 90000, 3655644, 0x87973530 0, 90000, 3655644, 0x87973530
0, 108000, 3655644, 0x3c3167fd 0, 108000, 3655644, 0x87973530
0, 126000, 3655644, 0x3c3167fd 0, 126000, 3655644, 0x3c3167fd
0, 144000, 3655644, 0x87973530 0, 144000, 3655644, 0x87973530
0, 162000, 3655644, 0x87973530 0, 162000, 3655644, 0x4f0da763
0, 180000, 3655644, 0x87973530 0, 180000, 3655644, 0x66a4a763
0, 198000, 3655644, 0x87973530 0, 198000, 3655644, 0xb20a7496
0, 216000, 3655644, 0x3c3167fd 0, 216000, 3655644, 0x66a4a763
0, 234000, 3655644, 0x87973530 0, 234000, 3655644, 0x5600644a
0, 252000, 3655644, 0x87973530 0, 252000, 3655644, 0xce5880ee
0, 270000, 3655644, 0x87973530 0, 270000, 3655644, 0xa993ef3d
0, 288000, 3655644, 0x4f0da763 0, 288000, 3655644, 0x73564014
0, 306000, 3655644, 0x4f0da763 0, 306000, 3655644, 0x2a6e1e8c
0, 324000, 3655644, 0x4f0da763 0, 324000, 3655644, 0xbae02e7c
0, 342000, 3655644, 0x66a4a763 0, 342000, 3655644, 0x55af4a2d
0, 360000, 3655644, 0xb20a7496 0, 360000, 3655644, 0x54b7ff2d
0, 378000, 3655644, 0x66a4a763 0, 378000, 3655644, 0x39af1aed
0, 396000, 3655644, 0x66a4a763 0, 396000, 3655644, 0xe48dd11c
0, 414000, 3655644, 0x66a4a763 0, 414000, 3655644, 0xba15c78d
0, 432000, 3655644, 0x5600644a 0, 432000, 3655644, 0x39af1aed
0, 450000, 3655644, 0xce5880ee 0, 450000, 3655644, 0x27f96cd8
0, 468000, 3655644, 0xce5880ee 0, 468000, 3655644, 0xf4f068dc
0, 486000, 3655644, 0xa993ef3d 0, 486000, 3655644, 0xf1c55cf5
0, 504000, 3655644, 0xa993ef3d 0, 504000, 3655644, 0xd932633d
0, 522000, 3655644, 0xa993ef3d 0, 522000, 3655644, 0xc6e95e0a
0, 540000, 3655644, 0xa993ef3d 0, 540000, 3655644, 0x9a63c9de
0, 558000, 3655644, 0xa993ef3d 0, 558000, 3655644, 0xf166ad4f
0, 576000, 3655644, 0xa993ef3d 0, 576000, 3655644, 0xe9eeba41
0, 594000, 3655644, 0xa993ef3d 0, 594000, 3655644, 0x7e598ad7
0, 612000, 3655644, 0xa993ef3d 0, 612000, 3655644, 0xf3bd257e
0, 630000, 3655644, 0xa993ef3d 0, 630000, 3655644, 0xf35b3852
0, 648000, 3655644, 0xa993ef3d 0, 648000, 3655644, 0x9d553959
0, 666000, 3655644, 0xa993ef3d 0, 666000, 3655644, 0x0a9de8e2
0, 684000, 3655644, 0xa993ef3d 0, 684000, 3655644, 0xf2325b6c
0, 702000, 3655644, 0xa993ef3d 0, 702000, 3655644, 0xcf924028
0, 720000, 3655644, 0xa993ef3d 0, 720000, 3655644, 0x8dae55bc
0, 738000, 3655644, 0xa993ef3d 0, 738000, 3655644, 0x57b08ced
0, 756000, 3655644, 0xa993ef3d 0, 756000, 3655644, 0xef89a1d8
0, 774000, 3655644, 0xa993ef3d 0, 774000, 3655644, 0x69e5503a
0, 792000, 3655644, 0xa993ef3d 0, 792000, 3655644, 0xc3de7b3f
0, 810000, 3655644, 0xa993ef3d 0, 810000, 3655644, 0x88eea64a
0, 828000, 3655644, 0xa993ef3d 0, 828000, 3655644, 0xe39cce1f
0, 846000, 3655644, 0xa993ef3d 0, 846000, 3655644, 0xf0ed0d04
0, 864000, 3655644, 0xa993ef3d 0, 864000, 3655644, 0x32490d3e
0, 882000, 3655644, 0xa993ef3d
0, 900000, 3655644, 0x73564014
0, 918000, 3655644, 0x73564014
0, 936000, 3655644, 0x73564014
0, 954000, 3655644, 0x73564014
0, 972000, 3655644, 0x73564014
0, 990000, 3655644, 0x73564014
0, 1008000, 3655644, 0x73564014
0, 1026000, 3655644, 0x73564014
0, 1044000, 3655644, 0x73564014
0, 1062000, 3655644, 0x73564014
0, 1080000, 3655644, 0x73564014
0, 1098000, 3655644, 0x73564014
0, 1116000, 3655644, 0x2a6e1e8c
0, 1134000, 3655644, 0x2a6e1e8c
0, 1152000, 3655644, 0x2a6e1e8c
0, 1170000, 3655644, 0xbae02e7c
0, 1188000, 3655644, 0xbae02e7c
0, 1206000, 3655644, 0xbae02e7c
0, 1224000, 3655644, 0xbae02e7c
0, 1242000, 3655644, 0x55af4a2d
0, 1260000, 3655644, 0x55af4a2d
0, 1278000, 3655644, 0x55af4a2d
0, 1296000, 3655644, 0x55af4a2d
0, 1314000, 3655644, 0x54b7ff2d
0, 1332000, 3655644, 0x39af1aed
0, 1350000, 3655644, 0x39af1aed
0, 1368000, 3655644, 0x39af1aed
0, 1386000, 3655644, 0x39af1aed
0, 1404000, 3655644, 0xe48dd11c
0, 1422000, 3655644, 0xe48dd11c
0, 1440000, 3655644, 0xe48dd11c
0, 1458000, 3655644, 0xe48dd11c
0, 1476000, 3655644, 0xe48dd11c
0, 1494000, 3655644, 0xba15c78d
0, 1512000, 3655644, 0xba15c78d
0, 1530000, 3655644, 0xba15c78d
0, 1548000, 3655644, 0xba15c78d
0, 1566000, 3655644, 0xba15c78d
0, 1584000, 3655644, 0xba15c78d
0, 1602000, 3655644, 0xba15c78d
0, 1620000, 3655644, 0x39af1aed
0, 1638000, 3655644, 0x39af1aed
0, 1656000, 3655644, 0x39af1aed
0, 1674000, 3655644, 0x39af1aed
0, 1692000, 3655644, 0x39af1aed
0, 1710000, 3655644, 0x39af1aed
0, 1728000, 3655644, 0x39af1aed
0, 1746000, 3655644, 0x27f96cd8
0, 1764000, 3655644, 0x27f96cd8
0, 1782000, 3655644, 0x27f96cd8
0, 1800000, 3655644, 0x27f96cd8
0, 1818000, 3655644, 0x27f96cd8
0, 1836000, 3655644, 0x27f96cd8
0, 1854000, 3655644, 0x27f96cd8
0, 1872000, 3655644, 0xf4f068dc
0, 1890000, 3655644, 0xf4f068dc
0, 1908000, 3655644, 0xf4f068dc
0, 1926000, 3655644, 0xf4f068dc
0, 1944000, 3655644, 0xf4f068dc
0, 1962000, 3655644, 0xf4f068dc
0, 1980000, 3655644, 0xf4f068dc
0, 1998000, 3655644, 0xf1c55cf5
0, 2016000, 3655644, 0xd932633d
0, 2034000, 3655644, 0xd932633d
0, 2052000, 3655644, 0xc6e95e0a
0, 2070000, 3655644, 0x9a63c9de
0, 2088000, 3655644, 0xf166ad4f
0, 2106000, 3655644, 0xe9eeba41
0, 2124000, 3655644, 0x7e598ad7
0, 2142000, 3655644, 0xf3bd257e
0, 2160000, 3655644, 0xf3bd257e
0, 2178000, 3655644, 0xf3bd257e
0, 2196000, 3655644, 0xf3bd257e
0, 2214000, 3655644, 0xf3bd257e
0, 2232000, 3655644, 0xf35b3852
0, 2250000, 3655644, 0xf35b3852
0, 2268000, 3655644, 0xf35b3852
0, 2286000, 3655644, 0xf35b3852
0, 2304000, 3655644, 0x9d553959
0, 2322000, 3655644, 0x0a9de8e2
0, 2340000, 3655644, 0xf2325b6c
0, 2358000, 3655644, 0xf2325b6c
0, 2376000, 3655644, 0xf2325b6c
0, 2394000, 3655644, 0xf2325b6c
0, 2412000, 3655644, 0xf2325b6c
0, 2430000, 3655644, 0xf2325b6c
0, 2448000, 3655644, 0xcf924028
0, 2466000, 3655644, 0xcf924028
0, 2484000, 3655644, 0x8dae55bc
0, 2502000, 3655644, 0x8dae55bc
0, 2520000, 3655644, 0x57b08ced
0, 2538000, 3655644, 0x57b08ced
0, 2556000, 3655644, 0xef89a1d8
0, 2574000, 3655644, 0xef89a1d8
0, 2592000, 3655644, 0x69e5503a
0, 2610000, 3655644, 0x69e5503a
0, 2628000, 3655644, 0xc3de7b3f
0, 2646000, 3655644, 0xc3de7b3f
0, 2664000, 3655644, 0x88eea64a
0, 2682000, 3655644, 0x88eea64a
0, 2700000, 3655644, 0xe39cce1f
0, 2718000, 3655644, 0xe39cce1f
0, 2736000, 3655644, 0xe39cce1f
0, 2754000, 3655644, 0xe39cce1f
0, 2772000, 3655644, 0xe39cce1f
0, 2790000, 3655644, 0xe39cce1f
0, 2808000, 3655644, 0xe39cce1f
0, 2826000, 3655644, 0xe39cce1f
0, 2844000, 3655644, 0xe39cce1f
0, 2862000, 3655644, 0xe39cce1f
0, 2880000, 3655644, 0xe39cce1f
0, 2898000, 3655644, 0xe39cce1f
0, 2916000, 3655644, 0xe39cce1f
0, 2934000, 3655644, 0xf0ed0d04
0, 2952000, 3655644, 0xf0ed0d04
0, 2970000, 3655644, 0xf0ed0d04
0, 2988000, 3655644, 0xf0ed0d04
0, 3006000, 3655644, 0x32490d3e
0, 3024000, 3655644, 0x32490d3e
0, 3042000, 3655644, 0x32490d3e
0, 3060000, 3655644, 0x32490d3e
0, 3078000, 3655644, 0x32490d3e
tests/ref/fate/vp8-sign-bias
View file @ 8e576d58
0, 0, 614880, 12ce23b288485be3ddbc1db28c21517f 0, 0, 614880, 12ce23b288485be3ddbc1db28c21517f
0, 3750, 614880, ce352e1079535ea058c0e9ad50f7cdb8 0, 3750, 614880, ce352e1079535ea058c0e9ad50f7cdb8
0, 7500, 614880, ce352e1079535ea058c0e9ad50f7cdb8 0, 7500, 614880, 9f6bf2739a027dfd12c81586cf75d3a3
0, 11250, 614880, 9f6bf2739a027dfd12c81586cf75d3a3 0, 11250, 614880, 7593a85ab7790eb39d65fc53f769ed8b
0, 15000, 614880, 7593a85ab7790eb39d65fc53f769ed8b 0, 15000, 614880, 52f47f1e0348f3297d9f233fb5405e8b
0, 18750, 614880, 52f47f1e0348f3297d9f233fb5405e8b 0, 18750, 614880, cd51d2c200bfd66e8e1b0fd6b404570f
0, 22500, 614880, cd51d2c200bfd66e8e1b0fd6b404570f 0, 22500, 614880, cf535cf0a53e903cd98a9a944b72da6d
0, 26250, 614880, cf535cf0a53e903cd98a9a944b72da6d 0, 26250, 614880, 1b270fd2b56daa7892102c2885d23201
0, 30000, 614880, 1b270fd2b56daa7892102c2885d23201 0, 30000, 614880, ff373c0c8a4a319c84e72b1c3d76b399
0, 33750, 614880, ff373c0c8a4a319c84e72b1c3d76b399
tests/ref/fate/wmv8-drm
View file @ 8e576d58
0, 0, 84480, 0x7760a00b 0, 0, 84480, 0x7760a00b
0, 3750, 84480, 0xfe39a1db 0, 3750, 84480, 0xfe39a1db
0, 7500, 84480, 0xfe39a1db 0, 7500, 84480, 0xd71961b4
0, 11250, 84480, 0xfe39a1db 0, 11250, 84480, 0xc80dedba
0, 15000, 84480, 0xfe39a1db 0, 15000, 84480, 0x34d8b538
0, 18750, 84480, 0xfe39a1db 0, 18750, 84480, 0x1a86b8e5
0, 22500, 84480, 0xfe39a1db 0, 22500, 84480, 0xabf7c25d
0, 26250, 84480, 0xfe39a1db 0, 26250, 84480, 0x912600ee
0, 30000, 84480, 0xfe39a1db 0, 30000, 84480, 0x7ee7c70b
0, 33750, 84480, 0xfe39a1db 0, 33750, 84480, 0x09c5b0d1
0, 37500, 84480, 0xfe39a1db 0, 37500, 84480, 0x6dbe6c0c
0, 41250, 84480, 0xfe39a1db 0, 41250, 84480, 0x0fe0a120
0, 45000, 84480, 0xfe39a1db 0, 45000, 84480, 0x2352d3a2
0, 48750, 84480, 0xfe39a1db 0, 48750, 84480, 0xb22ce92e
0, 52500, 84480, 0xfe39a1db 0, 52500, 84480, 0x31db0099
0, 56250, 84480, 0xfe39a1db 0, 56250, 84480, 0xad2dd73a
0, 60000, 84480, 0xfe39a1db 0, 60000, 84480, 0xb9af8e20
0, 63750, 84480, 0xfe39a1db 0, 63750, 84480, 0x7b956549
0, 67500, 84480, 0xfe39a1db 0, 67500, 84480, 0x3f774b87
0, 71250, 84480, 0xfe39a1db 0, 71250, 84480, 0x824a23a3
0, 75000, 84480, 0xfe39a1db 0, 75000, 84480, 0x4469a8d8
0, 78750, 84480, 0xfe39a1db 0, 78750, 84480, 0xc80c7a0a
0, 82500, 84480, 0xfe39a1db 0, 82500, 84480, 0xcf958549
0, 86250, 84480, 0xfe39a1db 0, 86250, 84480, 0x449746e3
0, 90000, 84480, 0xfe39a1db 0, 90000, 84480, 0xbac66a82
0, 93750, 84480, 0xfe39a1db 0, 93750, 84480, 0x99e85855
0, 97500, 84480, 0xfe39a1db 0, 97500, 84480, 0xa4a17d17
0, 101250, 84480, 0xfe39a1db 0, 101250, 84480, 0xe29c7587
0, 105000, 84480, 0xfe39a1db 0, 105000, 84480, 0x551de592
0, 108750, 84480, 0xd71961b4 0, 108750, 84480, 0xe0877bce
0, 112500, 84480, 0xc80dedba 0, 112500, 84480, 0x9660eb35
0, 116250, 84480, 0x34d8b538 0, 116250, 84480, 0x0a34b644
0, 120000, 84480, 0x1a86b8e5 0, 120000, 84480, 0x352919f0
0, 123750, 84480, 0xabf7c25d 0, 123750, 84480, 0xef56ce27
0, 127500, 84480, 0x912600ee 0, 127500, 84480, 0x030fe862
0, 131250, 84480, 0x7ee7c70b 0, 131250, 84480, 0x2eba33e2
0, 135000, 84480, 0x09c5b0d1 0, 135000, 84480, 0x242de401
0, 138750, 84480, 0x6dbe6c0c 0, 138750, 84480, 0xbadd61ca
0, 142500, 84480, 0x0fe0a120 0, 142500, 84480, 0x2060465b
0, 146250, 84480, 0x2352d3a2 0, 146250, 84480, 0x256e6965
0, 150000, 84480, 0xb22ce92e 0, 150000, 84480, 0x243b7084
0, 153750, 84480, 0x31db0099 0, 153750, 84480, 0x8b3c0b47
0, 157500, 84480, 0xad2dd73a 0, 157500, 84480, 0xc174a9af
0, 161250, 84480, 0xb9af8e20 0, 161250, 84480, 0xb6d48686
0, 165000, 84480, 0x7b956549 0, 165000, 84480, 0xa3dd1871
0, 168750, 84480, 0x3f774b87 0, 168750, 84480, 0x04cdcaf7
0, 172500, 84480, 0x824a23a3 0, 172500, 84480, 0x55f89c94
0, 176250, 84480, 0x4469a8d8 0, 176250, 84480, 0xda657032
0, 180000, 84480, 0xc80c7a0a 0, 180000, 84480, 0x38ba7698
0, 183750, 84480, 0xcf958549 0, 183750, 84480, 0x4d03a7f2
0, 187500, 84480, 0x449746e3 0, 187500, 84480, 0x115d9035
0, 191250, 84480, 0xbac66a82 0, 191250, 84480, 0x24c6acc6
0, 195000, 84480, 0x99e85855 0, 195000, 84480, 0xdd2bbcae
0, 198750, 84480, 0xa4a17d17 0, 198750, 84480, 0xb4fee0b9
0, 202500, 84480, 0xe29c7587 0, 202500, 84480, 0xc51c14e0
0, 206250, 84480, 0x551de592 0, 206250, 84480, 0xfb7737de
0, 210000, 84480, 0xe0877bce 0, 210000, 84480, 0x38675fb0
0, 213750, 84480, 0x9660eb35 0, 213750, 84480, 0x4752c710
0, 217500, 84480, 0x0a34b644 0, 217500, 84480, 0xfeb7491b
0, 221250, 84480, 0x352919f0 0, 221250, 84480, 0xaa248122
0, 225000, 84480, 0xef56ce27 0, 225000, 84480, 0x9a4af87c
0, 228750, 84480, 0x030fe862 0, 228750, 84480, 0xedcf09df
0, 232500, 84480, 0x2eba33e2 0, 232500, 84480, 0x563a05df
0, 236250, 84480, 0x242de401 0, 236250, 84480, 0x0dde1e03
0, 240000, 84480, 0xbadd61ca 0, 240000, 84480, 0xd8f0ff65
0, 243750, 84480, 0x2060465b 0, 243750, 84480, 0xbeb9ae1a
0, 247500, 84480, 0x256e6965 0, 247500, 84480, 0x416d1468
0, 251250, 84480, 0x243b7084 0, 251250, 84480, 0x66c87d4c
0, 255000, 84480, 0x8b3c0b47 0, 255000, 84480, 0xa67c0774
0, 258750, 84480, 0xc174a9af 0, 258750, 84480, 0xd8f8aec1
0, 262500, 84480, 0xb6d48686 0, 262500, 84480, 0xadfa502b
0, 266250, 84480, 0xa3dd1871 0, 266250, 84480, 0x50bf20e4
0, 270000, 84480, 0x04cdcaf7 0, 270000, 84480, 0xbcb3d8cc
0, 273750, 84480, 0x55f89c94 0, 273750, 84480, 0xa54677d7
0, 277500, 84480, 0xda657032 0, 277500, 84480, 0x3566042d
0, 281250, 84480, 0x38ba7698 0, 281250, 84480, 0x4c9eed57
0, 285000, 84480, 0x4d03a7f2 0, 285000, 84480, 0xc3b90e58
0, 288750, 84480, 0x115d9035 0, 288750, 84480, 0x3c042bfa
0, 292500, 84480, 0x24c6acc6 0, 292500, 84480, 0x19f8e890
0, 296250, 84480, 0xdd2bbcae 0, 296250, 84480, 0xd3dacfb9
0, 300000, 84480, 0xb4fee0b9 0, 300000, 84480, 0x2365fc6f
0, 303750, 84480, 0xc51c14e0 0, 303750, 84480, 0xa2c19d00
0, 307500, 84480, 0xfb7737de 0, 307500, 84480, 0xce94336f
0, 311250, 84480, 0x38675fb0 0, 311250, 84480, 0xfa9bcf14
0, 315000, 84480, 0x4752c710 0, 315000, 84480, 0x24d6a243
0, 318750, 84480, 0xfeb7491b 0, 318750, 84480, 0xae1c8854
0, 322500, 84480, 0xaa248122 0, 322500, 84480, 0xbb8968bf
0, 326250, 84480, 0x9a4af87c 0, 326250, 84480, 0x6f923623
0, 330000, 84480, 0xedcf09df 0, 330000, 84480, 0x22e98029
0, 333750, 84480, 0x563a05df 0, 333750, 84480, 0x8ac33af3
0, 337500, 84480, 0x0dde1e03 0, 337500, 84480, 0x05947b6e
0, 341250, 84480, 0xd8f0ff65 0, 341250, 84480, 0xfc35661a
0, 345000, 84480, 0xbeb9ae1a 0, 345000, 84480, 0x0e6b6e47
0, 348750, 84480, 0x416d1468 0, 348750, 84480, 0x82c764bb
0, 352500, 84480, 0x66c87d4c 0, 352500, 84480, 0x57a36833
0, 356250, 84480, 0xa67c0774 0, 356250, 84480, 0xc8dd690a
0, 360000, 84480, 0xd8f8aec1 0, 360000, 84480, 0x02c47232
0, 363750, 84480, 0xadfa502b 0, 363750, 84480, 0x6645715d
0, 367500, 84480, 0x50bf20e4 0, 367500, 84480, 0xc64860f7
0, 371250, 84480, 0xbcb3d8cc 0, 371250, 84480, 0x4f5614b3
0, 375000, 84480, 0xa54677d7 0, 375000, 84480, 0xa70842ca
0, 378750, 84480, 0x3566042d 0, 378750, 84480, 0x379d8458
0, 382500, 84480, 0x4c9eed57 0, 382500, 84480, 0xa14701cf
0, 386250, 84480, 0xc3b90e58 0, 386250, 84480, 0xad1aa2b2
0, 390000, 84480, 0x3c042bfa 0, 390000, 84480, 0xee28f320
0, 393750, 84480, 0x19f8e890 0, 393750, 84480, 0x505801e9
0, 397500, 84480, 0xd3dacfb9 0, 397500, 84480, 0x7947233b
0, 401250, 84480, 0x2365fc6f 0, 401250, 84480, 0x3ce72a9d
0, 405000, 84480, 0xa2c19d00 0, 405000, 84480, 0xa6834e64
0, 408750, 84480, 0xce94336f 0, 408750, 84480, 0xfebf4d70
0, 412500, 84480, 0xfa9bcf14 0, 412500, 84480, 0x4a0775e2
0, 416250, 84480, 0x24d6a243 0, 416250, 84480, 0x9d7e945b
0, 420000, 84480, 0x24d6a243 0, 420000, 84480, 0xaa9eadd9
0, 423750, 84480, 0x24d6a243 0, 423750, 84480, 0xaa85c9b1
0, 427500, 84480, 0x24d6a243 0, 427500, 84480, 0xa005edaf
0, 431250, 84480, 0x24d6a243 0, 431250, 84480, 0x7fc4e5cc
0, 435000, 84480, 0x24d6a243 0, 435000, 84480, 0xb0f6e8d1
0, 438750, 84480, 0x24d6a243 0, 438750, 84480, 0x9ef9f330
0, 442500, 84480, 0xae1c8854 0, 442500, 84480, 0xbe14ff1f
0, 446250, 84480, 0xbb8968bf 0, 446250, 84480, 0xd494048c
0, 450000, 84480, 0x6f923623 0, 450000, 84480, 0x046166a7
0, 453750, 84480, 0x22e98029 0, 453750, 84480, 0x052a09b2
0, 457500, 84480, 0x8ac33af3 0, 457500, 84480, 0x71fff4ab
0, 461250, 84480, 0x05947b6e 0, 461250, 84480, 0xb9684e41
0, 465000, 84480, 0xfc35661a 0, 465000, 84480, 0x1ddce068
0, 468750, 84480, 0x0e6b6e47 0, 468750, 84480, 0xb9de300e
0, 472500, 84480, 0x82c764bb 0, 472500, 84480, 0x13962590
0, 476250, 84480, 0x57a36833 0, 476250, 84480, 0xde79482f
0, 480000, 84480, 0xc8dd690a 0, 480000, 84480, 0x7d1ca064
0, 483750, 84480, 0x02c47232 0, 483750, 84480, 0x7e1de54e
0, 487500, 84480, 0x6645715d
0, 491250, 84480, 0xc64860f7
0, 495000, 84480, 0x4f5614b3
0, 498750, 84480, 0xa70842ca
0, 502500, 84480, 0x379d8458
0, 506250, 84480, 0xa14701cf
0, 510000, 84480, 0xad1aa2b2
0, 513750, 84480, 0xee28f320
0, 517500, 84480, 0x505801e9
0, 521250, 84480, 0x7947233b
0, 525000, 84480, 0x3ce72a9d
0, 528750, 84480, 0xa6834e64
0, 532500, 84480, 0xfebf4d70
0, 536250, 84480, 0x4a0775e2
0, 540000, 84480, 0x9d7e945b
0, 543750, 84480, 0xaa9eadd9
0, 547500, 84480, 0xaa85c9b1
0, 551250, 84480, 0xa005edaf
0, 555000, 84480, 0x7fc4e5cc
0, 558750, 84480, 0xb0f6e8d1
0, 562500, 84480, 0x9ef9f330
0, 566250, 84480, 0xbe14ff1f
0, 570000, 84480, 0xd494048c
0, 573750, 84480, 0x046166a7
0, 577500, 84480, 0x052a09b2
0, 581250, 84480, 0x71fff4ab
0, 585000, 84480, 0xb9684e41
0, 588750, 84480, 0x1ddce068
0, 592500, 84480, 0xb9de300e
0, 596250, 84480, 0x13962590
0, 600000, 84480, 0xde79482f
0, 603750, 84480, 0x7d1ca064
tests/ref/lavf/gxf
View file @ 8e576d58
346d38d330ab5cb0caa6b5537167bc0d *./tests/data/lavf/lavf.gxf 346d38d330ab5cb0caa6b5537167bc0d *./tests/data/lavf/lavf.gxf
796392 ./tests/data/lavf/lavf.gxf 796392 ./tests/data/lavf/lavf.gxf
./tests/data/lavf/lavf.gxf CRC=0x102918fd ./tests/data/lavf/lavf.gxf CRC=0x345f86eb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment