Merge branch 'ffmpeg61' of github.com:djthorpe/go-media into ffmpeg61

Author: djthorpe

go.mod

@@ -1,8 +1,6 @@
 module github.com/mutablelogic/go-media
 
-go 1.22
-
-toolchain go1.22.4
+go 1.20
 
 require (
 	github.com/alecthomas/kong v0.9.0

manager.go

@@ -109,6 +109,9 @@ type Format interface {
 
 	// The unique name that the format can be referenced as
 	Name() string
+
+	// Description of the format
+	Description() string
 }
 
 // A container format for a media file, reader, device or

pkg/ffmpeg/format.go

@@ -2,7 +2,6 @@ package ffmpeg
 
 import (
 	"encoding/json"
-	"fmt"
 	"strings"
 
 	// Packages
@@ -35,6 +34,8 @@ type metaDevice struct {
 	Default     bool   `json:"default,omitempty"`
 }
 
+var _ media.Format = &Format{}
+
 ///////////////////////////////////////////////////////////////////////////////
 // LIFECYCLE
 
@@ -50,14 +51,36 @@ func newInputFormats(demuxer *ff.AVInputFormat, t media.Type) []media.Format {
 		})
 	}
 
+	if !t.Is(media.DEVICE) {
+		return result
+	}
+
 	// Get devices
-	if t.Is(media.DEVICE) {
-		list, err := ff.AVDevice_list_input_sources(demuxer, "", nil)
-		if err == nil {
-			fmt.Println(list)
-		}
+	list, err := ff.AVDevice_list_input_sources(demuxer, "", nil)
+	if err != nil {
+		// Bail out if we can't get the list of devices
+		return result
+	}
+	defer ff.AVDevice_free_list_devices(list)
+
+	// Make device list
+	devices := make([]*Device, 0, list.NumDevices())
+	for i, device := range list.Devices() {
+		devices = append(devices, &Device{
+			metaDevice{
+				Name:        device.Name(),
+				Description: device.Description(),
+				Default:     list.Default() == i,
+			},
+		})
+	}
+
+	// Append to result
+	for _, format := range result {
+		format.(*Format).Devices = devices
 	}
 
+	// Return result
 	return result
 }
 
@@ -71,14 +94,36 @@ func newOutputFormats(muxer *ff.AVOutputFormat, t media.Type) []media.Format {
 		})
 	}
 
+	if !t.Is(media.DEVICE) {
+		return result
+	}
+
 	// Get devices
-	if t.Is(media.DEVICE) {
-		dict := ff.AVUtil_dict_alloc()
-		defer ff.AVUtil_dict_free(dict)
-		list, err := ff.AVDevice_list_output_sinks(muxer, "", dict)
-		fmt.Println(err, list, dict)
+	list, err := ff.AVDevice_list_output_sinks(muxer, "", nil)
+	if err != nil {
+		// Bail out if we can't get the list of devices
+		return result
+	}
+	defer ff.AVDevice_free_list_devices(list)
+
+	// Make device list
+	devices := make([]*Device, 0, list.NumDevices())
+	for i, device := range list.Devices() {
+		devices = append(devices, &Device{
+			metaDevice{
+				Name:        device.Name(),
+				Description: device.Description(),
+				Default:     list.Default() == i,
+			},
+		})
+	}
+
+	// Append to result
+	for _, format := range result {
+		format.(*Format).Devices = devices
 	}
 
+	// Return result
 	return result
 }
 
@@ -100,3 +145,14 @@ func (f *Format) Type() media.Type {
 func (f *Format) Name() string {
 	return f.metaFormat.Name
 }
+
+func (f *Format) Description() string {
+	switch {
+	case f.Input != nil:
+		return f.Input.LongName()
+	case f.Output != nil:
+		return f.Output.LongName()
+	default:
+		return f.metaFormat.Name
+	}
+}

sys/ffmpeg61/avdevice.go

@@ -69,17 +69,30 @@ func (ctx *AVDeviceInfo) String() string {
 ////////////////////////////////////////////////////////////////////////////////
 // PROPERTIES
 
+// list of autodetected devices
 func (ctx *AVDeviceInfoList) Devices() []*AVDeviceInfo {
-	if ctx.nb_devices == 0 || ctx.devices == nil {
+	if ctx == nil || ctx.nb_devices == 0 || ctx.devices == nil {
 		return nil
 	}
 	return cAVDeviceInfoSlice(unsafe.Pointer(ctx.devices), ctx.nb_devices)
 }
 
+// number of autodetected devices
 func (ctx *AVDeviceInfoList) NumDevices() int {
+	if ctx == nil {
+		return 0
+	}
 	return int(ctx.nb_devices)
 }
 
+// index of default device or -1 if no default
+func (ctx *AVDeviceInfoList) Default() int {
+	if ctx == nil {
+		return -1
+	}
+	return int(ctx.default_device)
+}
+
 func (ctx *AVDeviceInfo) Name() string {
 	return C.GoString(ctx.device_name)
 }

sys/ffmpeg61/avdevice_input.go

@@ -1,7 +1,6 @@
 package ffmpeg
 
 import (
-	"fmt"
 	"unsafe"
 )
 
@@ -60,7 +59,6 @@ func AVDevice_list_input_sources(device *AVInputFormat, device_name string, devi
 	// Get list
 	var list *C.struct_AVDeviceInfoList
 	if ret := int(C.avdevice_list_input_sources((*C.struct_AVInputFormat)(device), cName, dict, &list)); ret < 0 {
-		fmt.Println("C list", device, cName, dict, list, ret)
 		return nil, AVError(ret)
 	}