generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,435 Commits 24 Branches 241 Tags 173 MiB
c5669f3c59
Commit Graph

23695 Commits

Author SHA1 Message Date
Michael Niedermayer
c5669f3c59 vc1dec: fix current ptr selection in vc1_mc_4mv_chroma() 
No sample tried shows a difference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 15:05:25 +02:00
Michael Niedermayer
236b0c4084 vc1dec: factorize picture pointer selection in vc1_mc_4mv_chroma() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 14:59:49 +02:00
Michael Niedermayer
72e5d91908 vc1dec: factorize picture pointer selection code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 14:50:41 +02:00
Michael Niedermayer
3fdd0979ac vc1dec: Fix mv_f shuffling 
Avoid a (confusing) memcpy()
Simpler code
Fixes a small number of artifacts in black_screen_VC-1.mkv
and several more artifacts in other videos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 14:06:07 +02:00
Michael Niedermayer
1d0f817b17 vc1dec: Fix mv_f shuffling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 13:16:27 +02:00
Michael Niedermayer
62d9445396 vc1: simplify code use INIT_LUT() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 12:52:52 +02:00
Michael Niedermayer
2e789d165b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Get rid of duplication between *_rnd_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 10:17:28 +02:00
Michael Niedermayer
8d86cf4cfa Merge commit 'feec9349d35b3a46d0c6a05e3b23626050b76a77' 
* commit 'feec9349d35b3a46d0c6a05e3b23626050b76a77':
  mpegvideo: unref cur/next/prev frames when flushing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 10:11:34 +02:00
Michael Niedermayer
c2a0833c09 Merge commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223' 
* commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223':
  x86: Factorize duplicated inline assembly snippets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 10:01:15 +02:00
Michael Niedermayer
03b81df9e6 Merge commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b' 
* commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b':
  jpeg2000: Add mutlti-threading support to decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 09:55:59 +02:00
Michael Niedermayer
fc69033371 avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC, Try #2 
This should fix building with MSVC until someone can change the
    code so it works with MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-24 02:02:25 +02:00
Martin Storsjö
486f76f029 x86: Get rid of duplication between *_rnd_template.c 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-23 23:30:17 +03:00
Hendrik Leppkes
feec9349d3 mpegvideo: unref cur/next/prev frames when flushing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-23 19:11:59 +02:00
Martin Storsjö
6a8561dbd7 x86: Factorize duplicated inline assembly snippets 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-23 15:07:31 +02:00
Michael Niedermayer
7a617d6c17 avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC 
This should fix building with MSVC until someone can change the
code so it works with MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-23 12:46:28 +02:00
Nicolas Bertrand
2e2d24667a jpeg2000: Add mutlti-threading support to decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-23 11:53:04 +02:00
Michael Niedermayer
0a73803c86 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Move some conditional code around to avoid unused variable warnings

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-23 11:01:46 +02:00
Michael Niedermayer
5056cff125 Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d' 
* commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d':
  jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-23 10:24:49 +02:00
Michael Niedermayer
7c49c8b0ac Merge commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7' 
* commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7':
  threads: always call thread_finish_setup for intra codecs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-23 10:12:58 +02:00
Piotr Bandurski
f4596e8bb6 mjpegdec: Add support for 4:1:1 YUV 
Fixes part of ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 22:03:09 +02:00
Michael Niedermayer
2ae91c86f3 avcodec_get_context_defaults3: set codec_id 
Fixes Ticket1996

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 21:44:05 +02:00
Michael Niedermayer
e2e9bee2da Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/mqc.c
	libavcodec/mqc.h
	libavcodec/mqcdec.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 20:00:54 +02:00
Michael Niedermayer
c1c2b0b339 avcodec: rename jpeg2000 decoder to j2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 19:28:33 +02:00
Michael Niedermayer
7a556ebccf Merge commit '0c15a9aa7e1654a19144eb594f9639a57fd47482' 
* commit '0c15a9aa7e1654a19144eb594f9639a57fd47482':
  sh4: Remove dubious aligned dsputil code

Conflicts:
	libavcodec/sh4/dsputil_align.c
	libavcodec/sh4/h264chroma_init.c
	libavcodec/sh4/hpeldsp.c
	libavcodec/sh4/qpel.c

If someone wants to maintain the sh4 code in ffmpeg, wants to
add more optimizations, or volunteers to maintain any of
what is removed here and can confirm that they are faster.
Then please contact us!

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 18:59:23 +02:00
Michael Niedermayer
430d69c942 Merge commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85' 
* commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85':
  x86: cavs: Refactor duplicate dspfunc macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 18:37:44 +02:00
Michael Niedermayer
f84e373797 Merge commit '78fa0bd0f7067868943c0899907e313414492426' 
* commit '78fa0bd0f7067868943c0899907e313414492426':
  x86: cavs: Put mmx-specific code into its own init function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 18:29:05 +02:00
Diego Biurrun
c1ad70c3cb x86: Move some conditional code around to avoid unused variable warnings 2013-04-22 17:50:02 +02:00
Janne Grunau
10f1a4d9bd jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12 2013-04-22 17:11:21 +02:00
Janne Grunau
94660c3524 threads: always call thread_finish_setup for intra codecs 
Intra codecs do not need an update_thread_context() function and never
call ff_thread_finish_setup(). They rely on ff_thread_get_buffer()
calling it. So call it even if the get_buffer2 function pointer is
avcodec_default_get_buffer2 and it has not been called before.
 2013-04-22 17:11:20 +02:00
Diego Biurrun
f13888afcc avcodec: Bump minor for JPEG 2000 decoder 2013-04-22 15:52:43 +02:00
Nicolas Bertrand
c81a706381 JPEG 2000 decoder for DCinema 
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-22 15:38:29 +02:00
Michael Niedermayer
2288c77689 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Remove some duplicate function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 13:07:20 +02:00
Diego Biurrun
0c15a9aa7e sh4: Remove dubious aligned dsputil code 
The code represents a considerable maintenance burden and it is not
clear that it gives a noticeable benefit to outweigh this after 10
years of improvements in compiler technology since its creation.
 2013-04-22 12:12:24 +02:00
Diego Biurrun
b4ad7c54c8 x86: cavs: Refactor duplicate dspfunc macro 2013-04-22 12:05:09 +02:00
Diego Biurrun
fce99322b0 h264: Drop unused variable 2013-04-22 12:05:09 +02:00
Diego Biurrun
78fa0bd0f7 x86: cavs: Put mmx-specific code into its own init function 
Before, this code was labeled as mmxext and enabled both for the
3dnow and the mmxext case.
 2013-04-22 10:42:50 +02:00
Diego Biurrun
311a592dfc x86: Remove some duplicate function declarations 2013-04-22 02:29:57 +02:00
Michael Niedermayer
de9fbf3dc4 indeo4: implement haar 8x1 and 1x8 transforms 
Fixes Ticket1984
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 02:29:12 +02:00
Michael Niedermayer
83330cf5fa init_vlc_sparse: fix leak on error 
Fixes CID1005312

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-21 11:55:19 +02:00
Michael Niedermayer
2d23493020 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: hpeldsp: Include attributes.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-21 09:54:02 +02:00
Roberto Togni
8017683647 qdm2: initialize coeff_per_sb_select from bit_rate 
The value of coeff_per_sb_select depends on the bit rate, not on
sub_sampling.
Also remove the calculation of tmp, no longer needed.

Fixes tickets #1868 and #742 (only audio part)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-21 02:00:06 +02:00
Michael Niedermayer
4824aea7af avcodec/mpegvideo: change asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 21:31:19 +02:00
Michael Niedermayer
0dd25e4699 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 16:24:15 +02:00
Michael Niedermayer
0e3d2b2c8d Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9' 
* commit '287c8db39e71af7047e551bbfd1264d771cccbc9':
  cosmetics: bfin: Fix indentation in the dsputil init function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 16:19:59 +02:00
Michael Niedermayer
9ae56b85b6 Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748' 
* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
  dsputil: Remove non-8bpp draw_edge

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 16:07:20 +02:00
Michael Niedermayer
f6dcd844ee Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1' 
* commit '619e0da19119bcd683f135fe9a164f37c0ca70d1':
  dsputil: Remove unused 32-bit functions

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 15:55:29 +02:00
Martin Storsjö
6d0fbebf94 ppc: hpeldsp: Include attributes.h 
This fixes building in configurations where altivec is disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-20 16:43:01 +03:00
Michael Niedermayer
d2d2c309e8 Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc' 
* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
  dsputil: Remove hpel functions (moved to hpeldsp)

Conflicts:
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 15:36:23 +02:00
Michael Niedermayer
6ec26157b9 Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
  alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/alpha/hpeldsp_alpha.c
	libavcodec/alpha/hpeldsp_alpha.h
	libavcodec/alpha/hpeldsp_alpha_asm.S
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 15:24:25 +02:00
Michael Niedermayer
fdb1f7eb7a Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493' 
* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493':
  sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/hpeldsp.h
	libavcodec/sparc/dsputil_vis.c
	libavcodec/sparc/hpeldsp_vis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 15:11:06 +02:00