[FFmpeg-cvslog] libavcodec/exr: add tile support
ffmpeg | branch: master | Martin Vignali | Sun Apr
3 00:21:30 2016 +0200| [25a01c52b889d64e77fb3f8f7e519d183d7635b8] | committer:
Paul B Mahol
libavcodec/exr: add tile support
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25a01c52b889d64e77fb3f8f7e519d183d7635b8
---
libavcodec/exr.c | 264 +++---
1 file changed, 210 insertions(+), 54 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index aaac3be..b0573d5 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -3,6 +3,8 @@
* Copyright (c) 2006 Industrial Light & Magic, a division of Lucas Digital
Ltd. LLC
* Copyright (c) 2009 Jimmy Christensen
*
+ * B44/B44A, Tile added by Jokyo Images support by CNC - French National
Center for Cinema
+ *
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
@@ -67,11 +69,29 @@ enum ExrPixelType {
EXR_UNKNOWN,
};
+enum ExrTileLevelMode {
+EXR_TILE_LEVEL_ONE,
+EXR_TILE_LEVEL_MIPMAP,
+EXR_TILE_LEVEL_RIPMAP,
+};
+
+enum ExrTileLevelRound {
+EXR_TILE_ROUND_UP,
+EXR_TILE_ROUND_DOWN,
+};
+
typedef struct EXRChannel {
int xsub, ysub;
enum ExrPixelType pixel_type;
} EXRChannel;
+typedef struct EXRTileAttribute {
+int32_t xSize;
+int32_t ySize;
+enum ExrTileLevelMode level_mode;
+enum ExrTileLevelRound level_round;
+} EXRTileAttribute;
+
typedef struct EXRThreadData {
uint8_t *uncompressed_data;
int uncompressed_size;
@@ -97,17 +117,21 @@ typedef struct EXRContext {
uint32_t xmax, xmin;
uint32_t ymax, ymin;
uint32_t xdelta, ydelta;
-int ysize;
+int ysize, xsize;
uint64_t scan_line_size;
int scan_lines_per_block;
+EXRTileAttribute tile_attr; /* header data attribute of tile */
+int is_tile; /* 0 if scanline, 1 if tile */
+
GetByteContext gb;
const uint8_t *buf;
int buf_size;
EXRChannel *channels;
int nb_channels;
+int current_channel_offset;
EXRThreadData *thread_data;
@@ -792,7 +816,7 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t
*src,
if (uncompress(td->tmp, &dest_len, src, compressed_size) != Z_OK) {
return AVERROR_INVALIDDATA;
-} else if (dest_len != expected_len){
+} else if (dest_len != expected_len) {
return AVERROR_INVALIDDATA;
}
@@ -889,7 +913,7 @@ static void unpack_3(const uint8_t b[3], uint16_t s[16])
static int b44_uncompress(EXRContext *s, const uint8_t *src, int
compressed_size,
- int uncompressed_size, EXRThreadData *td){
+ int uncompressed_size, EXRThreadData *td) {
const int8_t *sr = src;
int stayToUncompress = compressed_size;
int nbB44BlockW, nbB44BlockH;
@@ -909,7 +933,7 @@ static int b44_uncompress(EXRContext *s, const uint8_t
*src, int compressed_size
for (c = 0; c < s->nb_channels; c++) {
for (iY = 0; iY < nbB44BlockH; iY++) {
for (iX = 0; iX < nbB44BlockW; iX++) {/* For each B44 block */
-if (stayToUncompress < 3){
+if (stayToUncompress < 3) {
av_log(s, AV_LOG_ERROR, "Not enough data for B44A block:
%d", stayToUncompress);
return AVERROR_INVALIDDATA;
}
@@ -959,43 +983,87 @@ static int decode_block(AVCodecContext *avctx, void
*tdata,
uint32_t xdelta = s->xdelta;
uint16_t *ptr_x;
uint8_t *ptr;
-uint32_t data_size, line;
+uint32_t data_size, line, col = 0;
+uint32_t tileX, tileY, tileLevelX, tileLevelY;
+int channelLineSize, indexSrc, tX, tY, tCh;
const uint8_t *src;
-int axmax = (avctx->width - (s->xmax + 1)) * 2 * s->desc->nb_components;
-int bxmin = s->xmin * 2 * s->desc->nb_components;
+int axmax = (avctx->width - (s->xmax + 1)) * 2 * s->desc->nb_components;
/* nb pixel to add at the right of the datawindow */
+int bxmin = s->xmin * 2 * s->desc->nb_components; /* nb pixel to add at
the left of the datawindow */
int i, x, buf_size = s->buf_size;
float one_gamma = 1.0f / s->gamma;
avpriv_trc_function trc_func =
avpriv_get_trc_function_from_trc(s->apply_trc_type);
int ret;
line_offset = AV_RL64(s->gb.buffer + jobnr * 8);
-// Check if the buffer has the required bytes needed from the offset
-if (line_offset > buf_size - 8)
-return AVERROR_INVALIDDATA;
-src = buf + line_offset + 8;
-line = AV_RL32(src - 8);
-if (line < s->ymin || line > s->ymax)
-return AVERROR_INVALIDDATA;
+if (s->is_tile) {
+if (line_offset > buf_size - 20)
+return AVERROR_INVALIDDATA;
-data_size = AV_RL32(src - 4);
-if (data_size <= 0 || data_size > buf_size)
-return AVERROR_INVALIDDATA;
+src = buf + line_offset + 20;
-s->ysize = FFMIN(s->scan_lines_per_block, s->ymax - line + 1);
-uncompressed_size
[FFmpeg-cvslog] libavcodec/exr: fix PRX24 Float decompression
ffmpeg | branch: master | Martin Vignali | Sun Apr
3 14:12:44 2016 +0200| [d2ed3391fbfe3d6806c7819f86a5aa43b89b3144] | committer:
Paul B Mahol
libavcodec/exr: fix PRX24 Float decompression
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2ed3391fbfe3d6806c7819f86a5aa43b89b3144
---
libavcodec/exr.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index f6141fa..aaac3be 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -778,14 +778,23 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t
*src,
int compressed_size, int uncompressed_size,
EXRThreadData *td)
{
-unsigned long dest_len = uncompressed_size;
+unsigned long dest_len, expected_len;
const uint8_t *in = td->tmp;
uint8_t *out;
int c, i, j;
-if (uncompress(td->tmp, &dest_len, src, compressed_size) != Z_OK ||
-dest_len != uncompressed_size)
+if (s->pixel_type == EXR_FLOAT)
+expected_len = (uncompressed_size / 4) * 3; /* PRX 24 store float in
24 bit instead of 32 */
+else
+expected_len = uncompressed_size;
+
+dest_len = expected_len;
+
+if (uncompress(td->tmp, &dest_len, src, compressed_size) != Z_OK) {
return AVERROR_INVALIDDATA;
+} else if (dest_len != expected_len){
+return AVERROR_INVALIDDATA;
+}
out = td->uncompressed_data;
for (i = 0; i < s->ysize; i++)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/wavdec: fix typo with len
ffmpeg | branch: master | Michael Niedermayer | Sun
Apr 3 17:34:15 2016 +0200| [06c4ed0c0e349602ae6ca31c39693f73bce9bf61] |
committer: Michael Niedermayer
avformat/wavdec: fix typo with len
Found-by: carl
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06c4ed0c0e349602ae6ca31c39693f73bce9bf61
---
libavformat/wavdec.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index c620963..ac98fa9 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -65,8 +65,8 @@ static void set_spdif(AVFormatContext *s, WAVDemuxContext
*wav)
if (CONFIG_SPDIF_DEMUXER && s->streams[0]->codec->codec_tag == 1) {
enum AVCodecID codec;
uint8_t *buf = NULL;
-int ret = ffio_ensure_seekback(s->pb, sizeof(buf));
int len = 1<<16;
+int ret = ffio_ensure_seekback(s->pb, len);
int64_t pos = avio_tell(s->pb);
if (ret < 0)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/utils: Introduce ff_bprint_to_codecpar_extradata for avformat
ffmpeg | branch: master | Hendrik Leppkes | Thu Mar 31
21:49:02 2016 +0100| [6518cbc52a8c59f8f590405a852385adbc47ed62] | committer:
Derek Buitenhuis
lavc/utils: Introduce ff_bprint_to_codecpar_extradata for avformat
It will be used by text subtitle demuxers to construct format instructions
straight into extradata. They all currently a similar function that accepts
an AVCodecContext instead.
Signed-off-by: Derek Buitenhuis
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6518cbc52a8c59f8f590405a852385adbc47ed62
---
libavformat/internal.h |7 +++
libavformat/utils.c| 23 +++
2 files changed, 30 insertions(+)
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 7defce8..cd390dd 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -22,6 +22,8 @@
#define AVFORMAT_INTERNAL_H
#include
+
+#include "libavutil/bprint.h"
#include "avformat.h"
#include "os_support.h"
@@ -596,4 +598,9 @@ int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket
**ppkt, AVCodecContext *en
*/
int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, uint32_t
*palette);
+/**
+ * Finalize buf into extradata and set its size appropriately.
+ */
+int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint
*buf);
+
#endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3bd2df3..3bf96ad 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4866,3 +4866,26 @@ int ff_get_packet_palette(AVFormatContext *s, AVPacket
*pkt, int ret, uint32_t *
return 0;
}
+
+int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint
*buf)
+{
+int ret;
+char *str;
+
+ret = av_bprint_finalize(buf, &str);
+if (ret < 0)
+return ret;
+if (!av_bprint_is_complete(buf)) {
+av_free(str);
+return AVERROR(ENOMEM);
+}
+
+par->extradata = str;
+/* Note: the string is NUL terminated (so extradata can be read as a
+ * string), but the ending character is not accounted in the size (in
+ * binary formats you are likely not supposed to mux that character). When
+ * extradata is copied, it is also padded with AV_INPUT_BUFFER_PADDING_SIZE
+ * zeros. */
+par->extradata_size = buf->len;
+return 0;
+}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/brstm: lower magic number, fixes decoding of some files
ffmpeg | branch: master | Paul B Mahol | Sun Apr 3 19:12:07 2016 +0200| [76466ab214ef20ea628703457bf8d595c4669f8c] | committer: Paul B Mahol avformat/brstm: lower magic number, fixes decoding of some files Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76466ab214ef20ea628703457bf8d595c4669f8c --- libavformat/brstm.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/brstm.c b/libavformat/brstm.c index aae2575..6fd44f1 100644 --- a/libavformat/brstm.c +++ b/libavformat/brstm.c @@ -169,7 +169,7 @@ static int read_header(AVFormatContext *s) } size = read32(s); -if (size < 192) +if (size < 40) return AVERROR_INVALIDDATA; avio_skip(s->pb, 4); // unknown h1offset = read32(s); ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] AAC encoder: fix initialization of minsf
ffmpeg | branch: master | Claudio Freire | Sun Apr 3
15:03:53 2016 -0300| [bad41d3724228cf9b03973a68cf3082adffb48f8] | committer:
Claudio Freire
AAC encoder: fix initialization of minsf
In some situations (exactly zeroed DC coeffs) minsf would
be initialized with garbage
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bad41d3724228cf9b03973a68cf3082adffb48f8
---
libavcodec/aaccoder_twoloop.h |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aaccoder_twoloop.h
index 41d3ffd..42aea52 100644
--- a/libavcodec/aaccoder_twoloop.h
+++ b/libavcodec/aaccoder_twoloop.h
@@ -302,10 +302,11 @@ static void search_for_quantizers_twoloop(AVCodecContext
*avctx,
const float *scaled = s->scoefs + start;
int minsfidx;
maxvals[w*16+g] = find_max_val(sce->ics.group_len[w],
sce->ics.swb_sizes[g], scaled);
-if (maxvals[w*16+g] > 0)
+if (maxvals[w*16+g] > 0) {
minsfidx = coef2minsf(maxvals[w*16+g]);
-for (w2 = 0; w2 < sce->ics.group_len[w]; w2++)
-minsf[(w+w2)*16+g] = minsfidx;
+for (w2 = 0; w2 < sce->ics.group_len[w]; w2++)
+minsf[(w+w2)*16+g] = minsfidx;
+}
start += sce->ics.swb_sizes[g];
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] AAC encoder: new regression test
ffmpeg | branch: master | Claudio Freire | Sun Apr 3 15:28:17 2016 -0300| [52562503d5249e4b0fc10ee3a53cf289b24cb6a3] | committer: Claudio Freire AAC encoder: new regression test Test to catch the recently fixed minsf bug Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52562503d5249e4b0fc10ee3a53cf289b24cb6a3 --- tests/fate/aac.mak | 11 +++ 1 file changed, 11 insertions(+) diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 324b05d..3d64031 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -213,6 +213,17 @@ fate-aac-ltp-encode: CMP_TARGET = 1270 fate-aac-ltp-encode: SIZE_TOLERANCE = 3560 fate-aac-ltp-encode: FUZZ = 17 +#Ticket1784 +FATE_AAC_ENCODE += fate-aac-yoraw-encode +fate-aac-yoraw-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/yo.raw-short.wav -c:a aac -fflags +bitexact -flags +bitexact +fate-aac-yoraw-encode: CMP = stddev +fate-aac-yoraw-encode: REF = $(SAMPLES)/audio-reference/yo.raw-short.wav +fate-aac-yoraw-encode: CMP_SHIFT = -12288 +fate-aac-yoraw-encode: CMP_TARGET = 259 +fate-aac-yoraw-encode: SIZE_TOLERANCE = 3560 +fate-aac-yoraw-encode: FUZZ = 17 + + FATE_AAC_ENCODE += fate-aac-pred-encode fate-aac-pred-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -profile:a aac_main -c:a aac -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050 fate-aac-pred-encode: CMP = stddev ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: add demux test for OggOpus
ffmpeg | branch: master | James Almer | Sat Apr 2 17:31:36 2016 -0300| [64b1ec804f546064f759cb219118df41420cc692] | committer: James Almer fate: add demux test for OggOpus Reviewed-by: Michael Niedermayer Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64b1ec804f546064f759cb219118df41420cc692 --- tests/fate/demux.mak |3 +++ tests/ref/fate/oggopus-demux | 43 ++ 2 files changed, 46 insertions(+) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index dad77ec..4cb14c4 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -78,6 +78,9 @@ fate-nistsphere-demux: CMD = crc -i $(TARGET_SAMPLES)/nistsphere/nist-ulaw.nist FATE_SAMPLES_DEMUX-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy +FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux +fate-oggopus-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ogg/intro-partial.opus -c:a copy + FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggvp8-demux fate-oggvp8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ogg/videotest.ogv -c:v copy diff --git a/tests/ref/fate/oggopus-demux b/tests/ref/fate/oggopus-demux new file mode 100644 index 000..acbfa4b --- /dev/null +++ b/tests/ref/fate/oggopus-demux @@ -0,0 +1,43 @@ +#extradata 0: 19, 0x399c0471 +#tb 0: 1/48000 +0, -356, -356, 960, 402, 0x89b1c40f +0,604,604, 960, 216, 0x7bf97146 +0, 1564, 1564, 960, 215, 0x6cb86d8b +0, 2524, 2524, 960, 218, 0x9cfd691c +0, 3484, 3484, 960, 218, 0xd7fe6a94 +0, , , 960, 194, 0x35735de6 +0, 5404, 5404, 960, 216, 0x3ee6705a +0, 6364, 6364, 960, 218, 0x67eb6cb1 +0, 7324, 7324, 960, 218, 0x32d0700d +0, 8284, 8284, 960, 219, 0xcb7f6c60 +0, 9244, 9244, 960, 218, 0x9c866b33 +0, 10204, 10204, 960, 217, 0xfe3e6a53 +0, 11164, 11164, 960, 218, 0x13586833 +0, 12124, 12124, 960, 222, 0xbcb2669e +0, 13084, 13084, 960, 218, 0x8dfc6e33 +0, 14044, 14044, 960, 217, 0xf5957051 +0, 15004, 15004, 960, 210, 0xed126e6b +0, 15964, 15964, 960, 216, 0xbf947249 +0, 16924, 16924, 960, 203, 0x6c7e680a +0, 17884, 17884, 960, 209, 0xf78f6af4 +0, 18844, 18844, 960, 217, 0xd60c684d +0, 19804, 19804, 960, 218, 0x89056a7a +0, 20764, 20764, 960, 219, 0x0bc674ad +0, 21724, 21724, 960, 217, 0xb1d86d1a +0, 22684, 22684, 960, 220, 0x433d685a +0, 23644, 23644, 960, 364, 0x0c88be84 +0, 24604, 24604, 960, 221, 0x804a733d +0, 25564, 25564, 960, 215, 0x6e9d6e9b +0, 26524, 26524, 960, 215, 0x63016a83 +0, 27484, 27484, 960, 218, 0xf9a46fbe +0, 28444, 28444, 960, 216, 0xa0d66c08 +0, 29404, 29404, 960, 216, 0xa2ca6d0a +0, 30364, 30364, 960, 216, 0xf50e6f1d +0, 31324, 31324, 960, 215, 0x6aaa70b6 +0, 32284, 32284, 960, 219, 0x7ceb6ba0 +0, 33244, 33244, 960, 220, 0x398d6ca9 +0, 34204, 34204, 960, 218, 0x7bd06ed5 +0, 35164, 35164, 960, 219, 0xe2906c62 +0, 36124, 36124, 960, 217, 0xcf316ba1 +0, 37084, 37084, 960, 217, 0x470b6eea +0, 38044, 38044, 356, 359, 0x36c2a18a, S=1, 10, 0x0232005e ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: Add fate-ts-opus-demux
ffmpeg | branch: master | Michael Niedermayer | Sat Apr 2 22:00:41 2016 +0200| [419cb35e6f7b1b3102e60153d6c009e9d43cb8f0] | committer: Michael Niedermayer fate: Add fate-ts-opus-demux Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=419cb35e6f7b1b3102e60153d6c009e9d43cb8f0 --- tests/fate/demux.mak |3 + tests/ref/fate/ts-opus-demux | 514 ++ 2 files changed, 517 insertions(+) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 4cb14c4..6b95c68 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -63,6 +63,9 @@ fate-mlv-demux: CMD = crc -i $(TARGET_SAMPLES)/mlv/M19-0333-cut.MLV -c copy FATE_SAMPLES_DEMUX-$(CONFIG_MOV_DEMUXER) += fate-mov-mp3-demux fate-mov-mp3-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mpegaudio/packed_maindata.mp3.mp4 -c copy +FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux +fate-ts-opus-demux: CMD = framecrc -i $(TARGET_SAMPLES)/opus/test-8-7.1.opus-small.ts -c copy + FATE_SAMPLES_DEMUX-$(CONFIG_MTV_DEMUXER) += fate-mtv fate-mtv: CMD = framecrc -i $(TARGET_SAMPLES)/mtv/comedian_auto-partial.mtv -c copy diff --git a/tests/ref/fate/ts-opus-demux b/tests/ref/fate/ts-opus-demux new file mode 100644 index 000..1d4126e --- /dev/null +++ b/tests/ref/fate/ts-opus-demux @@ -0,0 +1,514 @@ +#extradata 0: 30, 0x53be0347 +#tb 0: 1/9 +0, 0, 0, 1800, 744, 0x172b615b, S=1,1, 0x00bd00bd +0, 1800, 1800, 1800, 743, 0x3f5b673d, S=1,1, 0x00bd00bd +0, 3600, 3600, 1800, 747, 0xe54e735d, S=1,1, 0x00bd00bd +0, 5400, 5400, 1800, 742, 0x5d0d8393, S=1,1, 0x00bd00bd +0, 7200, 7200, 1800, 752, 0x39267814, S=1,1, 0x00bd00bd +0, 9000, 9000, 1800, 753, 0x2131765e, S=1,1, 0x00bd00bd +0, 10800, 10800, 1800, 756, 0x5132827f, S=1,1, 0x00bd00bd +0, 12600, 12600, 1800, 761, 0x4857760b, S=1,1, 0x00bd00bd +0, 14400, 14400, 1800, 755, 0x87ab75d6, S=1,1, 0x00bd00bd +0, 16200, 16200, 1800, 760, 0xb8137907, S=1,1, 0x00bd00bd +0, 18000, 18000, 1800, 759, 0x722d7908, S=1,1, 0x00bd00bd +0, 19800, 19800, 1800, 760, 0x738674a6, S=1,1, 0x00bd00bd +0, 21600, 21600, 1800, 762, 0x4f807c28, S=1,1, 0x00bd00bd +0, 23400, 23400, 1800, 761, 0xea117c65, S=1,1, 0x00bd00bd +0, 25200, 25200, 1800, 758, 0xa8ad7d2f, S=1,1, 0x00bd00bd +0, 27000, 27000, 1800, 756, 0xbea5747a, S=1,1, 0x00bd00bd +0, 28800, 28800, 1800, 762, 0x62ce8ab7, S=1,1, 0x00bd00bd +0, 30600, 30600, 1800, 763, 0xd7d36ee9, S=1,1, 0x00bd00bd +0, 32400, 32400, 1800, 765, 0x068b7b14, S=1,1, 0x00bd00bd +0, 34200, 34200, 1800, 772, 0x7c4086f7, S=1,1, 0x00bd00bd +0, 36000, 36000, 1800, 817, 0x81828e8c, S=1,1, 0x00bd00bd +0, 37800, 37800, 1800, 828, 0x182d9622, S=1,1, 0x00bd00bd +0, 39600, 39600, 1800, 952, 0xcb36d7f3, S=1,1, 0x00bd00bd +0, 41400, 41400, 1800, 819, 0x94049c46, S=1,1, 0x00bd00bd +0, 43200, 43200, 1800, 816, 0x9a0794de, S=1,1, 0x00bd00bd +0, 45000, 45000, 1800, 825, 0x2745a0b5, S=1,1, 0x00bd00bd +0, 46800, 46800, 1800, 814, 0x4abc994c, S=1,1, 0x00bd00bd +0, 48600, 48600, 1800, 824, 0xe49b89ea, S=1,1, 0x00bd00bd +0, 50400, 50400, 1800, 815, 0x2f4b8673, S=1,1, 0x00bd00bd +0, 52200, 52200, 1800, 824, 0x703da79a, S=1,1, 0x00bd00bd +0, 54000, 54000, 1800, 822, 0x41e59285, S=1,1, 0x00bd00bd +0, 55800, 55800, 1800, 819, 0xbc4c8f4d, S=1,1, 0x00bd00bd +0, 57600, 57600, 1800, 817, 0xba7f9614, S=1,1, 0x00bd00bd +0, 59400, 59400, 1800, 826, 0x74cb9b10, S=1,1, 0x00bd00bd +0, 61200, 61200, 1800, 822, 0xab4ba435, S=1,1, 0x00bd00bd +0, 63000, 63000, 1800, 815, 0xf1209eeb, S=1,1, 0x00bd00bd +0, 64800, 64800, 1800, 820, 0x302b8f4a, S=1,1, 0x00bd00bd +0, 66600, 66600, 1800, 828, 0x16e29b1b, S=1,1, 0x00bd00bd +0, 68400, 68400, 1800, 828, 0x21dba353, S=1,1, 0x00bd00bd +0, 70200, 70200, 1800, 942, 0xf51cd517, S=1,1, 0x00bd00bd +0, 72000, 72000, 1800, 809, 0x22b29687, S=1,1, 0x00bd00b
[FFmpeg-cvslog] fate: Add wav-ac3 test
ffmpeg | branch: master | Michael Niedermayer | Sat Apr 2 13:45:41 2016 +0200| [54c914651f1675577e090ab4ac671ba6fd406262] | committer: Michael Niedermayer fate: Add wav-ac3 test Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54c914651f1675577e090ab4ac671ba6fd406262 --- tests/fate/demux.mak |3 +++ tests/ref/fate/wav-ac3 | 43 +++ 2 files changed, 46 insertions(+) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 526b284..1c34eb8 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -123,6 +123,9 @@ fate-siff-demux: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -c copy FATE_SAMPLES_DEMUX-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux fate-smjpeg-demux: CMD = framecrc -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -c copy +FATE_SAMPLES_DEMUX-$(CONFIG_WAV_DEMUXER) += fate-wav-ac3 +fate-wav-ac3: CMD = framecrc -i $(TARGET_SAMPLES)/ac3/diatonis_invisible_order_anfos_ac3-small.wav -c copy + FATE_SAMPLES_DEMUX-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud fate-westwood-aud: CMD = framecrc -i $(TARGET_SAMPLES)/westwood-aud/excellent.aud -c copy diff --git a/tests/ref/fate/wav-ac3 b/tests/ref/fate/wav-ac3 new file mode 100644 index 000..197eb65 --- /dev/null +++ b/tests/ref/fate/wav-ac3 @@ -0,0 +1,43 @@ +#tb 0: 1/44100 +0, 0, 0, 1536, 2786, 0xe2fd0f40 +0, 1536, 1536, 1536, 2786, 0x7a6207c2 +0, 3072, 3072, 1536, 2786, 0x7a6207c2 +0, 4608, 4608, 1536, 2786, 0x7a6207c2 +0, 6144, 6144, 1536, 2786, 0x7a6207c2 +0, 7680, 7680, 1536, 2786, 0x7a6207c2 +0, 9216, 9216, 1536, 2786, 0x41be035e +0, 10752, 10752, 1536, 2786, 0xc799072a +0, 12288, 12288, 1536, 2786, 0xf5eb0603 +0, 13824, 13824, 1536, 2786, 0x3d330bb2 +0, 15360, 15360, 1536, 2786, 0x992206d2 +0, 16896, 16896, 1536, 2786, 0x89051878 +0, 18432, 18432, 1536, 2786, 0xe6291a6b +0, 19968, 19968, 1536, 2786, 0x07c133b4 +0, 21504, 21504, 1536, 2786, 0x61c42e35 +0, 23040, 23040, 1536, 2786, 0x9ec542ae +0, 24576, 24576, 1536, 2786, 0x42544e06 +0, 26112, 26112, 1536, 2786, 0x0c495e62 +0, 27648, 27648, 1536, 2786, 0x062f78bc +0, 29184, 29184, 1536, 2786, 0x497a8be9 +0, 30720, 30720, 1536, 2786, 0xedae978e +0, 32256, 32256, 1536, 2786, 0x77cfaa0f +0, 33792, 33792, 1536, 2786, 0x1471b792 +0, 35328, 35328, 1536, 2786, 0x76b7daf9 +0, 36864, 36864, 1536, 2786, 0xfc85f35f +0, 38400, 38400, 1536, 2786, 0xebf8213b +0, 39936, 39936, 1536, 2786, 0x59e73f77 +0, 41472, 41472, 1536, 2786, 0x98615899 +0, 43008, 43008, 1536, 2786, 0xd9fc642c +0, 44544, 44544, 1536, 2786, 0x10378c7c +0, 46080, 46080, 1536, 2786, 0x1d6abbb1 +0, 47616, 47616, 1536, 2786, 0xbe28d007 +0, 49152, 49152, 1536, 2786, 0xa427f2c1 +0, 50688, 50688, 1536, 2786, 0xb43203a3 +0, 52224, 52224, 1536, 2786, 0xcb6d0f2b +0, 53760, 53760, 1536, 2786, 0x7b833d5c +0, 55296, 55296, 1536, 2786, 0x26477105 +0, 56832, 56832, 1536, 2786, 0xef16814d +0, 58368, 58368, 1536, 2786, 0x2a43ae86 +0, 59904, 59904, 1536, 2786, 0x5af1ccb3 +0, 61440, 61440, 1536, 2786, 0x6fa20941 +0, 62976, 62976, 1536, 2786, 0x5d4f336a ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: add fate-flv-demux
ffmpeg | branch: master | Michael Niedermayer | Sat Apr 2 22:02:52 2016 +0200| [ec7fda2db590e85acdc20e59246e5ab888bdda13] | committer: Michael Niedermayer fate: add fate-flv-demux Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec7fda2db590e85acdc20e59246e5ab888bdda13 --- tests/fate/demux.mak |3 + tests/ref/fate/flv-demux | 606 ++ 2 files changed, 609 insertions(+) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 6b95c68..526b284 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -35,6 +35,9 @@ fate-d-cinema-demux: CMD = framecrc -i $(TARGET_SAMPLES)/d-cinema/THX_Science_FL FATE_SAMPLES_DEMUX-$(CONFIG_EA_DEMUXER) += fate-d-eavp6-demux fate-d-eavp6-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ea-vp6/SmallRing.vp6 -map 0 -vcodec copy +FATE_SAMPLES_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux +fate-flv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/flv/Enigma_Principles_of_Lust-part.flv -codec copy + FATE_SAMPLES_DEMUX-$(CONFIG_GIF_DEMUXER) += fate-gif-demux fate-gif-demux: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -vcodec copy diff --git a/tests/ref/fate/flv-demux b/tests/ref/fate/flv-demux new file mode 100644 index 000..5db2305 --- /dev/null +++ b/tests/ref/fate/flv-demux @@ -0,0 +1,606 @@ +#extradata 0: 39, 0xf8aa0d44 +#extradata 1:2, 0x00b600a3 +#tb 0: 1/1000 +#tb 1: 1/1000 +0, 0, 0, 33, 135, 0x78b33078, S=1, 39, 0xf8aa0d44 +1, 0, 0, 46,9, 0x07bc01b8, S=1,2, 0x00b600a3 +0, 33, 33, 33, 92, 0x0d891dd0, F=0x0 +1, 46, 46, 46,9, 0x07bc01b8 +0, 67, 67, 33, 14, 0x0f0f0310, F=0x0 +1, 93, 93, 46,9, 0x08bc01d8 +0,100,100, 33, 14, 0x0f460317, F=0x0 +0,133,133, 33, 117, 0xb0db33b7, F=0x0 +1,139,139, 46, 89, 0x6d552ac1 +0,167,167, 33, 14, 0x0eb202ee, F=0x0 +1,186,186, 46, 155, 0x1a5a5037 +0,200,200, 33, 14, 0x0eea02f6, F=0x0 +1,232,232, 46, 281, 0xb40082f9 +0,234,234, 33, 117, 0xf3673453, F=0x0 +0,267,267, 33, 14, 0x0f790309, F=0x0 +1,279,279, 46, 548, 0x9b031e86 +0,300,300, 33, 14, 0x0fb10311, F=0x0 +1,325,325, 46, 472, 0xee3def63 +0,334,334, 33, 117, 0xff73346f, F=0x0 +0,367,367, 33, 14, 0x10410325, F=0x0 +1,372,372, 46, 489, 0xfa45f463 +0,400,400, 33, 14, 0x1079032d, F=0x0 +1,418,418, 46, 357, 0x7b01ae7d +0,434,434, 33, 207, 0x19755ca1, F=0x0 +1,464,464, 46, 262, 0x19db8399 +0,467,467, 33, 14, 0x110a0342, F=0x0 +0,501,501, 33, 14, 0x1142034a, F=0x0 +1,511,511, 46, 294, 0x047897e0 +0,534,534, 33, 179, 0xedd45a40, F=0x0 +1,557,557, 46, 204, 0x719961d0 +0,567,567, 33, 14, 0x11d1035d, F=0x0 +0,601,601, 33, 14, 0x120a0366, F=0x0 +1,604,604, 46, 275, 0xca758590 +0,634,634, 33, 32, 0xcee90e8b, F=0x0 +1,650,650, 46, 309, 0x2e799850 +0,667,667, 33, 30, 0xc2d20eeb, F=0x0 +1,697,697, 46, 280, 0xdc2b8064 +0,701,701, 33, 16, 0x23150504, F=0x0 +0,734,734, 33, 33, 0xcccf0d2d, F=0x0 +1,743,743, 46, 106, 0xd4cf30df +0,767,767, 33, 16, 0x2385050c, F=0x0 +1,789,789, 46, 133, 0xcd964165 +0,801,801, 33, 16, 0x23f50518, F=0x0 +0,834,834, 33, 22, 0x4ff5086a, F=0x0 +1,836,836, 46, 380, 0x4c6bbc27 +0,868,868, 33, 14, 0x14aa03c2, F=0x0 +1,882,882, 46, 378, 0x2b58b2d6 +0,901,901, 33, 14, 0x14e103c9, F=0x0 +1,929,929, 46, 108, 0x1998392e +0,934,934, 33, 55, 0xb6ef1b85, F=0x0 +0,968,968, 33, 14, 0x153a03da, F=0x0 +1,975,975, 46, 279, 0x67a488cb +0, 1001, 1001, 33, 14, 0x14bd035f, F=0x0 +1, 1022, 1022, 46, 134, 0x228c4193 +0, 1034, 1034, 33, 58, 0xe
