Commits · 631fa3c63a143d19515f4c154bca4a4a438626f5 · videolan / ffmpeg-mt

31 May, 2009 40 commits

I will take care of the lcl de-/encoder while Roberto is unavailable. · 631fa3c6
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19065 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
631fa3c6

Fix memleak due to c->decomp_buf never being freed. · ef02591d

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19064 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

ef02591d

Only call inflateEnd when we were actually using the zlib code. · 6601498e
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19063 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
6601498e
avctx->priv_data is initialized to 0, get rid of useless extra initialization. · 5d7f5afb
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19062 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
5d7f5afb

Merge variable declaration and initialization. · deb257ca

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19061 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

deb257ca

Use int-size types instead of char where it makes no difference. · 7e939c81
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19060 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
7e939c81
Take advantage of available input padding to optimize mszh_decomp · 1bde193b
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19059 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
1bde193b

Change maskbit variable to contain (1 << maskbit) · 0aed742a

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19058 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

0aed742a

Remove check that thanks to padding is no longer necessary. · b358e56a
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19057 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
b358e56a

100l, the compression field in lcl extradata must be interpreted as · dfb035a9

reimar authored May 31, 2009

int8_t, not uint8_t to allow -1 for "no compression".
The original code worked, but only when char was signed.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19056 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

dfb035a9

One more use for FFMIN. · 84272386

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19055 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

84272386

Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression. · d32e7075
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19054 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
d32e7075

Mark srcptr as const in mszh_decomp · 48b7918a

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19053 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

48b7918a

Remove unnecessary put_bits/get_bits includes. · b0c2c3df

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19052 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

b0c2c3df

Use bytestream_get_le16 to simplify offset/count calculation for mszh decompression. · 5cc28812
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19051 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
5cc28812

Remove useless & 0x1f · 7ae78fa7

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19050 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

7ae78fa7

Document padding requirements of mszh_decomp srcptr buffer · 0046e92a
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19049 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
0046e92a
Use srcptr_end variable to avoid having to update both srcptr and srclen. · f472fc79
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19048 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
f472fc79
Change buffer size checks to avoid the undefined overflow case. · 0c77b3c0
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19047 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
0c77b3c0

Simply use memcpy instead of AV_RN32/AV_WN32 combination. · 295c3ee2

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19046 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

295c3ee2

Fix decoding of multithread-encoded lcl files on big-endian. · a70a0464
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19045 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
a70a0464

Remove another useless () · 749036c0

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19044 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

749036c0

Correct calculation of compressed input length. · af22e788

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19043 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

af22e788

Add sanity check for mthread_inlen, avoids crashes due to invalid reads. · b15df135
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19042 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
b15df135

Use FFMIN · 29965aea

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19041 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

29965aea

Factor out zlib decompression code to avoid massive code duplication, · 31e324a3

reimar authored May 31, 2009

particularly due to error checks.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19040 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

31e324a3

Use FFALIGN · ae1726ea

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19039 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

ae1726ea

Move variable into block where it is used, avoiding a unused variable · 4a569576

reimar authored May 31, 2009

warning if the zlib decoder is disabled.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19038 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

4a569576

Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG. · 6a00ca37
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19037 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
6a00ca37

Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible · f3204cf6

reimar authored May 31, 2009

here when the zlib decoder is disabled and libavcodec is used correctly.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19036 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

f3204cf6

lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER. · db13c3e5

reimar authored May 31, 2009

The zlib related code should not be compiled in when the decoder is disabled
and it thus will never be used, even if we have zlib available.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19035 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

db13c3e5

Get rid of extradata casts, it already has the right uint8_t * type · 70be77e0
reimar authored May 31, 2009
```
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19034 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
```
70be77e0

Make lcldec produce YUV output when the input file is coded like that, instead · cb8a4a62

reimar authored May 31, 2009

of having it do its own inefficient fixed-point YUV to RGB conversion.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19033 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

cb8a4a62

Remove now unused elements from LclEncContext · 8cf822b6

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19032 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

8cf822b6

Remove useless casts, extradata is already "uint8_t *" · b9eb5d3b

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19031 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

b9eb5d3b

lclenc.c: compress directly into output buffer instead of using a pointless · 07e865b4

reimar authored May 31, 2009

temporary buffer and then using put_bits to copy the data over.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19030 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

07e865b4

initialize pes state to skip · 79f26f8b

bcoudurier authored May 31, 2009

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19029 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

79f26f8b

Remove superfluous () from lclenc.c · e79069a2

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19028 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

e79069a2

Cosmetics: fix indentation in lclenc.c · 688f46e7

reimar authored May 31, 2009


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19027 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

688f46e7

Remove "#if CONFIG_ZLIB" checks from lclenc.c, the file is never compiled · d0043aea

reimar authored May 31, 2009

if zlib is not available.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19026 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

d0043aea