virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

sonic: replace divide() by ROUNDED_DIV()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-06-23 19:42:24 +02:00
parent c329713de7
commit db27dadcb0
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/sonic.c
+1 -9
View File
@@ -75,14 +75,6 @@ typedef struct SonicContext {
#define BASE_QUANT 0.6 #define BASE_QUANT 0.6
#define RATE_VARIATION 3.0 #define RATE_VARIATION 3.0
static inline int divide(int a, int b)
{
if (a < 0)
return -( (-a + b/2)/b );
else
return (a + b/2)/b;
}
static inline int shift(int a,int b) static inline int shift(int a,int b)
{ {
return (a+(1<<(b-1))) >> b; return (a+(1<<(b-1))) >> b;
@@ -734,7 +726,7 @@ static int sonic_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
{ {
if (!s->lossless) if (!s->lossless)
for (i = 0; i < s->block_align; i++) for (i = 0; i < s->block_align; i++)
s->coded_samples[ch][i] = divide(s->coded_samples[ch][i], quant); s->coded_samples[ch][i] = ROUNDED_DIV(s->coded_samples[ch][i], quant);
if ((ret = intlist_write(&pb, s->coded_samples[ch], s->block_align, 1)) < 0) if ((ret = intlist_write(&pb, s->coded_samples[ch], s->block_align, 1)) < 0)
return ret; return ret;