feat(camera): generate missing Camera2 APIs

Author: xaionaro@dx.center

camera/metadata.go

@@ -2313,6 +2313,7 @@ functions:
               type: '*ACameraMetadata'
             - name: numEntries
               type: '*int32'
+              direction: out
             - name: tags
               type: '**uint32'
               direction: out
@@ -2326,6 +2327,7 @@ functions:
               type: uint32
             - name: entry
               type: '*ACameraMetadata_const_entry'
+              direction: out
         returns: camera_status_t
     ACameraMetadata_getTagFromName:
         c_name: ACameraMetadata_getTagFromName
@@ -2390,6 +2392,7 @@ functions:
               type: '*ACaptureRequest'
             - name: numTags
               type: '*int32'
+              direction: out
             - name: tags
               type: '**uint32'
               direction: out
@@ -3328,6 +3331,19 @@ structs:
               type: uint32
             - name: data
               type: union
+              fields:
+                - name: u8
+                  type: '*uint8'
+                - name: i32
+                  type: '*int32'
+                - name: f
+                  type: '*float32'
+                - name: i64
+                  type: '*int64'
+                - name: d
+                  type: '*float64'
+                - name: r
+                  type: '*ACameraMetadata_rational'
     ACameraMetadata_entry:
         fields:
             - name: tag
@@ -3338,6 +3354,19 @@ structs:
               type: uint32
             - name: data
               type: union
+              fields:
+                - name: u8
+                  type: '*uint8'
+                - name: i32
+                  type: '*int32'
+                - name: f
+                  type: '*float32'
+                - name: i64
+                  type: '*int64'
+                - name: d
+                  type: '*float64'
+                - name: r
+                  type: '*ACameraMetadata_rational'
     ACameraMetadata_rational:
         fields:
             - name: numerator

camera/session_output.go

@@ -135,35 +135,6 @@ extra_enums:
     - name: ACAMERA_SCALER_AVAILABLE_STREAM_CONFIGURATIONS
       value: 851978
 
-extra_bridge_c: |
-  static inline int32_t bridge_metadataI32Count(
-      const ACameraMetadata* metadata, uint32_t tag
-  ) {
-      ACameraMetadata_const_entry entry;
-      if (ACameraMetadata_getConstEntry(metadata, tag, &entry) != ACAMERA_OK) return 0;
-      return (int32_t)entry.count;
-  }
-
-  static inline int32_t bridge_metadataI32At(
-      const ACameraMetadata* metadata, uint32_t tag, int32_t idx
-  ) {
-      ACameraMetadata_const_entry entry;
-      if (ACameraMetadata_getConstEntry(metadata, tag, &entry) != ACAMERA_OK) return 0;
-      if ((uint32_t)idx >= entry.count) return 0;
-      return entry.data.i32[idx];
-  }
-
-extra_bridge_go: |
-  // BridgeMetadataI32Count returns the count of i32 values for a metadata tag.
-  func BridgeMetadataI32Count(metadata *ACameraMetadata, tag uint32) int32 {
-  	return int32(C.bridge_metadataI32Count((*C.ACameraMetadata)(unsafe.Pointer(metadata)), C.uint32_t(tag)))
-  }
-
-  // BridgeMetadataI32At returns the i32 value at the given index for a metadata tag.
-  func BridgeMetadataI32At(metadata *ACameraMetadata, tag uint32, idx int32) int32 {
-  	return int32(C.bridge_metadataI32At((*C.ACameraMetadata)(unsafe.Pointer(metadata)), C.uint32_t(tag), C.int32_t(idx)))
-  }
-
 functions:
   # Manager functions
   ACameraManager_getCameraCharacteristics:
@@ -176,26 +147,6 @@ functions:
     go_name: CameraIDList
     returns_list_struct: ACameraIdList
 
-  # Metadata bridge functions (defined in extra_bridge_go, not in spec)
-  BridgeMetadataI32Count:
-    receiver: Metadata
-    go_name: I32Count
-    pure: true
-    bridge_params:
-      - {name: metadata, type: "*ACameraMetadata"}
-      - {name: tag, type: uint32}
-    bridge_returns: int32
-
-  BridgeMetadataI32At:
-    receiver: Metadata
-    go_name: I32At
-    pure: true
-    bridge_params:
-      - {name: metadata, type: "*ACameraMetadata"}
-      - {name: tag, type: uint32}
-      - {name: idx, type: int32}
-    bridge_returns: int32
-
   ACameraManager_deleteCameraIdList:
     skip: true
 

capi/camera/bridge_c.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/AndroidGoLab/ndk/tools/pkg/specgen"
 	"github.com/AndroidGoLab/ndk/tools/pkg/specmodel"
 )
 
@@ -97,6 +98,42 @@ func supplementCallbacks(
 	}
 }
 
+func supplementFunctionParams(
+	spec *specmodel.Spec,
+	headerDirs []string,
+) {
+	for _, dir := range headerDirs {
+		funcs, err := specgen.ParseFunctionsFromDir(dir)
+		if err != nil {
+			continue
+		}
+		for name, headerFunc := range funcs {
+			specFunc, ok := spec.Functions[name]
+			if !ok {
+				continue
+			}
+			if len(specFunc.Params) != len(headerFunc.Params) {
+				continue
+			}
+			for idx := range specFunc.Params {
+				if specFunc.Params[idx].Name != headerFunc.Params[idx].Name {
+					continue
+				}
+				if specFunc.Params[idx].Type != headerFunc.Params[idx].Type {
+					continue
+				}
+				if headerFunc.Params[idx].Direction != "" {
+					specFunc.Params[idx].Direction = headerFunc.Params[idx].Direction
+				}
+				if headerFunc.Params[idx].Const {
+					specFunc.Params[idx].Const = true
+				}
+			}
+			spec.Functions[name] = specFunc
+		}
+	}
+}
+
 func isBuiltinGoType(t string) bool {
 	switch t {
 	case "int8", "uint8", "int16", "uint16",

capi/camera/cgo_helpers.go

@@ -130,6 +130,7 @@ func Convert(
 	// Supplement callback params from C headers.
 	if len(opts.NDKHeaderDirs) > 0 {
 		supplementCallbacks(spec, opts.NDKHeaderDirs)
+		supplementFunctionParams(spec, opts.NDKHeaderDirs)
 	}
 
 	// Extract #define macro constants from original headers.
@@ -343,6 +344,9 @@ func addStruct(spec *specmodel.Spec, d *Declaration) {
 			// Mark as func_ptr; params/returns will be filled by
 			// supplementCallbacks from the C header source.
 			sf.Type = "func_ptr"
+		} else if isInlineAggregate(f.Type) {
+			sf.Type = f.Type.Tag
+			sf.Fields = convertInlineAggregateFields(f.Type.Fields)
 		} else {
 			sf.Type = typeRefToGoType(f.Type)
 		}
@@ -355,6 +359,41 @@ func addStruct(spec *specmodel.Spec, d *Declaration) {
 	}
 }
 
+func isInlineAggregate(t *TypeRef) bool {
+	if t == nil {
+		return false
+	}
+	switch t.Tag {
+	case "union", ":union", "struct", ":struct":
+		return len(t.Fields) > 0
+	default:
+		return false
+	}
+}
+
+func convertInlineAggregateFields(fields []Field) []specmodel.StructField {
+	result := make([]specmodel.StructField, 0, len(fields))
+	for _, f := range fields {
+		if f.Tag != "field" || f.Type == nil {
+			continue
+		}
+
+		sf := specmodel.StructField{
+			Name: f.Name,
+		}
+		if f.Type.Tag == ":function-pointer" {
+			sf.Type = "func_ptr"
+		} else if isInlineAggregate(f.Type) {
+			sf.Type = f.Type.Tag
+			sf.Fields = convertInlineAggregateFields(f.Type.Fields)
+		} else {
+			sf.Type = typeRefToGoType(f.Type)
+		}
+		result = append(result, sf)
+	}
+	return result
+}
+
 // typeRefToGoType converts a c2ffi TypeRef to a Go type string.
 func typeRefToGoType(t *TypeRef) string {
 	if t == nil {