generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving Scale2Ration function from vp9_onyx.h to vp9_onyx_if.c.

Browse Source 
Change-Id: Idfe2a850f72b38f519aea1aac1266d8c3aa813ee
This commit is contained in:
Dmitry Kovalev
2013-07-18 14:05:06 -07:00
parent 9da67da04a
commit 9f3c0e34a9
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
vp9/common/vp9_onyx.h
View File

@@ -64,34 +64,6 @@ extern "C"
FRAMEFLAGS_ALTREF = 4, FRAMEFLAGS_ALTREF = 4,
} FRAMETYPE_FLAGS; } FRAMETYPE_FLAGS;
#include <assert.h>
static INLINE void Scale2Ratio(int mode, int *hr, int *hs) {
switch (mode) {
case NORMAL:
*hr = 1;
*hs = 1;
break;
case FOURFIVE:
*hr = 4;
*hs = 5;
break;
case THREEFIVE:
*hr = 3;
*hs = 5;
break;
case ONETWO:
*hr = 1;
*hs = 2;
break;
default:
*hr = 1;
*hs = 1;
assert(0);
break;
}
}
typedef struct { typedef struct {
int version; // 4 versions of bitstream defined: int version; // 4 versions of bitstream defined:
// 0 - best quality/slowest decode, // 0 - best quality/slowest decode,

26
vp9/encoder/vp9_onyx_if.c
View File

@@ -131,6 +131,32 @@ static int gf_low_motion_minq[QINDEX_RANGE];
static int gf_high_motion_minq[QINDEX_RANGE]; static int gf_high_motion_minq[QINDEX_RANGE];
static int inter_minq[QINDEX_RANGE]; static int inter_minq[QINDEX_RANGE];
static INLINE void Scale2Ratio(int mode, int *hr, int *hs) {
switch (mode) {
case NORMAL:
*hr = 1;
*hs = 1;
break;
case FOURFIVE:
*hr = 4;
*hs = 5;
break;
case THREEFIVE:
*hr = 3;
*hs = 5;
break;
case ONETWO:
*hr = 1;
*hs = 2;
break;
default:
*hr = 1;
*hs = 1;
assert(0);
break;
}
}
// Functions to compute the active minq lookup table entries based on a // Functions to compute the active minq lookup table entries based on a
// formulaic approach to facilitate easier adjustment of the Q tables. // formulaic approach to facilitate easier adjustment of the Q tables.
// The formulae were derived from computing a 3rd order polynomial best // The formulae were derived from computing a 3rd order polynomial best