Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						83fd377c94 
					 
					
						
						
							
							j2k/jpeg2000: merge float DWT and related code  
						
						... 
						
						
						
						the float conditions are largely changed to check the DWT
instead of the bitexact flag, which previously was wrong
(DWT53 is always int)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-29 00:29:25 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						fe7136ef82 
					 
					
						
						
							
							j2k/jpeg2000: split stepsize in float & int variables  
						
						... 
						
						
						
						This is more clear and less prone to mistakes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-28 22:16:14 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f7129ab928 
					 
					
						
						
							
							j2k/jpeg2000: fix typo in lut_gain index  
						
						... 
						
						
						
						no testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-28 22:16:14 +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 
							
						 
					 
					
						
						
							
						
						8cf57efdd7 
					 
					
						
						
							
							j2k/jpeg2000: merge lowres code  
						
						... 
						
						
						
						This also fixes lowres use with ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-28 00:30:06 +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 
							
						 
					 
					
						
						
							
						
						243cc38d94 
					 
					
						
						
							
							j2k: change fixed point of stepsize to 16.16  
						
						... 
						
						
						
						This seems more natural and matches jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-27 17:58:06 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						1b5cb6c00a 
					 
					
						
						
							
							j2k/jpeg2000: Partially merge quantization code  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-27 17:50:54 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9a18395b92 
					 
					
						
						
							
							j2k/jpeg2000: merge a few whitespaces  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-27 16:10:36 +02:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						78c7bff04a 
					 
					
						
						
							
							avcodec/j2k: rename J2K_ constants to JPEG2000_  
						
						... 
						
						
						
						This should simplify merging the 2 decoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-21 21:44:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0ab0ed2b86 
					 
					
						
						
							
							j2k: Rename structs to be more similar to jpeg2000dec  
						
						... 
						
						
						
						This should simplify merging
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-21 21:44:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9bb188da96 
					 
					
						
						
							
							j2k: avoid printf() useage in debug code  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-05 19:31:27 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						da317efd92 
					 
					
						
						
							
							j2k: reorder multiplications to avoid interger overflows related to precincts  
						
						... 
						
						
						
						Fixes CID703778, CID703777
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-10-23 00:03:49 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						45ae9a8fc9 
					 
					
						
						
							
							j2k: reorder multiplications to avoid interger overflows related to code blocks  
						
						... 
						
						
						
						Fixes CID703776, CID703775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-10-23 00:03:49 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						d1974e05d1 
					 
					
						
						
							
							j2k: fix "static is not at beginning of declaration" warning  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-09-20 02:13:52 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						4e3a5bc1f6 
					 
					
						
						
							
							j2k: remove unreachable assert()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-06-10 23:27:17 +02:00 
						 
				 
			
				
					
						
							
							
								Rukhsana Ruby 
							
						 
					 
					
						
						
							
						
						88e9397ef1 
					 
					
						
						
							
							j2k[c/h] j2kdec.c: Implement 2 code block styles  
						
						
						
						
					 
					
						2011-05-24 01:31:54 +02:00 
						 
				 
			
				
					
						
							
							
								Rukhsana Ruby 
							
						 
					 
					
						
						
							
						
						cbe60f3451 
					 
					
						
						
							
							j2k: Add void as the parameter of function ff_j2k_init_tier1_luts  
						
						
						
						
					 
					
						2011-05-24 01:31:54 +02:00 
						 
				 
			
				
					
						
							
							
								Kamil Nowosad 
							
						 
					 
					
						
						
							
						
						83654c7b1b 
					 
					
						
						
							
							Add Kamil Nowosads j2k code.  
						
						... 
						
						
						
						This needs work but it should not rot in soc svn. 
						
						
					 
					
						2011-05-24 01:31:53 +02:00