[FFmpeg-cvslog] lavc/libx265: mark disposable frames

2017-12-07 Thread John Stebbins
ffmpeg | branch: master | John Stebbins  | Tue Dec  5 
16:36:58 2017 -0800| [79a744768aa6f498e4f46fca4ff01cd04eade9a5] | committer: 
Michael Niedermayer

lavc/libx265: mark disposable frames

Used by movenc to fill sdtp box

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79a744768aa6f498e4f46fca4ff01cd04eade9a5
---

 libavcodec/libx265.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index cbb106aeed..25ccb02fcb 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -342,6 +342,13 @@ FF_DISABLE_DEPRECATION_WARNINGS
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
+#if X265_BUILD >= 130
+if (x265pic_out.sliceType == X265_TYPE_B)
+#else
+if (x265pic_out.frameData.sliceType == 'b')
+#endif
+pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
+
 *got_packet = 1;
 return 0;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] x86/vf_hflip: don't load the width argument twice

2017-12-07 Thread James Almer
ffmpeg | branch: master | James Almer  | Thu Dec  7 18:09:00 
2017 -0300| [dc33fe1d0080e932faa9fe3c7fb4850dfde161a8] | committer: James Almer

x86/vf_hflip: don't load the width argument twice

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc33fe1d0080e932faa9fe3c7fb4850dfde161a8
---

 libavfilter/x86/vf_hflip.asm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavfilter/x86/vf_hflip.asm b/libavfilter/x86/vf_hflip.asm
index d14cc086e5..9f262ece5c 100644
--- a/libavfilter/x86/vf_hflip.asm
+++ b/libavfilter/x86/vf_hflip.asm
@@ -33,7 +33,7 @@ INIT_XMM ssse3
 cglobal hflip_byte, 3, 5, 3, src, dst, w, r, x
 movam0, [pb_flip_byte]
 mov xq, 0
-mov wd, dword wm
+movsxdifnidn wq, wd
 mov rq, wq
 and rq, 2 * mmsize - 1
 cmp wq, 2 * mmsize
@@ -71,8 +71,7 @@ RET
 cglobal hflip_short, 3, 5, 3, src, dst, w, r, x
 movam0, [pb_flip_short]
 mov xq, 0
-mov wd, dword wm
-add wq, wq
+add wd, wd
 mov rq, wq
 and rq, 2 * mmsize - 1
 cmp wq, 2 * mmsize

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] x86/vf_hflip: use xor to zero initialize registers

2017-12-07 Thread James Almer
ffmpeg | branch: master | James Almer  | Thu Dec  7 19:28:19 
2017 -0300| [f2aa0ce5a059cf02ee4cbd68111dd2ad622edc85] | committer: James Almer

x86/vf_hflip: use xor to zero initialize registers

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2aa0ce5a059cf02ee4cbd68111dd2ad622edc85
---

 libavfilter/x86/vf_hflip.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/x86/vf_hflip.asm b/libavfilter/x86/vf_hflip.asm
index 9f262ece5c..89d6d0c69b 100644
--- a/libavfilter/x86/vf_hflip.asm
+++ b/libavfilter/x86/vf_hflip.asm
@@ -32,7 +32,7 @@ SECTION .text
 INIT_XMM ssse3
 cglobal hflip_byte, 3, 5, 3, src, dst, w, r, x
 movam0, [pb_flip_byte]
-mov xq, 0
+xor xq, xq
 movsxdifnidn wq, wd
 mov rq, wq
 and rq, 2 * mmsize - 1
@@ -70,7 +70,7 @@ RET
 
 cglobal hflip_short, 3, 5, 3, src, dst, w, r, x
 movam0, [pb_flip_short]
-mov xq, 0
+xor xq, xq
 add wd, wd
 mov rq, wq
 and rq, 2 * mmsize - 1

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] fate-opus: run and test inactive samples

2017-12-07 Thread Rostislav Pehlivanov
ffmpeg | branch: master | Rostislav Pehlivanov  | Tue Dec  
5 02:03:15 2017 +| [c67c7191b1c2fa0ff0a9785f52e86a5cdfc1d36f] | committer: 
Rostislav Pehlivanov

fate-opus: run and test inactive samples

Signed-off-by: Rostislav Pehlivanov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c67c7191b1c2fa0ff0a9785f52e86a5cdfc1d36f
---

 tests/fate/opus.mak | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
index 36221ec265..9e0c9e6bba 100644
--- a/tests/fate/opus.mak
+++ b/tests/fate/opus.mak
@@ -2,10 +2,10 @@
 # their custom format into Matroska. The reference decoded outputs are from the
 # newest testvectors file from RFC8251
 
-OPUS_CELT_SAMPLES   = $(addprefix testvector, 11) tron.6ch.tinypkts
+OPUS_CELT_SAMPLES   = $(addprefix testvector, 01 11) tron.6ch.tinypkts
 OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06)
 OPUS_SILK_SAMPLES   = $(addprefix testvector, 02 03 04)
-OPUS_SAMPLES= $(addprefix testvector, 08 10 12)
+OPUS_SAMPLES= $(addprefix testvector, 07 08 09 10 12)
 
 define FATE_OPUS_TEST
 FATE_OPUS += fate-opus-$(1)
@@ -24,13 +24,17 @@ FATE_OPUS := $(sort $(FATE_OPUS))
 $(FATE_OPUS): CMP = stddev
 $(FATE_OPUS): CMP_UNIT = s16
 $(FATE_OPUS): FUZZ = 3
+fate-opus-testvector01: CMP_TARGET = 0
 fate-opus-testvector02: CMP_TARGET = 191
 fate-opus-testvector03: CMP_TARGET = 139
 fate-opus-testvector04: CMP_TARGET = 119
 fate-opus-testvector05: CMP_TARGET = 109
 fate-opus-testvector06: CMP_TARGET = 109
+fate-opus-testvector07: CMP_TARGET = 0
 fate-opus-testvector08: CMP_TARGET = 6
+fate-opus-testvector09: CMP_TARGET = 0
 fate-opus-testvector10: CMP_TARGET = 38
+fate-opus-testvector11: CMP_TARGET = 0
 fate-opus-testvector12: CMP_TARGET = 160
 
 $(FATE_OPUS_CELT): CMP = oneoff

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] opus: fix hybrid folding indexing during band quantization

2017-12-07 Thread Rostislav Pehlivanov
ffmpeg | branch: master | Rostislav Pehlivanov  | Fri Dec  
8 03:40:41 2017 +| [4678339e745dac8fa4288541b79f1577f19bb4c2] | committer: 
Rostislav Pehlivanov

opus: fix hybrid folding indexing during band quantization

Resulted in valgrind errors due to uninitialized memory.
Also updates fate and makes it use the tron sample result.

Signed-off-by: Rostislav Pehlivanov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4678339e745dac8fa4288541b79f1577f19bb4c2
---

 libavcodec/opus.c   |  7 +++
 tests/fate/opus.mak | 25 +
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libavcodec/opus.c b/libavcodec/opus.c
index b791d749b4..46b749cae6 100644
--- a/libavcodec/opus.c
+++ b/libavcodec/opus.c
@@ -481,13 +481,12 @@ void ff_celt_quant_bands(CeltFrame *f, OpusRangeCoder *rc)
 if (i == f->start_band + 1) {
 /* Special Hybrid Folding (RFC 8251 section 9). Copy the first 
band into
 the second to ensure the second band never has to use the LCG. */
-int offset = 8 * ff_celt_freq_bands[i];
-int count = 8 * (ff_celt_freq_range[i] - ff_celt_freq_range[i-1]);
+int count = (ff_celt_freq_range[i] - ff_celt_freq_range[i-1]) << 
f->size;
 
-memcpy(&norm1[offset], &norm1[offset - count], count * 
sizeof(float));
+memcpy(&norm1[band_offset], &norm1[band_offset - count], count * 
sizeof(float));
 
 if (f->channels == 2)
-memcpy(&norm2[offset], &norm2[offset - count], count * 
sizeof(float));
+memcpy(&norm2[band_offset], &norm2[band_offset - count], count 
* sizeof(float));
 }
 
 /* Get a conservative estimate of the collapse_mask's for the bands 
we're
diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
index 9e0c9e6bba..7f289455cf 100644
--- a/tests/fate/opus.mak
+++ b/tests/fate/opus.mak
@@ -24,18 +24,19 @@ FATE_OPUS := $(sort $(FATE_OPUS))
 $(FATE_OPUS): CMP = stddev
 $(FATE_OPUS): CMP_UNIT = s16
 $(FATE_OPUS): FUZZ = 3
-fate-opus-testvector01: CMP_TARGET = 0
-fate-opus-testvector02: CMP_TARGET = 191
-fate-opus-testvector03: CMP_TARGET = 139
-fate-opus-testvector04: CMP_TARGET = 119
-fate-opus-testvector05: CMP_TARGET = 109
-fate-opus-testvector06: CMP_TARGET = 109
-fate-opus-testvector07: CMP_TARGET = 0
-fate-opus-testvector08: CMP_TARGET = 6
-fate-opus-testvector09: CMP_TARGET = 0
-fate-opus-testvector10: CMP_TARGET = 38
-fate-opus-testvector11: CMP_TARGET = 0
-fate-opus-testvector12: CMP_TARGET = 160
+fate-opus-testvector01:  CMP_TARGET = 0
+fate-opus-testvector02:  CMP_TARGET = 191
+fate-opus-testvector03:  CMP_TARGET = 139
+fate-opus-testvector04:  CMP_TARGET = 119
+fate-opus-testvector05:  CMP_TARGET = 108
+fate-opus-testvector06:  CMP_TARGET = 106
+fate-opus-testvector07:  CMP_TARGET = 0
+fate-opus-testvector08:  CMP_TARGET = 6
+fate-opus-testvector09:  CMP_TARGET = 0
+fate-opus-testvector10:  CMP_TARGET = 38
+fate-opus-testvector11:  CMP_TARGET = 0
+fate-opus-testvector12:  CMP_TARGET = 160
+fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0
 
 $(FATE_OPUS_CELT): CMP = oneoff
 $(FATE_OPUS_CELT): FUZZ = 6

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog