Commit Graph

61 Commits

Author SHA1 Message Date
Michael Niedermayer
15c481614b Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
  Pass pointer to integer buffer instead of integer to memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 18:44:46 +01:00
Mashiat Sarker Shakkhar
6d4deecfdf Pass pointer to integer buffer instead of integer to memcpy 2011-12-08 22:53:36 +06:00
Michael Niedermayer
ec8a3e25d8 Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
  Partially fix CDLMS prediction

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 00:37:55 +01:00
Mashiat Sarker Shakkhar
c5cd231151 Partially fix CDLMS prediction 2011-12-08 03:57:21 +06:00
Michael Niedermayer
1fa8ff38e4 Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
  Fix lms_update()
  Move num_lms reading out of a loop
  Use correct value for range
  Fix some int / int16_t / int32_t confusion
  Implement revert_mclms() and associated functions
  Fix two more int16_t vs. int confusion
  Init s->cdlms[][].recent to order - 1
  Add a size argument to dump_int_buffer()
  Get rid of logging that are not required anymore
  Fix some int vs. int16_t confusion

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07 04:49:42 +01:00
Mashiat Sarker Shakkhar
460bec6800 Fix lms_update() 2011-12-02 16:24:50 +06:00
Mashiat Sarker Shakkhar
075ebdf735 Move num_lms reading out of a loop 2011-12-02 03:11:59 +06:00
Mashiat Sarker Shakkhar
29c2fcb677 Use correct value for range
The current range value causes an underflow
when negated and pushes anything less than zero
to the minimum.
2011-12-02 03:11:21 +06:00
Mashiat Sarker Shakkhar
768261e50d Fix some int / int16_t / int32_t confusion
For now force everything to int16_t, except
for variables used as index
2011-12-02 03:09:19 +06:00
Mashiat Sarker Shakkhar
8aa831c07b Implement revert_mclms() and associated functions 2011-11-30 22:44:59 +06:00
Mashiat Sarker Shakkhar
bf8715719a Fix two more int16_t vs. int confusion
If everything works fine for 16-bit streams,
the current code could be extended to do 24-bit.
2011-11-30 22:44:45 +06:00
Michael Niedermayer
dd32a305bd wmall: fix return type of dump_int_buffer()
Found-by: Dominique Leuenberger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:23:39 +01:00
Michael Niedermayer
dae7ff0416 wmall: remove tabs that leaked in from a merge and seem to have
managed to silently bypass the push checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:21:46 +01:00
Mashiat Sarker Shakkhar
be8a0d26db Init s->cdlms[][].recent to order - 1
Not sure if this is correct. But looks like
it was giving us off-by-one's when used to index
buffers.
2011-11-30 02:17:44 +06:00
Mashiat Sarker Shakkhar
6dd19c97c4 Add a size argument to dump_int_buffer() 2011-11-30 02:16:48 +06:00
Mashiat Sarker Shakkhar
81a3c67169 Get rid of logging that are not required anymore
(Resolves some conflicts)
2011-11-30 02:15:08 +06:00
Mashiat Sarker Shakkhar
e6c66fcf68 Fix some int vs. int16_t confusion
Size should be determined from bits per sample.
The current code only accepts 16-bit streams.
2011-11-30 02:06:12 +06:00
Michael Niedermayer
b429440d85 Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
  call revert_cdlms()
  Fix some loop conditions to prevent overreads
  Initialize pred in lms_predict()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22 21:32:11 +01:00
Mashiat Sarker Shakkhar
ea0323b0fa call revert_cdlms() 2011-11-22 01:03:15 +06:00
Mashiat Sarker Shakkhar
6cf31ef263 Fix some loop conditions to prevent overreads 2011-11-22 01:01:30 +06:00
Mashiat Sarker Shakkhar
a3a8d5e0c1 Initialize pred in lms_predict() 2011-11-22 00:54:01 +06:00
Michael Niedermayer
34465bbcb4 Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall: (24 commits)
  Clean-up
  dump_int_buffer() to dump samples from a buffer
  Implement revert_cdlms()
  Doxy for reset_codec()
  Store transient state and position of transient area
  Implement use_high_update_speed() and use_normal_update_speed()
  Initialize num_logged_tiles and remove unnecessary codes
  Log index for each line of output
  Log tile size
  Output decoded residues
  Replace placeholders with actual calls to clear_codec_buffers() and reset_codec()
  Implement lms_update()
  Implement lms_predict()
  Implement reset_codec()
  Add missing syntax elements to WmallDecodeCtx
  Add .recent syntax element to cdlms struct
  Implement clear_codec_buffers()
  Add buffers to context necessary for reverting cdmls and mclms filter
  Use avpriv_copy_bits() instead of ff_copy_bits()
  Cosmetics
  ...

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-20 15:43:19 +01:00
Mashiat Sarker Shakkhar
7a9807dea4 Clean-up 2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
3e2f664b99 dump_int_buffer() to dump samples from a buffer 2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
caf9eb85b1 Implement revert_cdlms() 2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
d47782df26 Doxy for reset_codec() 2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
3e4901b24e Store transient state and position of transient area 2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
3f3d2b5f65 Implement use_high_update_speed() and use_normal_update_speed() 2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
1e0db1c52a Initialize num_logged_tiles and remove unnecessary codes 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
5b2680a2af Log index for each line of output 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
a7c31f1595 Log tile size 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
d5aef477e6 Output decoded residues 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
f3d349f697 Replace placeholders with actual calls to clear_codec_buffers() and reset_codec() 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
269a0dee19 Implement lms_update() 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
0faae518e9 Implement lms_predict() 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
03684c8ff3 Implement reset_codec() 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
93d2cabd61 Add missing syntax elements to WmallDecodeCtx 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
79b16e780d Add .recent syntax element to cdlms struct 2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
87b9c23b9a Implement clear_codec_buffers() 2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
d58db7207d Add buffers to context necessary for reverting cdmls and mclms filter 2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
a80a10bd73 Use avpriv_copy_bits() instead of ff_copy_bits() 2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
374582acfe Cosmetics 2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
fa3e0190f9 Add missing ff_ before the AVCodec struct for wmalossless 2011-11-20 14:51:38 +06:00
Andreas Öman
4d9d9a443f wmall: Working bitstream parser 2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
9ef5d707e6 Implement use_high_update_speed() and use_normal_update_speed()
(cherry picked from commit 9ebc93fa4623791eca9efeee4de65b23dc015de1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:50 +01:00
Mashiat Sarker Shakkhar
144d815912 Initialize num_logged_tiles and remove unnecessary codes
(cherry picked from commit 69bca779e5d8409cde336406a26b5173002cac97)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:46 +01:00
Mashiat Sarker Shakkhar
9634b1c6f2 Log index for each line of output
(cherry picked from commit 9e2ccb2de8d4dc5179cd86610b129500e6223be7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:41 +01:00
Mashiat Sarker Shakkhar
2f8b8f6953 Log tile size
(cherry picked from commit 257e5c4829cd916938c9e1922e50668636346f71)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:30 +01:00
Mashiat Sarker Shakkhar
6e4a86a3f8 Output decoded residues 2011-11-11 03:30:18 +01:00
Mashiat Sarker Shakkhar
8f8dcf4486 Replace placeholders with actual calls to clear_codec_buffers() and reset_codec() 2011-11-11 03:28:39 +01:00