Fixed imports

mutablelogic · Jul 5, 2024 · 03b9947 · 03b9947
1 parent 5a38897
commit 03b9947
Show file tree

Hide file tree

Showing 28 changed files with 53 additions and 32 deletions.
diff --git a/pkg/ffmpeg/channellayout_test.go b/pkg/ffmpeg/channellayout_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"
 )

diff --git a/pkg/ffmpeg/codec_test.go b/pkg/ffmpeg/codec_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	media "github.com/mutablelogic/go-media"
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"

diff --git a/pkg/ffmpeg/decoder.go b/pkg/ffmpeg/decoder.go
@@ -7,7 +7,6 @@ import (
 	"syscall"
 
 	// Packages
-
 	ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
 )
 

diff --git a/pkg/ffmpeg/frame_test.go b/pkg/ffmpeg/frame_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"
 

diff --git a/pkg/ffmpeg/image_test.go b/pkg/ffmpeg/image_test.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	imagex "github.com/mutablelogic/go-media/pkg/image"
 	assert "github.com/stretchr/testify/assert"

diff --git a/pkg/ffmpeg/manager.go b/pkg/ffmpeg/manager.go
@@ -1,13 +1,11 @@
 package ffmpeg
 
 import (
-
-	// Packages
-
 	"slices"
 
+	// Packages
 	media "github.com/mutablelogic/go-media"
-	"github.com/mutablelogic/go-media/pkg/version"
+	version "github.com/mutablelogic/go-media/pkg/version"
 	ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
 )
 

diff --git a/pkg/ffmpeg/manager_test.go b/pkg/ffmpeg/manager_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"
 )

diff --git a/pkg/ffmpeg/metadata_test.go b/pkg/ffmpeg/metadata_test.go
@@ -4,6 +4,7 @@ import (
 	"os"
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"
 )

diff --git a/pkg/ffmpeg/par_test.go b/pkg/ffmpeg/par_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"
 )

diff --git a/pkg/ffmpeg/pixelformat_test.go b/pkg/ffmpeg/pixelformat_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"
 )

diff --git a/pkg/ffmpeg/re.go b/pkg/ffmpeg/re.go
@@ -22,6 +22,9 @@ type Re struct {
 ////////////////////////////////////////////////////////////////////////////////
 // LIFECYCLE
 
+// Return a new resampler or rescaler, with the destination parameters. If
+// force is true, then the resampler will always resample, even if the
+// destination parameters are the same as the source parameters.
 func NewRe(par *Par, force bool) (*Re, error) {
 	re := new(Re)
 	re.t = par.Type()
@@ -46,6 +49,7 @@ func NewRe(par *Par, force bool) (*Re, error) {
 	return re, nil
 }
 
+// Release resources
 func (re *Re) Close() error {
 	var result error
 	if re.audio != nil {
@@ -63,6 +67,7 @@ func (re *Re) Close() error {
 ////////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
+// Resample or rescale the source frame and return the destination frame
 func (re *Re) Frame(src *Frame) (*Frame, error) {
 	// Check type - if not flush
 	if src != nil {

diff --git a/pkg/ffmpeg/re_test.go b/pkg/ffmpeg/re_test.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"testing"
 
+	// Packages
 	media "github.com/mutablelogic/go-media"
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"

diff --git a/pkg/ffmpeg/reader_test.go b/pkg/ffmpeg/reader_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	// Packages
 	media "github.com/mutablelogic/go-media"
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"

diff --git a/pkg/ffmpeg/resampler_test.go b/pkg/ffmpeg/resampler_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	generator "github.com/mutablelogic/go-media/pkg/generator"
 	assert "github.com/stretchr/testify/assert"

diff --git a/pkg/ffmpeg/rescaler_test.go b/pkg/ffmpeg/rescaler_test.go
@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	generator "github.com/mutablelogic/go-media/pkg/generator"
 	assert "github.com/stretchr/testify/assert"

diff --git a/pkg/ffmpeg/sampleformat_test.go b/pkg/ffmpeg/sampleformat_test.go
@@ -3,6 +3,7 @@ package ffmpeg_test
 import (
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	assert "github.com/stretchr/testify/assert"
 )

diff --git a/pkg/ffmpeg/writer_test.go b/pkg/ffmpeg/writer_test.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"testing"
 
+	// Packages
 	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
 	generator "github.com/mutablelogic/go-media/pkg/generator"
 	assert "github.com/stretchr/testify/assert"

diff --git a/sys/ffmpeg61/avcodec_packet_test.go b/sys/ffmpeg61/avcodec_packet_test.go
@@ -3,9 +3,10 @@ package ffmpeg_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	// Namespace imports
 	. "github.com/mutablelogic/go-media/sys/ffmpeg61"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_avcodec_packet_000(t *testing.T) {

diff --git a/sys/ffmpeg61/avdevice.go b/sys/ffmpeg61/avdevice.go
@@ -1,5 +1,10 @@
 package ffmpeg
 
+import (
+	"encoding/json"
+	"unsafe"
+)
+
 ////////////////////////////////////////////////////////////////////////////////
 // CGO
 
@@ -8,10 +13,6 @@ package ffmpeg
 #include <libavdevice/avdevice.h>
 */
 import "C"
-import (
-	"encoding/json"
-	"unsafe"
-)
 
 ////////////////////////////////////////////////////////////////////////////////
 // TYPES

diff --git a/sys/ffmpeg61/avdevice_input.go b/sys/ffmpeg61/avdevice_input.go
@@ -1,5 +1,10 @@
 package ffmpeg
 
+import (
+	"fmt"
+	"unsafe"
+)
+
 ////////////////////////////////////////////////////////////////////////////////
 // CGO
 
@@ -8,10 +13,6 @@ package ffmpeg
 #include <libavdevice/avdevice.h>
 */
 import "C"
-import (
-	"fmt"
-	"unsafe"
-)
 
 ////////////////////////////////////////////////////////////////////////////////
 // BINDINGS

diff --git a/sys/ffmpeg61/avformat_dump.go b/sys/ffmpeg61/avformat_dump.go
@@ -1,5 +1,7 @@
 package ffmpeg
 
+import "unsafe"
+
 ////////////////////////////////////////////////////////////////////////////////
 // CGO
 
@@ -8,7 +10,6 @@ package ffmpeg
 #include <libavformat/avformat.h>
 */
 import "C"
-import "unsafe"
 
 ////////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS

diff --git a/sys/ffmpeg61/avformat_input_test.go b/sys/ffmpeg61/avformat_input_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	// Packages
+	"github.com/stretchr/testify/assert"
 
 	// Namespace imports
 	. "github.com/mutablelogic/go-media/sys/ffmpeg61"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_avformat_input_001(t *testing.T) {

diff --git a/sys/ffmpeg61/avformat_output_test.go b/sys/ffmpeg61/avformat_output_test.go
@@ -3,8 +3,6 @@ package ffmpeg_test
 import (
 	"testing"
 
-	// Packages
-
 	// Namespace imports
 	. "github.com/mutablelogic/go-media/sys/ffmpeg61"
 )

diff --git a/sys/ffmpeg61/avutil_channel_layout_test.go b/sys/ffmpeg61/avutil_channel_layout_test.go
@@ -3,9 +3,10 @@ package ffmpeg_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	// Namespace imports
 	. "github.com/mutablelogic/go-media/sys/ffmpeg61"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_avutil_channel_layout_001(t *testing.T) {

diff --git a/sys/ffmpeg61/avutil_dict_test.go b/sys/ffmpeg61/avutil_dict_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	// Namespace imports
-
 	. "github.com/mutablelogic/go-media/sys/ffmpeg61"
 )
 

diff --git a/sys/ffmpeg61/avutil_pixfmt_test.go b/sys/ffmpeg61/avutil_pixfmt_test.go
@@ -3,8 +3,6 @@ package ffmpeg_test
 import (
 	"testing"
 
-	// Packages
-
 	// Namespace imports
 	. "github.com/mutablelogic/go-media/sys/ffmpeg61"
 )

diff --git a/sys/ffmpeg61/swscale_core_test.go b/sys/ffmpeg61/swscale_core_test.go
@@ -3,9 +3,10 @@ package ffmpeg_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	// Namespace imports
 	. "github.com/mutablelogic/go-media/sys/ffmpeg61"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_swscale_core_000(t *testing.T) {

diff --git a/type.go b/type.go
@@ -3,26 +3,28 @@ package media
 ///////////////////////////////////////////////////////////////////////////////
 // TYPES
 
+// Type of codec, device, format or stream
 type Type int
 
 ///////////////////////////////////////////////////////////////////////////////
 // GLOBALS
 
 const (
-	NONE  Type = 0
-	VIDEO Type = (1 << iota)
-	AUDIO
-	SUBTITLE
-	DATA
-	UNKNOWN
-	ANY     = NONE
-	mintype = VIDEO
-	maxtype = UNKNOWN
+	NONE     Type   = 0           // Type is not defined
+	VIDEO    Type   = (1 << iota) // Type is video
+	AUDIO                         // Type is audio
+	SUBTITLE                      // Type is subtitle
+	DATA                          // Type is data
+	UNKNOWN                       // Type is unknown
+	ANY      = NONE               // Type is any (used for filtering)
+	mintype  = VIDEO
+	maxtype  = UNKNOWN
 )
 
 ///////////////////////////////////////////////////////////////////////////////
 // STINGIFY
 
+// Return the type as a string
 func (t Type) String() string {
 	if t == NONE {
 		return t.FlagString()
@@ -36,6 +38,7 @@ func (t Type) String() string {
 	return str[1:]
 }
 
+// Return a flag as a string
 func (t Type) FlagString() string {
 	switch t {
 	case NONE:
@@ -56,6 +59,7 @@ func (t Type) FlagString() string {
 ///////////////////////////////////////////////////////////////////////////////
 // METHODS
 
+// Returns true if the type matches a set of flags
 func (t Type) Is(u Type) bool {
 	return t&u == u
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ import ( @@
     	"syscall"
     	// Packages
     	ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
     )
@@ Expand Down @@