RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
73,625 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

73625 Commits

Author SHA1 Message Date
Michael Niedermayer 98c7f9741e Merge commit '86eee85daddb682fa072c2e2657c90a514b855e3' 
* commit '86eee85daddb682fa072c2e2657c90a514b855e3':
  bytestream2: set the reader to the end when reading more than available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 21:13:07 +02:00
Michael Niedermayer f14fc55969 Merge commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717' 
* commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717':
  Checkasm: assembly testing and benchmarking tool

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 21:03:06 +02:00
Ganesh Ajjanagadde 4547cf68a0 avformat/isom: utilize bitrate hints 
Fixes Ticket4546

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 20:23:58 +02:00
Niklesh 774ceee17e movtextdec.c: Add support for highlight and hilightcolor box 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-07-12 10:24:17 -07:00
Anton Khirnov 077b559433 hevc: handle a NULL sps in set_sps() properly 
This can happen in update_thread_context(), when the previous frame was
corrupted.
 2015-07-12 18:57:10 +02:00
Anton Khirnov 18156b53f9 hevc: do not pass an entire HEVCContext into export_stream_params() 
It only needs the parameter sets.
 2015-07-12 18:52:02 +02:00
James Almer a3b721d10d avcodec/dcadec: silence request_channels deprecation warnings 
This also prevents an eventual compilation failure once request_channels
is removed.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-12 13:32:22 -03:00
Anton Khirnov 650060dfb6 hevc_parser: parse and export some stream parameters 
Particularly those that will be needed by the QSV decoder.
More can be added later as necessary.
 2015-07-12 18:15:40 +02:00
Anton Khirnov 7f78155dc6 hevc: improve a comment 
That loop does the actual full decoding, so 'parse' can be misleading.
 2015-07-12 18:15:40 +02:00
Anton Khirnov d82e1adc20 hevc: move splitting the packet into NALUs into a separate function 
This function is independent of the decoding context, so we'll be able
to use it in the parser.
 2015-07-12 18:15:39 +02:00
Anton Khirnov ae05b48655 hevc: eliminate the second call to hls_nal_unit() 
Also, make hls_nal_unit() work only on the provided NAL unit, without
requiring a whole decoding context.

This will allow splitting this code for reuse by the parser.
 2015-07-12 18:15:39 +02:00
Anton Khirnov d7bebe4805 hevc: skip invalid/ignored NALUs when splitting the packet 
There is no need to wait until actually decoding the NALU. This will
allow to get rid of the second hls_nal_unit() call later.
 2015-07-12 18:15:39 +02:00
Anton Khirnov b11acd5732 hevc: remove HEVCContext usage from hevc_ps 
Factor out the parameter sets into a separate struct and use it instead.

This will allow us to reuse this code in the parser.
 2015-07-12 18:15:39 +02:00
Anton Khirnov ab05ed4c32 mpegvideo_parser: export pixel format and dimensions 2015-07-12 18:15:39 +02:00
Andreas Cadhalpun 9f4c7397a2 hevc: check slice address length 
It is used as get_bits argument and reading 0 bits doesn't make sense.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-12 18:15:39 +02:00
Anton Khirnov a9a2f36130 doc: add a section about building with libmfx 2015-07-12 18:15:39 +02:00
Anton Khirnov 86eee85dad bytestream2: set the reader to the end when reading more than available 
This prevents possible infinite loops with the calling code along the
lines of while (bytestream2_get_bytes_left()) { ... }, where the reader
does not advance.

CC: libav-stable@libav.org
 2015-07-12 18:15:39 +02:00
Ronald S. Bultje f353b851b9 vf_ssim: fix s->coefs for yuv with non-4:2:0 subsampling. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 17:15:42 +02:00
Henrik Gramner 8bc67ec2c0 Checkasm: assembly testing and benchmarking tool 
It provides the following features:
 * verify correctness by comparing output to the C version.
 * detect failure to save and restore clobbered callee-saved registers.
 * detect 32-bit parameters being used as if they were 64-bit in x86-64
   (the upper halves are not guaranteed to be zero - but in practice
   they very often are, which makes those bugs hard to spot otherwise).
 * easy benchmarking.

Compile by running 'make checkasm'.
Execute by running 'tests/checkasm/checkasm'.

Optional arguments are '--bench' to run benchmarks for all functions,
'--bench=<pattern>' to run benchmarks for all functions that starts with
<pattern>, and '<integer>' to seed the PRNG for reproducible results.

Contains unit tests for most h264pred functions to get started, more tests
can be added afterwards using those as a reference.

Loosely based on code from x264. Currently only supports x86 and x86-64,
but additional architectures shouldn't be too much of an obstacle to add.

Note that functions with floating point parameters or floating point
return values are not supported. Some compiler-specific features or
preprocessor hacks would likely be required to add support for that.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2015-07-12 16:39:07 +02:00
Michael Niedermayer d2e5297e93 Merge commit '796268654c7807c9a1cfb322c838383e2b900d60' 
* commit '796268654c7807c9a1cfb322c838383e2b900d60':
  asfdec: always reset packet state after seeking

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:34:18 +02:00
Michael Niedermayer 839d6bc192 avformat/riffde: Fix integer overflow in bitrate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:24:20 +02:00
Michael Niedermayer cd32637741 Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62' 
* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
  riff: Validate bitrate

Conflicts:
	libavformat/riffdec.c

See: 189420cb56
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:23:42 +02:00
Andreas Cadhalpun 189420cb56 riffdec: prevent negative bit rate 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:12:36 +02:00
Michael Niedermayer 7da1f00e79 Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d' 
* commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d':
  mp3: Make the seek more robust

Conflicts:
	libavformat/mp3dec.c

Mostly not merged

See: b6267901c4 and various later commits

The bug is also not reproducable in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:01:31 +02:00
Michael Niedermayer ba77fb61f7 Merge commit 'd80811c94e068085aab797f9ba35790529126f85' 
* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
	libavformat/asfdec_o.c
	libavformat/avidec.c
	libavformat/dxa.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/riff.h
	libavformat/riffdec.c
	libavformat/wavdec.c
	libavformat/wtvdec.c
	libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 15:22:37 +02:00
Michael Niedermayer e72988d3f8 Merge commit '355864ef7a9548ee6491a25de1e0650bd983a667' 
* commit '355864ef7a9548ee6491a25de1e0650bd983a667':
  g726: Do not crash on user mistake

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 15:08:30 +02:00
Ronald S. Bultje 3a18d3fa04 ivfenc: write duration at end-of-stream. 
At the beginning, the value is not initialized.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 13:56:50 +02:00
Hendrik Leppkes 796268654c asfdec: always reset packet state after seeking 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-12 13:24:23 +02:00
Michael Niedermayer cdb0d7e439 avformat/brstm: Remove unused variable 
Fixes "libavformat/brstm.c:128:35: warning: variable info_size set but not used"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 12:17:40 +02:00
Michael Niedermayer 944a1aa3c5 avformat/yuv4mpegdec: Use 64bit for file offset 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 00:00:21 +02:00
Michael Niedermayer f8db81074a avcodec/utils: Assert that the pointer is set when size is in ff_fast_malloc() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 23:36:45 +02:00
Michael Niedermayer 59a07df067 avcodec/utils: Avoid undefined void casts in ff_fast_malloc() 
based on code from libavutil/mem.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 23:24:16 +02:00
Michael Niedermayer b3415e4c5f avutil/mem: Fix potential overflow in overallocation code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 22:47:09 +02:00
Michael Niedermayer bc976e5793 avcodec/utils: Fix potential overflow in overallocation code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 22:46:44 +02:00
Paul B Mahol 9ea81fe95e fate: add tests for w3fdif filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-11 19:34:04 +00:00
Paul B Mahol 3666974230 avformat/yuv4mpegdec: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-11 19:31:04 +00:00
Ronald S. Bultje 3bb58c377b vf_psnr: fix rgb channel order mixup in final log message. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 19:13:57 +02:00
Ronald S. Bultje 9879421f1a vf_psnr: always calculate MSE over full pixel range. 
This makes the output compatible with that of pretty much any other
tool that calculates PSNR.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 18:47:05 +02:00
Andreas Cadhalpun f1bdc23437 riff: Validate bitrate 2015-07-11 18:45:45 +02:00
Luca Barbato c1d647b15a mp3: Make the seek more robust 
Try to parse up to 4 packets to find the closest packet.

Reported-By: jan.schlueter@ofai.at
 2015-07-11 18:45:45 +02:00
Luca Barbato d80811c94e riff: Use the correct logging context 2015-07-11 18:45:44 +02:00
Luca Barbato 355864ef7a g726: Do not crash on user mistake 
Properly report the sample rate as invalid

CC: libav-stable@libav.org
 2015-07-11 18:45:44 +02:00
Michael Niedermayer 9b8b804cfb avformat/yuv4mpegdec: Remove unused variables 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 14:49:55 +02:00
Ronald S. Bultje 733c5d889b yuv4mpeg: add rough duration estimate and seeking. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 14:46:19 +02:00
Ronald S. Bultje c381af77c5 vF_psnr: move set_meta() calls out of loop. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 12:48:58 +02:00
Michael Niedermayer e76c34d08c Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3' 
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3':
  fbdev: Support the RGB565 colour space.

Conflicts:
	libavdevice/fbdev_dec.c

See: 43d36599fe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 12:25:03 +02:00
Dan Flett 87f98a2b9d fbdev: Support the RGB565 colour space. 
Tested on a Raspberry Pi.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-11 10:15:59 +03:00
Ronald S. Bultje 0303d43964 vf_psnr: add channel weighting based on chroma subsampling. 
Also add per-channel psnr stream averages to final log message.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 04:14:09 +02:00
Michael Niedermayer 235e903b63 Merge commit '1410eeb6ea6bc5784e40032430afcdf54a79aedb' 
* commit '1410eeb6ea6bc5784e40032430afcdf54a79aedb':
  imc: Use correct position for flcoeffs2 calculation

See: 75fd5ce4c1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 00:38:16 +02:00
Michael Niedermayer c06e556274 avcodec/mpeg4videodec: Check P cbpy 
Fixes undefined behavior
Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 00:22:29 +02:00