RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
53,518 Commits 36 Branches 392 Tags 249 MiB
Commit Graph

24143 Commits

Author SHA1 Message Date
Michael Niedermayer c2e942099a j2k: drop cblknx/y from Jpeg2000Band 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:55:29 +02:00
Michael Niedermayer 8c2e201c4f j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000Prec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:53:42 +02:00
Michael Niedermayer a05db52c12 j2k: remove cblk from band 
cblk is now in the same place as in jpeg2000, which will simplify
merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:51 +02:00
Michael Niedermayer 81ccc31f75 j2kdec: merge decode_tile cblk handling from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer 2c5a5c5a62 j2kdec: cdxy != 1 does not work, print an error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer 14652c080d j2k/jpeg2000: restructure cblk coord 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer 5161c62595 j2k: fix band coord 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer 369422db0c j2kdec: merge cblk restructuring from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer cbaa0871c2 j2kenc: switch to cblk in prec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer 9fd23baa74 j2k: merge precinct init code from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer 3300b5f6ce j2k/jpeg2000 headers: Cblk/Prec cleanup & merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer 1c711b6ecd Merge remote-tracking branch 'dilaroga/master' 
* dilaroga/master:
  avcodec/vda_h264_dec: fix a memory leak
  avcodec/vda_h264: use av_buffer to manage buffers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 09:32:22 +02:00
Xidorn Quan 499b82f604 avcodec/vda_h264_dec: fix a memory leak 
Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
 2013-05-27 09:07:48 +02:00
Xidorn Quan ffd7fd7944 avcodec/vda_h264: use av_buffer to manage buffers 
This patch fixes a leak of buffer when seeking occurs.
It adds a flag in struct vda_context for compatibility with apps which
currently use it. If the flag is not set, the hwaccel will behave like
before.

Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
 2013-05-27 09:05:55 +02:00
Michael Niedermayer b7c6d1ed90 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Only output eabi attributes if building for ELF
  fix scalarproduct_and_madd_int16_altivec() for orders > 16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 08:55:24 +02:00
Michael Niedermayer 53ec1c811e j2k: merge cosmetics and non functional changes from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 02:27:56 +02:00
Paul B Mahol e5c7bafb44 libtwolame: add forgotten calls 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 21:57:28 +00:00
Michael Niedermayer bd89b2b22a j2k/jpeg2000: log2_prec size cleanup 
This also changes the cblk size storage method to what jpeg2000 uses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 22:29:11 +02:00
Michael Niedermayer cb39dfb870 j2k/jpeg2000: check cblk size 
This is based on j2k FCD which is ambigous thus the limit
might be tighter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 9ea242962c j2k: ff_j2k_tag_tree_init: check for integer overflow in alloc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer b01e61a47d jpeg2000: cosmetics & restructuring from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 228ce33606 j2k: add #includes from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 874a06bd1f j2k: cosmetics from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 6e16321d66 j2kdec: add AVClass 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer df3e6e5e22 j2kdec: cosmetics from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 277691a130 j2kdec: merge copyright header with jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer a2daf929ed j2kdec: profile code from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 726eac1df9 j2kdec: cosmetics from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 88d2dd00fe avcodec/j2kdec: drop disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer de90bd6c3f j2k/jpeg2000: merge cosmetics and whitespace 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer bcf59b5d8f j2kdec: merge jpeg2000_init_static_data() from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer 5d67dfd71c j2kdec: move avctx init to decode_frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer b4013899e2 j2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/g 
Also add a related comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:22:16 +02:00
Michael Niedermayer ac325f0613 j2k.h: whitespace cosmetics 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:22:16 +02:00
Michael Niedermayer 5b4cad4a64 j2k.h: remove disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:49 +02:00
Michael Niedermayer ad194874ee j2k.h: Merges various cosmetics & unused defines 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer da90661718 j2k/jpeg2000: merge copyright 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer e708c7fa21 j2k: drop disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer e66faf71eb j2k: merge ff_j2k_init_tier1_luts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer b67fe48f34 jpeg2000/j2k: merge getsigctxno() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer 69b9773980 j2k: s/getnbctxno/getsigctxno/g 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer 5157ec89ef j2k: redesign vert_causal_ctx_csty implementation 
The old implementation was incomplete and could not have worked
This also fixes some warnings
New code is untested as i dont seem to have a sample file that uses this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Kostya Shishkov 0418cbf081 fix scalarproduct_and_madd_int16_altivec() for orders > 16 
the second and third sources were incremented only by half of the needed size
 2013-05-26 16:10:47 +02:00
Michael Niedermayer 438c45c08a j2kdec: fix used bytestream function 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 15:00:23 +02:00
Michael Niedermayer d42106c3ac j2k: rename a few inline functions and data tables to match jpeg2000 
also inlcudes some other cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 14:02:44 +02:00
Michael Niedermayer c78f3e5571 j2kdec: prog_order reading from jpeg2000dec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 13:57:56 +02:00
Michael Niedermayer 81be0965e3 j2k: merge Jpeg2000CodingStyle from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 13:57:56 +02:00
Michael Niedermayer 4cf7b87551 av_cpu_count: factorize "detected %d logical cores" message 
Also print the message just once

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 03:19:55 +02:00
Michael Niedermayer 5f44f47b72 mpegvideo_enc: do not unreference frames before the code is done with them 
Fixes Ticket2592

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 20:30:50 +02:00
Michael Niedermayer 42bb3e4db6 avcodec: remove ff_get_logical_cpus() 
This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:25:53 +02:00