A few cosmetics aside, this makes the function identical to the one with the same name in proresenc_kostya.
Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -257,7 +257,6 @@ static void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int val) · 256 unmodified lines | |||
| 257 | 257 | ||
| 258 | #define GET_SIGN(x) ((x) >> 31) | 258 | #define GET_SIGN(x) ((x) >> 31) |
| 259 | #define MAKE_CODE(x) (((x) * 2) ^ GET_SIGN(x)) | 259 | #define MAKE_CODE(x) (((x) * 2) ^ GET_SIGN(x)) |
| 260 | #define TO_GOLOMB2(val,sign) ((val)==0 ? 0 : ((val) << 1) + (sign)) | ||
| 261 | 260 | ||
| 262 | static av_always_inline int get_level(int val) | 261 | static av_always_inline int get_level(int val) |
| 263 | { | 262 | { |
| @@ -271,7 +270,6 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, · 7 unmodified lines | |||
| 271 | { | 270 | { |
| 272 | int i; | 271 | int i; |
| 273 | int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; | 272 | int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; |
| 274 | int diff_sign; | ||
| 275 | 273 | ||
| 276 | prev_dc = (blocks[0] - 0x4000) / scale; | 274 | prev_dc = (blocks[0] - 0x4000) / scale; |
| 277 | encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); | 275 | encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); |
| @@ -282,8 +280,8 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, · 4 unmodified lines | |||
| 282 | dc = (blocks[0] - 0x4000) / scale; | 280 | dc = (blocks[0] - 0x4000) / scale; |
| 283 | delta = dc - prev_dc; | 281 | delta = dc - prev_dc; |
| 284 | new_sign = GET_SIGN(delta); | 282 | new_sign = GET_SIGN(delta); |
| 285 | diff_sign = new_sign ^ sign; | 283 | delta = (delta ^ sign) - sign; |
| 286 | code = TO_GOLOMB2(get_level(delta), diff_sign); | 284 | code = MAKE_CODE(delta); |
| 287 | 285 | ||
| 288 | encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); | 286 | encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); |
| 289 | 287 | ||