CEF/imagorvideoextended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor(ffmpeg): cleanup callbacks and increased coverage

Browse source
This commit is contained in:
Adrian Shum 2022-10-15 14:07:55 +08:00 • committed by GitHub
parent 5ff3407305
commit 7367cc4750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 86 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ffmpeg/ffmpeg.go
View file

@ -17,7 +17,6 @@ import (
const (
readPacketFlag = 1
seekPacketFlag = 2
interruptFlag = 3
hasVideo = 1
hasAudio = 2
)
@ -58,9 +57,8 @@ type AVContext struct {
closed bool
}
func LoadAVContext(ctx context.Context, reader io.Reader, size int64) (*AVContext, error) {
func LoadAVContext(reader io.Reader, size int64) (*AVContext, error) {
av := &AVContext{
context: ctx,
reader: reader,
size: size,
selectedIndex: -1,
@ -68,7 +66,7 @@ func LoadAVContext(ctx context.Context, reader io.Reader, size int64) (*AVContex
if seeker, ok := reader.(io.Seeker); ok {
av.seeker = seeker
}
flags := C.int(readPacketFlag | interruptFlag)
flags := C.int(readPacketFlag)
if av.seeker != nil {
flags |= seekPacketFlag
}
@ -111,7 +109,7 @@ func (av *AVContext) Export(bands int) (buf []byte, err error) {
return
}
if bands < 3 || bands > 4 {
bands = 3
bands = 4
}
if err = convertFrameToRGB(av, bands); err != nil {
return