Commit 53a0ae14 authored by Antek Grzanka's avatar Antek Grzanka

smt

parent 42198d34
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" /> <mapping directory="" vcs="" />
</component> </component>
</project> </project>
\ No newline at end of file
This diff is collapsed.
...@@ -39,7 +39,7 @@ import android.view.SurfaceHolder; ...@@ -39,7 +39,7 @@ import android.view.SurfaceHolder;
private static final int MESSAGE_TRY_START_STREAMING = 0; private static final int MESSAGE_TRY_START_STREAMING = 0;
private static final int MESSAGE_SEND_PREVIEW_FRAME = 1; private static final int MESSAGE_SEND_PREVIEW_FRAME = 1;
private static final long OPEN_CAMERA_POLL_INTERVAL_MS = 1000L; private static final long OPEN_CAMERA_POLL_INTERVAL_MS = 2000L;
private final Object mLock = new Object(); private final Object mLock = new Object();
private final MovingAverage mAverageSpf = new MovingAverage(50 /* numValues */); private final MovingAverage mAverageSpf = new MovingAverage(50 /* numValues */);
...@@ -193,6 +193,8 @@ import android.view.SurfaceHolder; ...@@ -193,6 +193,8 @@ import android.view.SurfaceHolder;
final List<Camera.Size> supportedPreviewSizes = params.getSupportedPreviewSizes(); final List<Camera.Size> supportedPreviewSizes = params.getSupportedPreviewSizes();
final Camera.Size selectedPreviewSize = supportedPreviewSizes.get(mPreviewSizeIndex); final Camera.Size selectedPreviewSize = supportedPreviewSizes.get(mPreviewSizeIndex);
Log.d("DUPA", String.valueOf(selectedPreviewSize.width));
Log.d("DUPA", String.valueOf(selectedPreviewSize.height));
params.setPreviewSize(selectedPreviewSize.width, selectedPreviewSize.height); params.setPreviewSize(selectedPreviewSize.width, selectedPreviewSize.height);
if (mUseFlashLight) if (mUseFlashLight)
......
...@@ -60,7 +60,7 @@ public final class StreamCameraActivity extends Activity ...@@ -60,7 +60,7 @@ public final class StreamCameraActivity extends Activity
private static final String PREF_JPEG_QUALITY = "jpeg_quality"; private static final String PREF_JPEG_QUALITY = "jpeg_quality";
private static final int PREF_JPEG_QUALITY_DEF = 40; private static final int PREF_JPEG_QUALITY_DEF = 40;
// preview sizes will always have at least one element, so this is safe // preview sizes will always have at least one element, so this is safe
private static final int PREF_PREVIEW_SIZE_INDEX_DEF = 0; private static final int PREF_PREVIEW_SIZE_INDEX_DEF = 2;
private boolean mRunning = false; private boolean mRunning = false;
private boolean mPreviewDisplayCreated = false; private boolean mPreviewDisplayCreated = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment