Mirrors/cloud-game
1
0
Fork 0
mirror of https://github.com/giongto35/cloud-game.git synced 2026-07-28 12:36:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: Fix channel init order (#141)

Browse source 
* Fix channel order

* Remove Done in encoder

* Update h264 encoder done code

* remove Unnecessary IsRunning
This commit is contained in:
giongto35 2019-11-27 02:38:13 +08:00 • committed by GitHub
parent e8fbd28b2f
commit 0b9d628ec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

38
pkg/encoder/h264encoder/encoder.go
View file

@ -20,8 +20,6 @@ type H264Encoder struct {
buf *bytes.Buffer
enc *x264.Encoder
IsRunning bool
Done bool
// C
width int
height int
@ -34,9 +32,6 @@ func NewH264Encoder(width, height, fps int) (encoder.Encoder, error) {
Output: make(chan []byte, 5*chanSize),
Input: make(chan *image.RGBA, chanSize),
IsRunning: true,
Done: false,
buf: bytes.NewBuffer(make([]byte, 0)),
width: width,
height: height,
@ -51,8 +46,6 @@ func NewH264Encoder(width, height, fps int) (encoder.Encoder, error) {
}
func (v *H264Encoder) init() error {
v.IsRunning = true
opts := &x264.Options{
Width: v.width,
Height: v.height,
@ -79,21 +72,9 @@ func (v *H264Encoder) startLooping() {
log.Println("Warn: Recovered panic in encoding ", r)
log.Println(debug.Stack())
}
if v.Done == true {
// The first time we see IsRunning set to false, we release and return
v.release()
return
}
}()
for img := range v.Input {
if v.Done == true {
// The first time we see IsRunning set to false, we release and return
v.release()
return
}
err := v.enc.Encode(img)
if err != nil {
log.Println("err encoding ", img, " using h264")
@ -105,17 +86,13 @@ func (v *H264Encoder) startLooping() {
// Release release memory and stop loop
func (v *H264Encoder) release() {
if v.IsRunning {
v.IsRunning = false
log.Println("Releasing encoder")
// TODO: Bug here, after close it will signal
close(v.Output)
err := v.enc.Close()
if err != nil {
log.Println("Failed to close H264 encoder")
}
log.Println("Releasing encoder")
// TODO: Bug here, after close it will signal
close(v.Output)
err := v.enc.Close()
if err != nil {
log.Println("Failed to close H264 encoder")
}
// TODO: Can we merge IsRunning and Done together
}
// GetInputChan returns input channel
@ -130,6 +107,5 @@ func (v *H264Encoder) GetOutputChan() chan []byte {
// GetDoneChan returns done channel
func (v *H264Encoder) Stop() {
v.Done = true
close(v.Input)
v.release()
}

38
pkg/encoder/vpx-encoder/encoder.go
View file

@ -49,9 +49,6 @@ type VpxEncoder struct {
Output chan []byte // frame
Input chan *image.RGBA // yuvI420
IsRunning bool
Done bool
width int
height int
// C
@ -70,8 +67,6 @@ func NewVpxEncoder(w, h, fps, bitrate, keyframe int) (encoder.Encoder, error) {
Output: make(chan []byte, 5*chanSize),
Input: make(chan *image.RGBA, chanSize),
IsRunning: true,
Done: false,
// C
width: w,
height: h,
@ -116,7 +111,6 @@ func (v *VpxEncoder) init() error {
if C.call_vpx_codec_enc_init(&v.vpxCodexCtx, encoder, &cfg) != 0 {
return fmt.Errorf("Failed to initialize encoder")
}
v.IsRunning = true
go v.startLooping()
return nil
}
@ -126,24 +120,12 @@ func (v *VpxEncoder) startLooping() {
if r := recover(); r != nil {
log.Println("Warn: Recovered panic in encoding ", r)
}
if v.Done == true {
// The first time we see IsRunning set to false, we release and return
v.release()
return
}
}()
size := int(float32(v.width*v.height) * 1.5)
yuv := make([]byte, size, size)
for img := range v.Input {
if v.Done == true {
// The first time we see IsRunning set to false, we release and return
v.release()
return
}
util.RgbaToYuvInplace(img, yuv, v.width, v.height)
// Add Image
@ -175,18 +157,14 @@ func (v *VpxEncoder) startLooping() {
// Release release memory and stop loop
func (v *VpxEncoder) release() {
if v.IsRunning {
v.IsRunning = false
log.Println("Releasing encoder")
C.vpx_img_free(&v.vpxImage)
C.vpx_codec_destroy(&v.vpxCodexCtx)
// TODO: Bug here, after close it will signal
close(v.Output)
if v.Input != nil {
close(v.Input)
}
log.Println("Releasing encoder")
C.vpx_img_free(&v.vpxImage)
C.vpx_codec_destroy(&v.vpxCodexCtx)
// TODO: Bug here, after close it will signal
close(v.Output)
if v.Input != nil {
close(v.Input)
}
// TODO: Can we merge IsRunning and Done together
}
// GetInputChan returns input channel
@ -201,5 +179,5 @@ func (v *VpxEncoder) GetOutputChan() chan []byte {
// GetDoneChan returns done channel
func (v *VpxEncoder) Stop() {
v.Done = true
v.release()
}