diff options
| author | Harinarayanan K K <harinarayanan.kk@ittiam.com> | 2015-06-18 16:03:38 +0530 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-06-25 08:25:43 -0700 |
| commit | 3749f6f435e79624f72841e866245d84195551cd (patch) | |
| tree | 02569a7442cbbdf650fdde01f3e72741b4b094bb /common | |
| parent | c080d5799655658eb847b0583f58e5aff3a5cbaa (diff) | |
| download | android_external_libavc-3749f6f435e79624f72841e866245d84195551cd.tar.gz android_external_libavc-3749f6f435e79624f72841e866245d84195551cd.tar.bz2 android_external_libavc-3749f6f435e79624f72841e866245d84195551cd.zip | |
Added support for Main Profile toolsets in encoder.
Added support for CABAC entropy coding.
Added support for B slices.
Fixed an issue in rate control constant QP mode.
Change-Id: Ib759d35e8e943f941aa9b8bbff0362d92c619994
Diffstat (limited to 'common')
| -rw-r--r-- | common/ih264_defs.h | 3 | ||||
| -rw-r--r-- | common/ih264_structs.h | 10 | ||||
| -rw-r--r-- | common/ithread.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/common/ih264_defs.h b/common/ih264_defs.h index 6bf74d1..b26a5a4 100644 --- a/common/ih264_defs.h +++ b/common/ih264_defs.h @@ -270,6 +270,9 @@ typedef enum P8x8 = 6, PSKIP = 7, IPCM = 8, + B16x16 = 9, + BSKIP = 10, + BDIRECT = 11, MAX_MBTYPES, }MBTYPES_T; diff --git a/common/ih264_structs.h b/common/ih264_structs.h index fa4e142..0a7c940 100644 --- a/common/ih264_structs.h +++ b/common/ih264_structs.h @@ -1353,6 +1353,11 @@ typedef struct */ UWORD8 u1_ref_idx_reordering_flag_l0; + /* + * ref_pic_list_reordering_flag_l1 + */ + UWORD8 u1_ref_idx_reordering_flag_l1; + /** * Reference prediction list modification */ @@ -1369,11 +1374,6 @@ typedef struct ref_list_t as_ref_pic_list1[MAX_DPB_SIZE]; /* - * weighted_bipred_idc - */ - WORD8 u1_weighted_bipred_idc; - - /* * no_output_of_prior_pics_flag */ UWORD8 u1_no_output_of_prior_pics_flag; diff --git a/common/ithread.c b/common/ithread.c index f7335d9..25a8cd0 100644 --- a/common/ithread.c +++ b/common/ithread.c @@ -71,7 +71,7 @@ #endif -#if defined(X86_MSVC) || defined (X86_MINGW) +#ifdef X86_MSVC #include <windows.h> #define SEM_MAX_COUNT 100 |