Skip to content

Commit 74a2c76

Browse files
djthorpedjthorpe
authored
Merge pull request #24 from mutablelogic/ffmpeg61
* General update * Fixes tests on pull request
2 parents ad9b25a + 3b9c6db commit 74a2c76

20 files changed

+840
-138
lines changed

‎.github/workflows/on_pull_request_merge.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
analyze:
88
name: Analyze
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010
permissions:
1111
actions: read
1212
contents: read
@@ -28,7 +28,7 @@ jobs:
2828
uses: github/codeql-action/analyze@v3
2929
test:
3030
name: Test
31-
runs-on: ubuntu-latest
31+
runs-on: ubuntu-24.04
3232
strategy:
3333
matrix:
3434
go-version: [ '1.21', '1.22' ]
@@ -42,4 +42,5 @@ jobs:
4242
- name: Run tests
4343
run: |
4444
sudo apt install -y libavcodec-dev libavdevice-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev libchromaprint-dev
45-
make test
45+
make container-test
46+

‎Makefile

+9
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ test: go-dep
4848
@${GO} test ./pkg/...
4949
@${GO} test .
5050

51+
container-test: go-dep
52+
@echo Test
53+
@${GO} mod tidy
54+
@${GO} test --tags=container ./sys/ffmpeg61
55+
@${GO} test --tags=container ./sys/chromaprint
56+
@${GO} test --tags=container ./pkg/...
57+
@${GO} test --tags=container .
58+
59+
5160

5261
cli: go-dep mkdir
5362
@echo Build media tool

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
This module provides an interface for media services, including:
55

6-
* Bindings in golang for [ffmpeg 6](https://ffmpeg.org/);
6+
* Bindings in golang for [FFmpeg 6.1](https://ffmpeg.org/);
77
* Opening media files, devices and network sockets for reading and writing;
88
* Retrieving metadata and artwork from audio and video media;
99
* Re-multiplexing media files from one format to another;
@@ -235,8 +235,8 @@ The license is Apache 2 so feel free to redistribute. Redistributions in either
235235
code or binary form must reproduce the copyright notice, and please link back to this
236236
repository for more information:
237237

238-
> go-media
239-
> https://github.com/mutablelogic/go-media/
238+
> __go-media__\
239+
> [https://github.com/mutablelogic/go-media/](https://github.com/mutablelogic/go-media/)\
240240
> Copyright (c) 2021-2024 David Thorpe, All rights reserved.
241241
242242
This software links to shared libraries of [FFmpeg](http://ffmpeg.org/) licensed under

‎encoder.go

+185
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
package media
2+
3+
import (
4+
5+
// Packages
6+
"fmt"
7+
"io"
8+
9+
ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
10+
11+
// Namespace imports
12+
. "github.com/djthorpe/go-errors"
13+
)
14+
15+
////////////////////////////////////////////////////////////////////////////////
16+
// TYPES
17+
18+
type encoder struct {
19+
t MediaType
20+
ctx *ff.AVCodecContext
21+
stream *ff.AVStream
22+
packet *ff.AVPacket
23+
next_pts int64
24+
}
25+
26+
////////////////////////////////////////////////////////////////////////////////
27+
// LIFECYCLE
28+
29+
// Create an encoder with the given parameters
30+
func newEncoder(ctx *ff.AVFormatContext, stream_id int, param Parameters) (*encoder, error) {
31+
encoder := new(encoder)
32+
par := param.(*par)
33+
34+
// Get codec
35+
codec_id := ff.AV_CODEC_ID_NONE
36+
if param.Type().Is(CODEC) {
37+
codec_id = par.codecpar.Codec
38+
} else if par.Type().Is(AUDIO) {
39+
codec_id = ctx.Output().AudioCodec()
40+
} else if par.Type().Is(VIDEO) {
41+
codec_id = ctx.Output().VideoCodec()
42+
} else if par.Type().Is(SUBTITLE) {
43+
codec_id = ctx.Output().SubtitleCodec()
44+
}
45+
if codec_id == ff.AV_CODEC_ID_NONE {
46+
return nil, ErrBadParameter.With("no codec specified for stream")
47+
}
48+
49+
// Allocate codec
50+
codec := ff.AVCodec_find_encoder(codec_id)
51+
if codec == nil {
52+
return nil, ErrBadParameter.Withf("codec %q cannot encode", codec_id)
53+
}
54+
codecctx := ff.AVCodec_alloc_context(codec)
55+
if codecctx == nil {
56+
return nil, ErrInternalAppError.With("could not allocate audio codec context")
57+
} else {
58+
encoder.ctx = codecctx
59+
}
60+
61+
// Create the stream
62+
if stream := ff.AVFormat_new_stream(ctx, nil); stream == nil {
63+
ff.AVCodec_free_context(codecctx)
64+
return nil, ErrInternalAppError.With("could not allocate stream")
65+
} else {
66+
stream.SetId(stream_id)
67+
encoder.stream = stream
68+
}
69+
70+
// Set parameters
71+
switch codec.Type() {
72+
case ff.AVMEDIA_TYPE_AUDIO:
73+
encoder.t = AUDIO
74+
75+
// Choose sample format
76+
if sampleformat, err := ff.AVCodec_supported_sampleformat(codec, par.audiopar.SampleFormat); err != nil {
77+
ff.AVCodec_free_context(codecctx)
78+
return nil, err
79+
} else {
80+
codecctx.SetSampleFormat(sampleformat)
81+
}
82+
83+
// TODO Choose sample rate
84+
codecctx.SetSampleRate(par.audiopar.Samplerate)
85+
86+
// TODO
87+
//if samplerate, err := ff.AVCodec_supported_samplerate(codec, par.audiopar.Samplerate); err != nil {
88+
// ff.AVCodec_free_context(codecctx)
89+
// return nil, err
90+
//}
91+
92+
// TODO Choose channel layout
93+
//if channellayout, err := ff.AVCodec_supported_channellayout(codec, par.audiopar.Ch); err != nil {
94+
// ff.AVCodec_free_context(codecctx)
95+
// return nil, err
96+
//}
97+
98+
if err := codecctx.SetChannelLayout(par.audiopar.Ch); err != nil {
99+
ff.AVCodec_free_context(codecctx)
100+
return nil, err
101+
}
102+
103+
// Set stream parameters
104+
encoder.stream.SetTimeBase(ff.AVUtil_rational(1, par.audiopar.Samplerate))
105+
106+
case ff.AVMEDIA_TYPE_VIDEO:
107+
encoder.t = VIDEO
108+
109+
// Choose pixel format
110+
if pixelformat, err := ff.AVCodec_supported_pixelformat(codec, par.videopar.PixelFormat); err != nil {
111+
ff.AVCodec_free_context(codecctx)
112+
return nil, err
113+
} else {
114+
codecctx.SetPixFmt(pixelformat)
115+
}
116+
117+
// Set codec parameters
118+
codecctx.SetWidth(par.videopar.Width)
119+
codecctx.SetHeight(par.videopar.Height)
120+
121+
// Set stream parameters
122+
encoder.stream.SetTimeBase(ff.AVUtil_rational_d2q(1/par.codecpar.Framerate, 1<<24))
123+
case ff.AVMEDIA_TYPE_SUBTITLE:
124+
encoder.t = SUBTITLE
125+
fmt.Println("TODO: Set encoding subtitle parameters")
126+
default:
127+
encoder.t = DATA
128+
}
129+
encoder.t |= OUTPUT
130+
131+
// copy parameters to the stream
132+
if err := ff.AVCodec_parameters_from_context(encoder.stream.CodecPar(), codecctx); err != nil {
133+
ff.AVCodec_free_context(codecctx)
134+
return nil, err
135+
}
136+
137+
// Some formats want stream headers to be separate.
138+
if ctx.Flags().Is(ff.AVFMT_GLOBALHEADER) {
139+
codecctx.SetFlags(codecctx.Flags() | ff.AV_CODEC_FLAG_GLOBAL_HEADER)
140+
}
141+
142+
// Open it
143+
if err := ff.AVCodec_open(codecctx, codec, nil); err != nil {
144+
ff.AVCodec_free_context(codecctx)
145+
return nil, ErrInternalAppError.Withf("codec_open: %v", err)
146+
}
147+
148+
// Allocate packet
149+
if packet := ff.AVCodec_packet_alloc(); packet == nil {
150+
ff.AVCodec_free_context(codecctx)
151+
return nil, ErrInternalAppError.With("could not allocate packet")
152+
} else {
153+
encoder.packet = packet
154+
}
155+
156+
// Return it
157+
return encoder, nil
158+
}
159+
160+
func (encoder *encoder) Close() error {
161+
// Free respurces
162+
if encoder.packet != nil {
163+
ff.AVCodec_packet_free(encoder.packet)
164+
}
165+
if encoder.ctx != nil {
166+
ff.AVCodec_free_context(encoder.ctx)
167+
}
168+
169+
// Release resources
170+
encoder.stream = nil
171+
encoder.packet = nil
172+
encoder.ctx = nil
173+
174+
// Return success
175+
return nil
176+
}
177+
178+
////////////////////////////////////////////////////////////////////////////////
179+
// PRIVATE METHODS
180+
181+
func (encoder *encoder) encode(fn MuxFunc) (*ff.AVPacket, error) {
182+
// TODO
183+
fmt.Println("TODO: encode - get packet")
184+
return nil, io.EOF
185+
}

‎frame.go

+5
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ func (frame *frame) Type() MediaType {
7171
return NONE
7272
}
7373

74+
// Id is unused
75+
func (frame *frame) Id() int {
76+
return 0
77+
}
78+
7479
// Return the timestamp as a duration, or minus one if not set
7580
func (frame *frame) Time() time.Duration {
7681
pts := frame.ctx.Pts()

‎interfaces.go

+26-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type Manager interface {
3333
Create(string, Format, []Metadata, ...Parameters) (Media, error)
3434

3535
// Create a media stream for writing. The format will be used to
36-
// determine the formar type and one or more CodecParameters used to
36+
// determine the format and one or more CodecParameters used to
3737
// create the streams. If no parameters are provided, then the
3838
// default parameters for the format are used. It is the responsibility
3939
// of the caller to also close the writer when done.
@@ -140,8 +140,14 @@ type Media interface {
140140
// Return a decoding context for the media stream, and
141141
// map the streams to decoders. If no function is provided
142142
// (ie, the argument is nil) then all streams are demultiplexed.
143+
// Will return an error if called on a writer.
143144
Decoder(DecoderMapFunc) (Decoder, error)
144145

146+
// Multiplex media into packets. Pass a packet to a muxer function.
147+
// Stop when the context is cancelled or the end of the media stream is
148+
// signalled. Will return an error if called on a reader.
149+
Mux(context.Context, MuxFunc) error
150+
145151
// Return INPUT for a demuxer or source, OUTPUT for a muxer or
146152
// sink, DEVICE for a device, FILE for a file or stream.
147153
Type() MediaType
@@ -191,6 +197,9 @@ type Parameters interface {
191197
// Return the media type (AUDIO, VIDEO, SUBTITLE, DATA)
192198
Type() MediaType
193199

200+
// Return the stream id for encoding, or zero if not set
201+
Id() int
202+
194203
// Return number of planes for a specific PixelFormat
195204
// or SampleFormat and ChannelLayout combination
196205
NumPlanes() int
@@ -224,6 +233,13 @@ type VideoParameters interface {
224233
// io.EOF if you want to stop processing the packets early.
225234
type DecoderFunc func(Packet) error
226235

236+
// MuxFunc is a function that multiplexes a packet. It is
237+
// repeatedly called with a stream identifier - return a packet
238+
// for that stream if one is available, or nil if no
239+
// packet is available for muxing. Return io.EOF to
240+
// stop multiplexing.
241+
type MuxFunc func(int) (Packet, error)
242+
227243
// FrameFunc is a function that processes a frame of audio
228244
// or video data. Return io.EOF if you want to stop
229245
// processing the frames early.
@@ -241,9 +257,15 @@ type Codec interface {
241257
Type() MediaType
242258
}
243259

244-
// Packet represents a packet of demultiplexed data.
245-
// Currently this is quite opaque!
246-
type Packet interface{}
260+
// Packet represents a packet of demultiplexed data, or a packet
261+
// to be multiplexed.
262+
type Packet interface {
263+
// The packet can be audio, video, subtitle or data.
264+
Type() MediaType
265+
266+
// The stream identifier for the packet
267+
Id() int
268+
}
247269

248270
// Frame represents a frame of audio or video data.
249271
type Frame interface {

‎manager_ex_test.go

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//go:build !container
2+
3+
package media_test
4+
5+
import (
6+
"testing"
7+
8+
// Package imports
9+
"github.com/stretchr/testify/assert"
10+
11+
// Namespace imports
12+
. "github.com/mutablelogic/go-media"
13+
)
14+
15+
// These tests do not run in containers
16+
17+
func Test_manager_008(t *testing.T) {
18+
assert := assert.New(t)
19+
20+
manager, err := NewManager()
21+
if !assert.NoError(err) {
22+
t.SkipNow()
23+
}
24+
25+
formats := manager.InputFormats(ANY)
26+
assert.NotNil(formats)
27+
for _, format := range formats {
28+
if format.Type().Is(DEVICE) {
29+
devices := manager.Devices(format)
30+
assert.NotNil(devices)
31+
t.Log(format, devices)
32+
}
33+
}
34+
}

‎manager_test.go

-19
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,3 @@ func Test_manager_007(t *testing.T) {
108108

109109
tablewriter.New(os.Stderr, tablewriter.OptHeader(), tablewriter.OptOutputText()).Write(codecs)
110110
}
111-
112-
func Test_manager_008(t *testing.T) {
113-
assert := assert.New(t)
114-
115-
manager, err := NewManager()
116-
if !assert.NoError(err) {
117-
t.SkipNow()
118-
}
119-
120-
formats := manager.InputFormats(ANY)
121-
assert.NotNil(formats)
122-
for _, format := range formats {
123-
if format.Type().Is(DEVICE) {
124-
devices := manager.Devices(format)
125-
assert.NotNil(devices)
126-
t.Log(format, devices)
127-
}
128-
}
129-
}

0 commit comments

Comments
 (0)