diff options
-rwxr-xr-x | build/make/configure.sh | 10 | ||||
-rwxr-xr-x | configure | 1 | ||||
-rw-r--r-- | vp8/common/entropy.h | 8 | ||||
-rw-r--r-- | vp8/encoder/onyx_int.h | 16 |
4 files changed, 23 insertions, 12 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index d25d6400e..c5885da67 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -547,6 +547,10 @@ process_common_toolchain() { tgt_isa=universal tgt_os=darwin9 ;; + *darwin10*) + tgt_isa=x86_64 + tgt_os=darwin10 + ;; *mingw32*|*cygwin*) [ -z "$tgt_isa" ] && tgt_isa=x86 tgt_os=win32 @@ -606,6 +610,12 @@ process_common_toolchain() { add_ldflags "-isysroot /Developer/SDKs/MacOSX10.5.sdk" add_ldflags "-mmacosx-version-min=10.5" ;; + *-darwin10-*) + add_cflags "-isysroot /Developer/SDKs/MacOSX10.6.sdk" + add_cflags "-mmacosx-version-min=10.6" + add_ldflags "-isysroot /Developer/SDKs/MacOSX10.6.sdk" + add_ldflags "-mmacosx-version-min=10.6" + ;; esac # Handle Solaris variants. Solaris 10 needs -lposix4 @@ -115,6 +115,7 @@ all_platforms="${all_platforms} x86-win32-vs7" all_platforms="${all_platforms} x86-win32-vs8" all_platforms="${all_platforms} x86-win32-vs9" all_platforms="${all_platforms} x86_64-darwin9-gcc" +all_platforms="${all_platforms} x86_64-darwin10-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-solaris-gcc" diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h index 0685cd0ae..70e2ae675 100644 --- a/vp8/common/entropy.h +++ b/vp8/common/entropy.h @@ -24,10 +24,10 @@ #define FOUR_TOKEN 4 /* 4 Extra Bits 0+1 */ #define DCT_VAL_CATEGORY1 5 /* 5-6 Extra Bits 1+1 */ #define DCT_VAL_CATEGORY2 6 /* 7-10 Extra Bits 2+1 */ -#define DCT_VAL_CATEGORY3 7 /* 11-26 Extra Bits 4+1 */ -#define DCT_VAL_CATEGORY4 8 /* 11-26 Extra Bits 5+1 */ -#define DCT_VAL_CATEGORY5 9 /* 27-58 Extra Bits 5+1 */ -#define DCT_VAL_CATEGORY6 10 /* 59+ Extra Bits 11+1 */ +#define DCT_VAL_CATEGORY3 7 /* 11-18 Extra Bits 3+1 */ +#define DCT_VAL_CATEGORY4 8 /* 19-34 Extra Bits 4+1 */ +#define DCT_VAL_CATEGORY5 9 /* 35-66 Extra Bits 5+1 */ +#define DCT_VAL_CATEGORY6 10 /* 67+ Extra Bits 11+1 */ #define DCT_EOB_TOKEN 11 /* EOB Extra Bits 0+0 */ #define vp8_coef_tokens 12 diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index a9eedf399..b3a09ec1b 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -278,14 +278,14 @@ typedef struct unsigned int source_frame_flags; YV12_BUFFER_CONFIG scaled_source; - int source_buffer_count; - int source_encode_index; - int source_alt_ref_pending; - int source_alt_ref_active; - - int last_alt_ref_sei; - int is_src_frame_alt_ref; - int is_next_src_alt_ref; + int source_buffer_count; // number of src_buffers in use for lagged encoding + int source_encode_index; // index of buffer in src_buffer to encode + int source_alt_ref_pending; // frame in src_buffers has been identified to be encoded as an alt ref + int source_alt_ref_active; // an alt ref frame has been encoded and is usable + + int last_alt_ref_sei; // index into src_buffers of frame used as alt reference + int is_src_frame_alt_ref; // source of frame to encode is an exact copy of an alt ref frame + int is_next_src_alt_ref; // source of next frame to encode is an exact copy of an alt ref frame int gold_is_last; // golden frame same as last frame ( short circuit gold searches) int alt_is_last; // Alt reference frame same as last ( short circuit altref search) |