summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java176
-rwxr-xr-xsrc/com/android/camera/MediaSaveService.java19
-rwxr-xr-xsrc/com/android/camera/Storage.java24
3 files changed, 133 insertions, 86 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 82f4b4c1c..608e119fa 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -494,9 +494,9 @@ public class CaptureModule implements CameraModule, PhotoController,
*/
private ImageReader[] mImageReader = new ImageReader[MAX_NUM_CAM];
private ImageReader[] mRawImageReader = new ImageReader[MAX_NUM_CAM];
- private Surface mHeifInput;
- private HeifWriter mHeifWriter;
- private String mHeifPath;
+ private HeifWriter mInitHeifWriter;
+ private OutputConfiguration mHeifOutput;
+ private HeifImage mHeifImage;
private NamedImages mNamedImages;
private ContentResolver mContentResolver;
private byte[] mLastJpegData;
@@ -1571,9 +1571,17 @@ public class CaptureModule implements CameraModule, PhotoController,
if (mSaveRaw) {
list.add(mRawImageReader[id].getSurface());
}
+
+ List<OutputConfiguration> outputConfigurations = null;
if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT ) {
- if (mHeifWriter != null && mHeifInput != null) {
- list.add(mHeifInput);
+ outputConfigurations = new ArrayList<OutputConfiguration>();
+ if (mInitHeifWriter != null) {
+ for (Surface s : list) {
+ outputConfigurations.add(new OutputConfiguration(s));
+ }
+ mHeifOutput = new OutputConfiguration(mInitHeifWriter.getInputSurface());
+ mHeifOutput.enableSurfaceSharing();
+ outputConfigurations.add(mHeifOutput);
}
}
if(mChosenImageFormat == ImageFormat.YUV_420_888 || mChosenImageFormat == ImageFormat.PRIVATE) {
@@ -1586,10 +1594,22 @@ public class CaptureModule implements CameraModule, PhotoController,
mCameraDevice[id].createReprocessableCaptureSession(new InputConfiguration(mImageReader[id].getWidth(),
mImageReader[id].getHeight(), mImageReader[id].getImageFormat()), list, captureSessionCallback, null);
} else {
- mCameraDevice[id].createCaptureSession(list, captureSessionCallback, null);
+ if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT &&
+ outputConfigurations != null) {
+ mCameraDevice[id].createCaptureSessionByOutputConfigurations(outputConfigurations,
+ captureSessionCallback,null);
+ } else {
+ mCameraDevice[id].createCaptureSession(list, captureSessionCallback, null);
+ }
}
} else {
- mCameraDevice[id].createCaptureSession(list, captureSessionCallback, null);
+ if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT &&
+ outputConfigurations != null) {
+ mCameraDevice[id].createCaptureSessionByOutputConfigurations(outputConfigurations,
+ captureSessionCallback, null);
+ } else {
+ mCameraDevice[id].createCaptureSession(list, captureSessionCallback, null);
+ }
}
} else {
if (surface != null) {
@@ -2147,11 +2167,26 @@ public class CaptureModule implements CameraModule, PhotoController,
}
if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) {
- if (mHeifWriter != null && mHeifInput != null) {
- captureBuilder.addTarget(mHeifInput);
+ long captureTime = System.currentTimeMillis();
+ mNamedImages.nameNewImage(captureTime);
+ NamedEntity name = mNamedImages.getNextNameEntity();
+ String title = (name == null) ? null : name.title;
+ long date = (name == null) ? -1 : name.date;
+ String path = Storage.generateFilepath(title, "heif");
+ String value = mSettingsManager.getValue(SettingsManager.KEY_JPEG_QUALITY);
+ int quality = getQualityNumber(value);
+ int orientation = CameraUtil.getJpegRotation(id,mOrientation);
+ HeifWriter writer = createHEIFEncoder(path,mPictureSize.getWidth(),mPictureSize.getHeight(),
+ orientation,quality);
+ if (writer != null) {
+ mHeifImage = new HeifImage(writer,path,title,date,orientation,quality);
+ Surface input = writer.getInputSurface();
+ mHeifOutput.addSurface(input);
try{
- mHeifWriter.start();
- } catch (IllegalStateException e) {
+ mCaptureSession[id].updateOutputConfiguration(mHeifOutput);
+ captureBuilder.addTarget(input);
+ writer.start();
+ } catch (IllegalStateException | IllegalArgumentException e) {
e.printStackTrace();
}
}
@@ -2312,26 +2347,6 @@ public class CaptureModule implements CameraModule, PhotoController,
CaptureRequest request,
TotalCaptureResult result) {
Log.d(TAG, "captureStillPictureForCommon onCaptureCompleted: " + id);
-
- if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) {
- if (mHeifWriter != null) {
- try {
- mHeifWriter.stop(5000);
- mHeifWriter.close();
- } catch (TimeoutException | IllegalStateException e) {
- Log.d(TAG,"HEIF encode error ="+e.getMessage());
- e.printStackTrace();
- } catch (Exception e) {
- Log.d(TAG, e.toString());
- }
- }
- mActivity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- restartSession(false);
- }
- });
- }
}
@Override
@@ -2345,6 +2360,24 @@ public class CaptureModule implements CameraModule, PhotoController,
public void onCaptureSequenceCompleted(CameraCaptureSession session, int
sequenceId, long frameNumber) {
Log.d(TAG, "captureStillPictureForCommon onCaptureSequenceCompleted: " + id);
+ if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) {
+ if (mHeifImage != null) {
+ try {
+ mHeifOutput.removeSurface(mHeifImage.getInputSurface());
+ mCaptureSession[id].updateOutputConfiguration(mHeifOutput);
+ mHeifImage.getWriter().stop(3000);
+ mHeifImage.getWriter().close();
+ mActivity.getMediaSaveService().addHEIFImage(mHeifImage.getPath(),
+ mHeifImage.getTitle(),mHeifImage.getDate(),null,mPictureSize.getWidth(),mPictureSize.getHeight(),
+ mHeifImage.getOrientation(),null,mContentResolver,mOnMediaSavedListener,mHeifImage.getQuality(),"heif");
+ mHeifImage = null;
+ } catch (TimeoutException | IllegalStateException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
if (mUI.getCurrentProMode() != ProMode.MANUAL_MODE) {
unlockFocus(id);
} else {
@@ -2488,6 +2521,16 @@ public class CaptureModule implements CameraModule, PhotoController,
}
mCameraId[i] = cameraId;
+ //inti heifWriter and get input surface
+ if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) {
+ String tmpPath = mActivity.getCacheDir().getPath() + "/" + "heif.tmp";
+ if (mInitHeifWriter != null) {
+ mInitHeifWriter.close();
+ }
+ mInitHeifWriter = createHEIFEncoder(tmpPath, mPictureSize.getWidth(),
+ mPictureSize.getHeight(), 0, 85);
+ }
+
if (isClearSightOn()) {
if(i == getMainCameraId()) {
ClearSightImageProcessor.getInstance().init(map, mActivity,
@@ -2512,19 +2555,6 @@ public class CaptureModule implements CameraModule, PhotoController,
mImageReader[i].setOnImageAvailableListener(mPostProcessor.getImageHandler(), mImageAvailableHandler);
mPostProcessor.onImageReaderReady(mImageReader[i], mSupportedMaxPictureSize, mPictureSize);
} else if (i == getMainCameraId()) {
- if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) {
- long captureTime = System.currentTimeMillis();
- String title = String.valueOf(captureTime);
- String path = Storage.generateFilepath(title, "heif");
- String value = mSettingsManager.getValue(SettingsManager.KEY_JPEG_QUALITY);
- int quality = getQualityNumber(value);
- mHeifWriter = createHEIFEncoder(path, mPictureSize.getWidth(),
- mPictureSize.getHeight(), 0, quality);
- if (mHeifWriter != null) {
- mHeifInput = mHeifWriter.getInputSurface();
- mHeifPath = path;
- }
- }
mImageReader[i] = ImageReader.newInstance(mPictureSize.getWidth(),
mPictureSize.getHeight(), imageFormat, MAX_IMAGEREADERS);
@@ -2594,7 +2624,6 @@ public class CaptureModule implements CameraModule, PhotoController,
mSupportedRawPictureSize.getHeight(), ImageFormat.RAW10, PersistUtil.getLongshotShotLimit());
mRawImageReader[i].setOnImageAvailableListener(listener, mImageAvailableHandler);
}
-
}
}
}
@@ -2606,7 +2635,7 @@ public class CaptureModule implements CameraModule, PhotoController,
}
}
- public HeifWriter createHEIFEncoder(String path, int width, int height,
+ public static HeifWriter createHEIFEncoder(String path, int width, int height,
int orientation, int quality) {
HeifWriter heifWriter = null;
try {
@@ -3080,11 +3109,8 @@ public class CaptureModule implements CameraModule, PhotoController,
if(isClearSightOn()) {
ClearSightImageProcessor.getInstance().close();
}
- if (mHeifWriter != null && mHeifPath != null) {
- mHeifWriter.close();
- File emptyFile = new File(mHeifPath);
- if (emptyFile.exists() && emptyFile.length() == 0)
- emptyFile.delete();
+ if (mInitHeifWriter != null) {
+ mInitHeifWriter.close();
}
closeCamera();
resetAudioMute();
@@ -6990,6 +7016,54 @@ public class CaptureModule implements CameraModule, PhotoController,
public void onRenderSurfaceDestroyed() {
mRenderer = null;
}
+
+ public static class HeifImage {
+ private HeifWriter mWriter;
+ private String mPath;
+ private String mTitle;
+ private long mDate;
+ private int mQuality;
+ private int mOrientation;
+ private Surface mInputSurface;
+
+ public HeifImage(HeifWriter writer,String path,String title,long date,int orientation,int quality) {
+ mWriter = writer;
+ mPath = path;
+ mTitle = title;
+ mDate = date;
+ mQuality = quality;
+ mOrientation = orientation;
+ mInputSurface = writer.getInputSurface();
+ }
+
+ public HeifWriter getWriter() {
+ return mWriter;
+ }
+
+ public String getPath() {
+ return mPath;
+ }
+
+ public String getTitle() {
+ return mTitle;
+ }
+
+ public long getDate() {
+ return mDate;
+ }
+
+ public int getQuality() {
+ return mQuality;
+ }
+
+ public Surface getInputSurface(){
+ return mInputSurface;
+ }
+
+ public int getOrientation() {
+ return mOrientation;
+ }
+ }
}
class Camera2GraphView extends View {
diff --git a/src/com/android/camera/MediaSaveService.java b/src/com/android/camera/MediaSaveService.java
index 30e5d1a28..078a9c427 100755
--- a/src/com/android/camera/MediaSaveService.java
+++ b/src/com/android/camera/MediaSaveService.java
@@ -167,7 +167,7 @@ public class MediaSaveService extends Service {
t.execute();
}
- public void addHEIFImageFromJpeg(byte[] data, String title, long date, Location loc,
+ public void addHEIFImage(String path,String title,long date , Location loc,
int width, int height, int orientation, ExifInterface exif,
ContentResolver resolver, OnMediaSavedListener listener,
int qualitiy, String pictureFormat) {
@@ -175,12 +175,9 @@ public class MediaSaveService extends Service {
Log.e(TAG, "Cannot add image when the queue is full");
return;
}
- HEIFImageSaveTask t = new HEIFImageSaveTask(data, title, date, loc, width, height, orientation,
+ HEIFImageSaveTask t = new HEIFImageSaveTask(path,title,date, loc, width, height, orientation,
exif, resolver, listener, qualitiy, pictureFormat);
- mMemoryUse += data.length;
- if (isQueueFull()) {
- onQueueFull();
- }
+
t.execute();
}
@@ -350,7 +347,7 @@ public class MediaSaveService extends Service {
}
private class HEIFImageSaveTask extends AsyncTask<Void, Void, Uri> {
- private byte[] data;
+ private String path;
private String title;
private long date;
private Location loc;
@@ -362,11 +359,11 @@ public class MediaSaveService extends Service {
private int quality;
private String pictureFormat;
- public HEIFImageSaveTask(byte[] data, String title, long date, Location loc,
+ public HEIFImageSaveTask(String path, String title, long date, Location loc,
int width, int height, int orientation, ExifInterface exif,
ContentResolver resolver, OnMediaSavedListener listener,
int quality,String pictureFormat) {
- this.data = data;
+ this.path = path;
this.title = title;
this.date = date;
this.loc = loc;
@@ -388,15 +385,13 @@ public class MediaSaveService extends Service {
@Override
protected Uri doInBackground(Void... params) {
return Storage.addHeifImage(
- resolver,title,date,loc,orientation,exif,data,
+ resolver,title,date,loc,orientation,exif,path,
width,height,quality,pictureFormat);
}
@Override
protected void onPostExecute(Uri uri) {
boolean previouslyFull = isQueueFull();
- mMemoryUse -= data.length;
- if (isQueueFull() != previouslyFull) onQueueAvailable();
}
}
diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
index 82b8adcf5..65b700fe2 100755
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -215,30 +215,8 @@ public class Storage {
}
public static Uri addHeifImage(ContentResolver resolver, String title, long date,
- Location location, int orientation, ExifInterface exif, byte[] data, int width,
+ Location location, int orientation, ExifInterface exif, String path, int width,
int height, int quality, String mimeType) {
- String path = generateFilepath(title, mimeType);
- Bitmap bitmap = BitmapFactory.decodeByteArray(data,0,data.length);
- if (bitmap != null) {
- try {
- HeifWriter.Builder builder =
- new HeifWriter.Builder(path,width, height,HeifWriter.INPUT_MODE_BITMAP);
- builder.setQuality(quality);
- builder.setMaxImages(1);
- builder.setPrimaryIndex(0);
- builder.setRotation(orientation);
- HeifWriter heifWriter = builder.build();
- heifWriter.start();
- heifWriter.addBitmap(bitmap);
- heifWriter.stop(3000);
- heifWriter.close();
- } catch (IOException|IllegalStateException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- bitmap.recycle();
- }
File f = new File(path);
int size = 0;
if (f.exists() && f.isFile()) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 17:12:40 +0000