1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

1157 Commits

Author SHA1 Message Date
Michael Niedermayer
9d56ccf5af j2k/jpeg2000dec: merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-31 03:10:08 +02:00
Matthieu Bouron
f468325d34 lavf/id3v2enc: fix cover art display on some software
Adding an arbitrary amount of padding bytes at the end of the
ID3 metadata fixes cover art display for some software (iTunes,
Traktor, Serato, Torq).

For reference (ID3 metadata):

[ Apic frames ]                      -> cover doesn't show up
[ Apic frames, Padding ]             -> ok
[ Apic frames, ID3 frames ]          -> ok
[ ID3 frames, Apic frames ]          -> cover doesn't show up
[ ID3 frames, Apic frames, Padding ] -> ok
2013-05-30 21:16:57 +00:00
Michael Niedermayer
63e5e9f7c5 fate: fix smvjpeg test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-30 03:31:04 +02:00
Ash Hughes
fa30f4c24d fate: add smv test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-30 03:00:05 +02:00
Michael Niedermayer
32475f56f3 j2kdec/jpeg2000dec: partially merge quantization code
The quantization code needs more work, not so much work
merging but more work investigating what is correct.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 19:02:00 +02:00
Michael Niedermayer
cf05fe8a7e jpeg2000dwt: remove floats from mixed float/int 9/7 dwt
This should fix some fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 09:35:49 +02:00
Michael Niedermayer
d4a4661342 j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 21:54:07 +02:00
Michael Niedermayer
1bbb46ff71 j2k_dwt: fix scaling of 9/7 dwt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 19:57:42 +02:00
Michael Niedermayer
ee189701a6 j2kenc: Allow encoding with the 9/7 wavelet
Also add a fate test that tests 9/7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 18:50:18 +02:00
Michael Niedermayer
bca59d7745 fade: fix slice sizes
This more evenly distributes the load between threads

This also fixes the chroma filtering where the filter was applied twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 17:47:02 +02:00
Michael Niedermayer
029353e427 Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
	libavcodec/h264_parser.c
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 12:15:56 +02:00
Kostya Shishkov
e9e5a1bdc7 Monkey's Audio old versions FATE tests 2013-05-24 09:04:18 +02:00
Michael Niedermayer
30df9789a9 proresdec: Fix end condition
Fixes out of array writes
No FFmpeg release is affected by this

This also fixes some artifacts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 20:24:50 +02:00
Carl Eugen Hoyos
898268a23b Add a fate test for ProRes Transparency. 2013-05-21 23:09:19 +02:00
Michael Niedermayer
a90baa63c3 add YUVJ411P
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:56:11 +02:00
Michael Niedermayer
0a8e86faf2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Escape 130 FATE test

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 11:06:39 +02:00
Michael Niedermayer
fa6001e728 Merge commit '8e673efc6f5b7a095557664660305148f2788d30'
* commit '8e673efc6f5b7a095557664660305148f2788d30':
  prores: update FATE test to account for alpha plane present in the test sample
  configure: Add basic valgrind-massif support

Conflicts:
	tests/fate/prores.mak
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:53:39 +02:00
Kostya Shishkov
e45d6222cc Escape 130 FATE test 2013-05-19 07:09:36 +02:00
Kostya Shishkov
8e673efc6f prores: update FATE test to account for alpha plane present in the test sample 2013-05-19 07:09:23 +02:00
Michael Niedermayer
5918b7ac41 sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 01:20:30 +02:00
Jeremy Hinegardner
28e6b7b9b4 Turn off usage of base_data_offset in tfhd for PIFF files
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by ffmpeg state
that they are 'piff' compatible via 'ftyp' box, this needs to be corrected.

[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 10:04:45 +02:00
Michael Niedermayer
0313653928 vc1dec: Update destination pointers in context for fields
This replaces a large number of checks for the second field by
fixing the pointers when they are setup.

This should also fix I/BI field pictures.

Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs.

Based on "vc1dec: the second field is written wrong to the picture"
by Sebastian Sandberg <sebastiand.sandberg@gmail.com>.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 11:38:49 +03:00
Luca Barbato
7cbc4cb442 fate: update the mmf reference
Using Optional Data chunk introduced changes the hash.
2013-05-14 18:50:27 +02:00
Martin Storsjö
5d9d8461fb vc1dec: Don't apply the loop filter on fields
Fixes read of uninitialized memory.

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 14:36:00 +03:00
Michael Niedermayer
6b13f54262 vf_colorchannelmixer: round lut entries to nearest
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 12:51:22 +02:00
Michael Niedermayer
f268727a8f fate: change colorchannelmixers coefficients to be less unstable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 12:49:11 +02:00
Reimar Döffinger
86215c326e Add 128 bit murmur3 hash function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-13 21:42:37 +02:00
Michael Niedermayer
45150f90e7 fate: fix filter-colorchannelmixer by adding bitexact & accurate flags
Idea by durandal11707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 17:15:58 +02:00
Paul B Mahol
2dedd8988a fate: add colorchannelmixer test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-13 10:57:48 +00:00
Paul B Mahol
c0a30dd2e4 fate: increase coverage for dpx encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 22:04:40 +00:00
Paul B Mahol
ae9ef151ad dpxenc: simplifiy code using AVPixFmtDescriptor
Update rgb24 fate test as it no longer writes image in big endian
format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 21:56:29 +00:00
Paul B Mahol
e1746d057b swscale: RGBA64 output
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-12 21:47:19 +02:00
Paul B Mahol
87888c043d fate: add exr tests
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 11:47:30 +00:00
Clément Bœsch
09d3449a8f fate/filter: test gradfun timeline. 2013-05-12 13:07:47 +02:00
Clément Bœsch
9b11c2ef36 fate/filter: test hqdn3d timeline. 2013-05-12 13:07:47 +02:00
James Almer
67fad0d221 ADPCM IMA Radical decoder
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:53:50 -03:00
James Almer
e5e86db178 RedSpark demuxer
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:53:02 -03:00
James Almer
d3710c51d9 RSD demuxer
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:52:10 -03:00
James Almer
b4866f717c ADP demuxer
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:10:52 -03:00
Carl Eugen Hoyos
43b6482d0a Add fate test for solid colour lagarith frames. 2013-05-09 17:18:12 +02:00
Paul B Mahol
d1cb559a6a fate: add test for lut filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-09 10:37:58 +00:00
Paul B Mahol
5c057433cc libswscale: GBRAP input & output and GBRAP16 input support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Michael Niedermayer
9276467bce Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 11:35:07 +02:00
Michael Niedermayer
fe5b089596 Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
	libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 11:27:44 +02:00
Reimar Döffinger
399f6ef971 Add FATE test for matroska error recovery.
This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-07 05:30:19 +02:00
Michael Niedermayer
fd68371b07 nutdec: Implement duration parsing for indexed nuts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 18:57:29 +02:00
Michael Niedermayer
3319679d0a Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 11:34:34 +02:00
Michael Niedermayer
52fa2945b5 Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633'
* commit 'e036bb7899d0faca9159206be9bf5552e76e7633':
  lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
  FATE: add an additional indeo3 test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:00:08 +02:00
Paul B Mahol
a0adeb1f9f fate: add test for separatefields filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 10:22:16 +00:00
Paul B Mahol
468ec1714c fate: add test for swapuv filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 10:18:45 +00:00