SDK v2.5.05

- 新增美型细分参数（眼/鼻/眉/唇）：
  - 眼睛上下、眼高低
  - 鼻子大小、鼻子高低、鼻子上下、鼻尖、鼻梁
  - 眉粗细、眉长短、眉提升、眉距离、眉倾斜
  - 上唇厚度、下唇厚度、丰唇、嘴唇宽度
- 优化多部位链式变形：后续调节基于已变形关键点，修复叠加调节时点位错位问题
- 优化眼部/眉部/唇部多项效果准确性与强度：
  - 眼距、眼倾斜（旋转）、开眼角
  - 眉粗细、眉长短、眉提升、眉倾斜
  - 嘴唇上下、上/下唇厚度、丰唇、嘴唇宽度、微笑嘴角
- 优化小头/小脸逻辑：改为基于 bbox 宽高比的椭圆缩放，降低横向过挤压并保持脸型比例
- iOS demo 更新：
  - 新美型功能与顺序接入
  - 新 icon 资源接入（四状态）
  - 图片处理改为 OpenGL 渲染并修复方向/显示问题
- Android demo 更新：
  - 新美型功能与 UI 接入，修复参数枚举映射错位
  - 美型 icon 资源梳理与补齐（四状态）
  - 图片处理改为 OpenGL 直渲染，去除 texture->bitmap 回读路径
- C API 文档补充：新增美型枚举注释，包含默认值与调节含义

Author: uu-code007

.DS_Store

@@ -0,0 +1,31 @@
+package com.hapi.pixelfree_android
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+
+class AspectRatioFrameLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    private var aspectRatio: Float = 1f
+
+    init {
+        attrs?.let {
+            val typedArray = context.obtainStyledAttributes(it, R.styleable.AspectRatioFrameLayout)
+            aspectRatio = typedArray.getFloat(R.styleable.AspectRatioFrameLayout_aspectRatio, 1f)
+            typedArray.recycle()
+        }
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val width = MeasureSpec.getSize(widthMeasureSpec)
+        val height = (width / aspectRatio).toInt()
+        val newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        super.onMeasure(widthMeasureSpec, newHeightMeasureSpec)
+    }
+}
+
+

SMBeautyEngine_andriod/.DS_Store

@@ -2,27 +2,27 @@ package com.hapi.pixelfree_android
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.opengl.GLES20
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.DisplayMetrics
 import android.util.Log
 import android.widget.Button
-import android.widget.ImageView
 import android.widget.TextView
+import android.net.Uri
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.hapi.avparam.ImgFmt
 import com.hapi.avparam.VideoFrame
 import com.hapi.avrender.HapiCapturePreView
 import com.hapi.pixelfree.PFDetectFormat
+import com.hapi.pixelfree.PFFaceDetectMode
 import com.hapi.pixelfree.PFImageInput
 import com.hapi.pixelfree.PFRotationMode
 import com.hapi.pixelfree.PFSrcType
 import com.hapi.pixelfree.PixelFree
 import com.hapi.pixelfreeuikit.PixeBeautyDialog
 import com.hapi.pixelfreeuikit.ColorGradingDialog
-import java.nio.ByteBuffer
 
 class ImageActivity: AppCompatActivity()  {
 
@@ -41,10 +41,15 @@ class ImageActivity: AppCompatActivity()  {
 
     private val handler = Handler(Looper.getMainLooper())
     private var frameCount = 0
-    private lateinit var imageView: ImageView // 声明 ImageView 变量
     private lateinit var rgbaData:ByteArray
     private lateinit var fpstTextView: TextView
 
+    private val pickImageLauncher = registerForActivityResult(
+        ActivityResultContracts.GetContent()
+    ) { uri: Uri? ->
+        uri?.let { handleSelectedImage(it) }
+    }
+
     val hapiCapturePreView by lazy { findViewById<HapiCapturePreView>(R.id.preview) }
 
     var w = 0
@@ -70,9 +75,15 @@ class ImageActivity: AppCompatActivity()  {
         // 启动定时任务
         handler.postDelayed(updateImageRunnable, 1)
 
-//        hapiCapturePreView.mHapiGLSurfacePreview.mOpenGLRender.glCreateCall = {
-//            hapiCapturePreView.setMirror(mirrorHorizontal = true)
+        // 相册按钮 & 点击预览均可选择相册图片
+        findViewById<Button>(R.id.btnAlbum).setOnClickListener {
+            pickImageLauncher.launch("image/*")
+        }
+        hapiCapturePreView.setOnClickListener {
+            pickImageLauncher.launch("image/*")
+        }
 
+        hapiCapturePreView.mHapiGLSurfacePreview.mOpenGLRender.glCreateCall = {
             //在绑定上下文后初始化
             mPixelFree.create()
             val authData = mPixelFree.readBundleFile(this@ImageActivity, "pixelfreeAuth.lic")
@@ -89,8 +100,11 @@ class ImageActivity: AppCompatActivity()  {
                 )
             }
 
+            // 设置图片检测模式
+//            mPixelFree.setDetectMode(PFFaceDetectMode.PF_FACE_DETECT_MODE_IMAGE)
+
             mPixeBeautyDialog.show(supportFragmentManager, "")
-//        }
+        }
 
 //        hapiCapturePreView.setScaleType(ScaleType.FIT_CENTER)
         findViewById<Button>(R.id.showBeauty).setOnClickListener {
@@ -139,39 +153,21 @@ class ImageActivity: AppCompatActivity()  {
                     format = PFDetectFormat.PFFORMAT_IMAGE_RGBA
                     rotationMode = PFRotationMode.PFRotationMode0
                 }
-                mPixelFree.processWithBuffer(pxInput)
-
-                val frame = pxInput.p_data0?.let {
-                    val out = VideoFrame(
-                        w, h,
-                        ImgFmt.IMAGE_FORMAT_RGBA,
-                        it,
-                        0,
-                        rowBytes,
-                        0,
-                    )
-                    out.textureID = pxInput.textureID
-                    out
+                if (!isLongPress) {
+                    mPixelFree.processWithBuffer(pxInput)
                 }
 
-                // 截图
-//                if (frameCount == 100) {
-//                    mPixelFree.glThread.runOnGLThread {
-//                        textureIdToBitmap(pxInput.textureID,pxInput.wigth,pxInput.height);
-//                    }
-            //     }
-                if (isLongPress) {
-                    displayBitmap(originBitmap)
-                } else {
-                    mPixelFree.textureIdToBitmap(pxInput.textureID, pxInput.wigth, pxInput.height) { bitmap ->
-                        if (bitmap != null) {
-                            println("[PixelFree] get image bitmap")
-                            displayBitmap(bitmap)
-                        } else {
-                            // Handle error case
-                        }
-                    }
-                }
+                val frame = VideoFrame(
+                    w, h,
+                    ImgFmt.IMAGE_FORMAT_RGBA,
+                    rgbaData,
+                    0,
+                    rowBytes,
+                    0,
+                )
+                // 长按显示原图；松开显示处理后的 texture
+                frame.textureID = if (isLongPress) -1000 else pxInput.textureID
+                hapiCapturePreView.onFrame(frame)
 
                 frameCount++
                 val endTime = System.currentTimeMillis()
@@ -200,23 +196,6 @@ class ImageActivity: AppCompatActivity()  {
         }
     }
 
-    private fun displayBitmap(bitmap: Bitmap) {
-        runOnUiThread { // 确保在主线程更新UI
-            val imageView = findViewById<ImageView>(R.id.imageView) // 替换为您的ImageView ID
-            imageView.setImageBitmap(bitmap)
-
-            val info = """
-        🖼️ Bitmap信息:
-        尺寸: ${bitmap.width}x${bitmap.height}
-        格式: ${bitmap.config}
-        内存: ${bitmap.allocationByteCount / 1024} KB
-        状态: ${if (bitmap.isRecycled) "已回收" else "可用"}
-    """.trimIndent()
-            Log.d("BitmapDebug", info);
-        }
-    }
-
-
     private fun convertBitmapToRGBA(bitmap: Bitmap): ByteArray {
         val width = bitmap.width
         val height = bitmap.height
@@ -226,6 +205,26 @@ class ImageActivity: AppCompatActivity()  {
         return intArrayToByteArray(rgbaDataa)
     }
 
+    private fun handleSelectedImage(uri: Uri) {
+        try {
+            contentResolver.openInputStream(uri)?.use { input ->
+                val options = BitmapFactory.Options().apply {
+                    inScaled = false
+                    inDensity = DisplayMetrics.DENSITY_DEFAULT
+                    inTargetDensity = resources.displayMetrics.densityDpi
+                }
+                val bitmap = BitmapFactory.decodeStream(input, null, options) ?: return
+                originBitmap = bitmap
+                w = bitmap.width
+                h = bitmap.height
+                rowBytes = bitmap.rowBytes
+                rgbaData = convertBitmapToRGBA(bitmap)
+            }
+        } catch (e: Exception) {
+            Log.e("ImageActivity", "Failed to load image from gallery", e)
+        }
+    }
+
     private fun applyWhiteningFilter(rgbaData: IntArray, width: Int, height: Int): IntArray {
         val whitenedData = IntArray(rgbaData.size)
 
@@ -300,53 +299,4 @@ class ImageActivity: AppCompatActivity()  {
         mPixelFree.release()
         handler.removeCallbacks(updateImageRunnable) // 停止更新
     }
-
-
-    private fun textureIdToBitmap(textureId: Int, width: Int, height: Int): Bitmap? {
-        GLES20.glFinish();
-        var mFrameBuffers = IntArray(1)
-        val mTmpBuffer = ByteBuffer.allocate(width * height * 4)
-        if (textureId != -1) {
-            GLES20.glGenFramebuffers(1, mFrameBuffers, 0)
-            GLES20.glActiveTexture(GLES20.GL_TEXTURE0)
-            GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId)
-            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, mFrameBuffers[0])
-            GLES20.glFramebufferTexture2D(
-                GLES20.GL_FRAMEBUFFER,
-                GLES20.GL_COLOR_ATTACHMENT0,
-                GLES20.GL_TEXTURE_2D,
-                textureId,
-                0
-            )
-        }
-        GLES20.glReadPixels(
-            0,
-            0,
-            width,
-            height,
-            GLES20.GL_RGBA,
-            GLES20.GL_UNSIGNED_BYTE,
-            mTmpBuffer
-        )
-        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0)
-        GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0)
-
-        // 检查错误
-        val error = GLES20.glGetError()
-        if (error != GLES20.GL_NO_ERROR) {
-            Log.e("OpenGL", "Error reading pixels: $error")
-            return null
-        }
-
-        // 创建 Bitmap
-        val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-
-        bitmap.copyPixelsFromBuffer(mTmpBuffer)
-
-        if (mFrameBuffers != null) {
-            GLES20.glDeleteFramebuffers(1, mFrameBuffers, 0)
-        }
-        return bitmap
-    }
-
 }

SMBeautyEngine_andriod/pixelfree_android_demo/.idea/deploymentTargetSelector.xml

@@ -72,15 +72,15 @@ class MainActivity : AppCompatActivity() {
             //在绑定上下文后初始化
             mPixelFree.create()
             val authData = mPixelFree.readBundleFile(this@MainActivity, "pixelfreeAuth.lic")
-            authData?.let {
-                mPixelFree.auth(this.applicationContext, it, it.size)
+            if (authData != null) {
+                mPixelFree.auth(this.applicationContext, authData, authData.size)
             }
             val face_fiter =
                 mPixelFree.readBundleFile(this@MainActivity, "filter_model.bundle")
-            face_fiter?.let {
+            if (face_fiter != null) {
                 mPixelFree.createBeautyItemFormBundle(
-                    it,
-                    it.size,
+                    face_fiter,
+                    face_fiter.size,
                     PFSrcType.PFSrcTypeFilter
                 )
             }

SMBeautyEngine_andriod/pixelfree_android_demo/.idea/gradle.xml

@@ -5,13 +5,13 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Button
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import android.util.Log
 
 class StartActivity : AppCompatActivity() {
     companion object {
-        private const val TAG = "CameraXBasic"
+        private const val TAG = "StartActivity"
         private const val FILENAME_FORMAT = "yyyy-MM-dd-HH-mm-ss-SSS"
         private const val REQUEST_CODE_PERMISSIONS = 10
         private val REQUIRED_PERMISSIONS = arrayOf(
@@ -28,16 +28,25 @@ class StartActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        supportActionBar?.hide()
         setContentView(R.layout.activity_start)
-        allPermissionsGranted()
-        ActivityCompat.requestPermissions(
-            this, REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS
-        )
-        findViewById<Button>(R.id.record).setOnClickListener {
+        
+        // Request permissions
+        if (!allPermissionsGranted()) {
+            ActivityCompat.requestPermissions(
+                this, REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS
+            )
+        }
+        
+        // Camera Button
+        findViewById<androidx.constraintlayout.widget.ConstraintLayout>(R.id.cameraButton).setOnClickListener {
+            Log.d(TAG, "打开相机预览")
             startActivity(Intent(this, MainActivity::class.java))
         }
 
-        findViewById<Button>(R.id.image).setOnClickListener {
+        // Image Button
+        findViewById<androidx.constraintlayout.widget.ConstraintLayout>(R.id.imageButton).setOnClickListener {
+            Log.d(TAG, "打开图片处理")
             startActivity(Intent(this, ImageActivity::class.java))
         }
     }

SMBeautyEngine_andriod/pixelfree_android_demo/app/src/main/assets/pixelfreeAuth.lic

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/system_background" />
+</shape>
+