highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/proresenc_anatoliy: remove TO_GOLOMB2()

Browse Source 
A few cosmetics aside, this makes the function identical to the one with
the same name in proresenc_kostya.
This commit is contained in:
Clément Bœsch
2023-12-11 02:11:00 +01:00
parent a026f98f29
commit e87bc5641c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/proresenc_anatoliy.c
View File

@@ -257,7 +257,6 @@ static void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int val)
#define GET_SIGN(x) ((x) >> 31) #define GET_SIGN(x) ((x) >> 31)
#define MAKE_CODE(x) (((x) * 2) ^ GET_SIGN(x)) #define MAKE_CODE(x) (((x) * 2) ^ GET_SIGN(x))
#define TO_GOLOMB2(val,sign) ((val)==0 ? 0 : ((val) << 1) + (sign))
static av_always_inline int get_level(int val) static av_always_inline int get_level(int val)
{ {
@@ -271,7 +270,6 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks,
{ {
int i; int i;
int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; int codebook = 5, code, dc, prev_dc, delta, sign, new_sign;
int diff_sign;
prev_dc = (blocks[0] - 0x4000) / scale; prev_dc = (blocks[0] - 0x4000) / scale;
encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc));
@@ -282,8 +280,8 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks,
dc = (blocks[0] - 0x4000) / scale; dc = (blocks[0] - 0x4000) / scale;
delta = dc - prev_dc; delta = dc - prev_dc;
new_sign = GET_SIGN(delta); new_sign = GET_SIGN(delta);
diff_sign = new_sign ^ sign; delta = (delta ^ sign) - sign;
code = TO_GOLOMB2(get_level(delta), diff_sign); code = MAKE_CODE(delta);
encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code);