ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 22:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,091 Commits 36 Branches 398 Tags 535 MiB
444e9874a7
Commit Graph

248 Commits

Author SHA1 Message Date
Michael Niedermayer
444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffplay.c
	libavcodec/8svx.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c
	libavcodec/alac.c
	libavcodec/atrac3plusdec.c
	libavcodec/bink.c
	libavcodec/dnxhddec.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/fic.c
	libavcodec/flacdec.c
	libavcodec/flacenc.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/hevc.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libvo-aacenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec_float.c
	libavcodec/msmpeg4dec.c
	libavcodec/mxpegdec.c
	libavcodec/nvenc_h264.c
	libavcodec/nvenc_hevc.c
	libavcodec/pngdec.c
	libavcodec/qpeg.c
	libavcodec/ra288.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tiff.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/vp9.c
	libavcodec/wavpack.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:50:18 +02:00
Michael Niedermayer
94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:10:35 +02:00
Vittorio Giovara
def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Vittorio Giovara
7c6eb0a1b7 lavc: AV-prefix all codec flags 
Convert doxygen to multiline and express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Carl Eugen Hoyos
c239fcb948 lavc/jpeg2000: Signal lossless / bit-exact video stream. 2015-07-20 00:28:13 +02:00
Michael Niedermayer
d554715f67 avcodec/jpeg2000dec: Fix decoding of subsampled multi tile images 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 18:08:01 +02:00
Michael Niedermayer
9cf95654ac Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a' 
* commit '007e27d363ba7d994019dc897dc9c39071bb204a':
  avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()

Conflicts:
	libavcodec/atrac3plusdec.c
	libavcodec/sp5xdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 18:58:01 +02:00
Janne Grunau
007e27d363 avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer() 2015-07-01 12:10:25 +02:00
Michael Niedermayer
ecbd111768 avcodec/jpeg2000dec: Remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 19:36:52 +02:00
Michael Niedermayer
96e73fa649 avcodec/jpeg2000dec: Merge i_stepsize/2 decoder special case into dequant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 15:26:31 +02:00
Michael Niedermayer
5cccbc3b74 avcodec/jpeg2000dec: Check for mismatching per expected termination 
not just at the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-27 15:22:15 +02:00
Michael Niedermayer
8672c0a643 avcodec/jpeg2000dec: Limit poc end fields to whats available in jpeg2000_decode_packets() 
Fixes: Ticket4677

Solution based on information from
https://code.google.com/p/openjpeg/issues/detail?id=80

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-27 11:48:42 +02:00
Michael Niedermayer
b75c0a72ed avcodec/jpeg2000dec: Fix tp_index for POC 
Fixes Ticket2586

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 22:00:29 +02:00
Michael Niedermayer
c56ba5c270 avcodec/jpeg2000dec: Print what is found in place of EPH if EPH is not found 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 22:00:28 +02:00
Michael Niedermayer
c72a831931 avcodec/jpeg2000dec: Support progression order changes 
Fixes Ticket4657

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 21:00:10 +02:00
Michael Niedermayer
2ec0ba1e22 avcodec/jpeg2000dec: Parse POCs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 20:59:05 +02:00
Michael Niedermayer
7ca0cd5831 avcodec/jpeg2000dec: iterate in tile sample space for CPRL & RPCL 
Thats what the spec says should be done
aka iterate in the wrong space and use special cases to patch that up.
It sometimes can result in different order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 13:44:17 +02:00
Michael Niedermayer
f5822ea379 avcodec/jpeg2000dec: Add missing \n to av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 05:25:42 +02:00
Michael Niedermayer
50b77e364f avcodec/jpeg2000dec: iterate over positions with the special cases from jpeg2000 
The order in j2k is not the simple and logic one

Fixes Ticket4670

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 05:25:42 +02:00
Michael Niedermayer
6c4a2f11dd avcodec/jpeg2000dec: Add coords to Jpeg2000Tile 
These will be needed in subsequent commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 05:25:42 +02:00
Michael Niedermayer
f1e173049e avcodec/jpeg2000: Remove CBLK limit 
This also reduces the amount of memory needed
Fixes Ticket4672

The new code seems slightly faster as well, probably due to better cache usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 01:00:17 +02:00
Michael Niedermayer
9ff5e7974a avcodec/jpeg2000dec: Limit x/y step to 1<<30 
Fixes infinite loop
Fixes Ticket4663

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-25 00:43:49 +02:00
Michael Niedermayer
2d8bf3d126 avcodec/jpeg2000dec: Check PPx / PPy values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-25 00:23:31 +02:00
Michael Niedermayer
d580255571 vcodec/jpeg2000: Increase cblk size limit to 128 
Fixes Ticket4649

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:38:05 +02:00
Michael Niedermayer
ffa1de8a3b avcodec/jpeg2000dec: Use 32x32->64bit for 9/7i dequantization 
Like the 5/3 case this is needed to avoid overflows and similarly for 16bpp
output pure 32bit operations are insufficient if high quality is wanted

Note, this code-path is only used in bitexact mode, so this should not
affect the speed of any real use-case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:09:21 +02:00
Michael Niedermayer
05ef6324d1 avcodec/jpeg2000dec: Add 5/3 de-quantization special case for the lossless case 
This avoids a multiplication and 64bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:05:42 +02:00
Michael Niedermayer
8ff09e9098 avcodec/jpeg2000dec: Use 32x32->64bit for 5/3 dequantization 
This fixes overflows, using fewer bits would impact high bit depth quality

Fixes Ticket4654

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:03:38 +02:00
Michael Niedermayer
bb9f4f94ac avcodec/jpeg2000dec: Replace TPsot check by assert 
The condition is impossible now.
the TPsot type is changed to unsigned int to prevent gcc from producing warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 14:26:34 +02:00
Michael Niedermayer
5ba9ec824a avcodec/jpeg2000dec: Increase tile part limit to 256 
This is the maximum that the syntax of jpeg2000 is capable to store

Fixes Ticket4639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 14:26:34 +02:00
Michael Niedermayer
08326e73a2 avcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered 
Fixes Ticket4635

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-18 02:23:37 +02:00
Michael Niedermayer
2687a51a3f avcodec/jpeg2000dec: Drop unneeded rlevel variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-17 15:48:12 +02:00
Michael Niedermayer
20657e05bc avcodec/jpeg2000dec: Improve end check 
Fixes spurious end mismatch warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-16 18:34:20 +02:00
Michael Niedermayer
36241c4055 avcodec/jpeg2000dec: Fix term_cnt check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-16 18:31:59 +02:00
Michael Niedermayer
fefe04259a avcodec/jpeg2000dec: increase tile part limit to 32 
Fixes Ticket4629

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 23:24:49 +02:00
Michael Niedermayer
2819aeb0f3 avcodec/jpeg2000dec: Omit mqc reinit after the last pass 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 20:49:04 +02:00
Michael Niedermayer
96bbbebaf9 avcodec/jpeg2000dec: Fix Vertically causal context formation 
Fixes Ticket4626

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 18:12:45 +02:00
Michael Niedermayer
4ec14ce121 avcodec/jpeg2000dec: Improve readability of SOP check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 13:29:41 +02:00
Michael Niedermayer
9ba5fe7f3d avcodec/jpeg2000dec: Remove redundant check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 03:11:58 +02:00
Michael Niedermayer
5b0f55aab9 avcodec/jpeg2000dec: Check reslevelno in RPCL 
Fixes out of array read
Fixes Ticket4627

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 03:00:53 +02:00
Michael Niedermayer
a58f1bcc4c avcodec/jpeg2000dec: Skip SOP 
Fixes Ticket4625

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 02:32:45 +02:00
Michael Niedermayer
4bfdd967a6 avcodec/jpeg2000dec: Use <0 instead of != 0 for error checking 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 02:19:48 +02:00
Michael Niedermayer
5ef578d03a avcodec/jpeg2000dec: Also include remaining length in "Block length" error message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 01:43:14 +02:00
Michael Niedermayer
a206c13289 avcodec/jpeg2000: Change codeblock coords to same origin as bands 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 22:59:50 +02:00
Michael Niedermayer
6b08dc393b avcodec/jpeg2000dec: Print warning if the mqc pointer mismatches at the end 
If this occurs on valid and correctly decoded files it should be reduced to debug
level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 21:40:09 +02:00
Michael Niedermayer
91c8025c44 avcodec/jpeg2000dec: Show the progression order at debug level for all variants 
It was previously shown just for some, this makes it consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 21:40:08 +02:00
Michael Niedermayer
742a26c489 avcodec/jpeg2000dec: Print error messages for more error conditions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 15:15:51 +02:00
Michael Niedermayer
ad072a134f avcodec/jpeg2000dec: Handle format that has planes matching YUVA420P structure but seems not to be that 
Outputs something for p0_05.j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 13:01:12 +02:00
Michael Niedermayer
132bf0bbb7 avcodec/jpeg2000dec: Print all cdx/cdy values not just the 2nd and 3rd 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 11:49:49 +02:00
Michael Niedermayer
4a3bc0d9a5 avcodec/jpeg2000dec: Implement "Reset context probabilities on coding pass boundaries" 
No testcase with just this feature known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 03:38:41 +02:00
Michael Niedermayer
612f8cae06 avcodec/jpeg2000dec: Support RPCL 
Fixes Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 02:53:51 +02:00