"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libavcodec/h264_cavlc.c" between
libav-12.tar.gz and libav-12.1.tar.gz

About: libav provides cross-platform tools ("avconv") and libraries to convert, manipulate and stream a wide range of multimedia (audio and video) formats and protocols.

h264_cavlc.c  (libav-12):h264_cavlc.c  (libav-12.1)
skipping to change at line 582 skipping to change at line 582
} }
} }
#define STORE_BLOCK(type) \ #define STORE_BLOCK(type) \
scantable += zeros_left + total_coeff - 1; \ scantable += zeros_left + total_coeff - 1; \
if(n >= LUMA_DC_BLOCK_INDEX){ \ if(n >= LUMA_DC_BLOCK_INDEX){ \
((type*)block)[*scantable] = level[0]; \ ((type*)block)[*scantable] = level[0]; \
for(i=1;i<total_coeff && zeros_left > 0;i++) { \ for(i=1;i<total_coeff && zeros_left > 0;i++) { \
if(zeros_left < 7) \ if(zeros_left < 7) \
run_before= get_vlc2(gb, run_vlc[zeros_left - 1].table, RUN_VLC_ BITS, 1); \ run_before= get_vlc2(gb, run_vlc[zeros_left - 1].table, RUN_VLC_ BITS, 1); \
else \ else {\
run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); \ run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); \
run_before = FFMIN(zeros_left, run_before);\
}\
zeros_left -= run_before; \ zeros_left -= run_before; \
scantable -= 1 + run_before; \ scantable -= 1 + run_before; \
((type*)block)[*scantable]= level[i]; \ ((type*)block)[*scantable]= level[i]; \
} \ } \
for(;i<total_coeff;i++) { \ for(;i<total_coeff;i++) { \
scantable--; \ scantable--; \
((type*)block)[*scantable]= level[i]; \ ((type*)block)[*scantable]= level[i]; \
} \ } \
}else{ \ }else{ \
((type*)block)[*scantable] = ((int)(level[0] * qmul[*scantable] + 32))>> 6; \ ((type*)block)[*scantable] = ((int)(level[0] * qmul[*scantable] + 32))>> 6; \
for(i=1;i<total_coeff && zeros_left > 0;i++) { \ for(i=1;i<total_coeff && zeros_left > 0;i++) { \
if(zeros_left < 7) \ if(zeros_left < 7) \
run_before= get_vlc2(gb, run_vlc[zeros_left - 1].table, RUN_VLC_ BITS, 1); \ run_before= get_vlc2(gb, run_vlc[zeros_left - 1].table, RUN_VLC_ BITS, 1); \
else \ else {\
run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); \ run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); \
run_before = FFMIN(zeros_left, run_before);\
}\
zeros_left -= run_before; \ zeros_left -= run_before; \
scantable -= 1 + run_before; \ scantable -= 1 + run_before; \
((type*)block)[*scantable]= ((int)(level[i] * qmul[*scantable] + 32) )>>6; \ ((type*)block)[*scantable]= ((int)(level[i] * qmul[*scantable] + 32) )>>6; \
} \ } \
for(;i<total_coeff;i++) { \ for(;i<total_coeff;i++) { \
scantable--; \ scantable--; \
((type*)block)[*scantable]= ((int)(level[i] * qmul[*scantable] + 32) )>>6; \ ((type*)block)[*scantable]= ((int)(level[i] * qmul[*scantable] + 32) )>>6; \
} \ } \
} }
 End of changes. 4 change blocks. 
2 lines changed or deleted 6 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS