Removed autogen .obj file.

Updated libvpx reference. Experimenting more with "windows" version.
avesus · May 15, 2014 · 51336a9 · 51336a9
1 parent e86b775
commit 51336a9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,4 @@ android/jni/armeabi/ads2gas/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_
 android/jni/armeabi/ads2gas/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm.s
 android/jni/armeabi/ads2gas/vp8_asm_enc_offsets.asm
 android/jni/armeabi/ads2gas/vp8_asm_enc_offsets.c.S
+/win/libvpx/*.obj
diff --git a/android/jni/libvpx b/android/jni/libvpx
diff --git a/win/capture_video_win32.cpp b/win/capture_video_win32.cpp
@@ -106,10 +106,10 @@ const VIDEO_STREAM_RESOLUTION modes[] = {
 # endif
 
 # ifdef HI_Q_W_320 // 640x480 hi-q
-# define FRAME_RESOLUTION_NUMBER 6
+# define FRAME_RESOLUTION_NUMBER 4
 # define VP8_QP_MAX 31
 # define VP8_QP_MIN 1
-# define VP8_KBITS_PER_SEC 4000///350 //700
+# define VP8_KBITS_PER_SEC 300///350 //700
 //# define VP8_CPU_USE -3
 # define VP8_CPU_USE -15
 //# define MAX_KEYFRAME_DIST 999999

diff --git a/win/libvpx/vp8_asm_enc_offsets.obj b/win/libvpx/vp8_asm_enc_offsets.obj