package/mediadevices
1
0
Fork 0
mirror of https://github.com/pion/mediadevices.git synced 2025-10-05 16:46:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

correct error handling and codec config

Browse Source
This commit is contained in:
3DRX
2025-07-03 21:31:46 +08:00
parent 29b9eaf317
commit d8741c02e0
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/codec/ffmpeg/ffmpeg.go
View File

@@ -80,6 +80,8 @@ func newHardwareEncoder(r video.Reader, p prop.Media, params Params) (*hardwareE
codecCtx.SetTimeBase(astiav.NewRational(1, int(p.FrameRate))) codecCtx.SetTimeBase(astiav.NewRational(1, int(p.FrameRate)))
codecCtx.SetFramerate(codecCtx.TimeBase().Invert()) codecCtx.SetFramerate(codecCtx.TimeBase().Invert())
codecCtx.SetBitRate(int64(params.BitRate)) codecCtx.SetBitRate(int64(params.BitRate))
codecCtx.SetRateControlMaxRate(int64(params.BitRate + params.BitRate/10))
codecCtx.SetRateControlMinRate(int64(params.BitRate - params.BitRate/10))
codecCtx.SetGopSize(params.KeyFrameInterval) codecCtx.SetGopSize(params.KeyFrameInterval)
codecCtx.SetMaxBFrames(0) codecCtx.SetMaxBFrames(0)
switch params.codecName { switch params.codecName {
@@ -107,10 +109,11 @@ func newHardwareEncoder(r video.Reader, p prop.Media, params Params) (*hardwareE
case "h264_nvenc", "hevc_nvenc", "av1_nvenc": case "h264_nvenc", "hevc_nvenc", "av1_nvenc":
codecOptions.Set("forced-idr", "1", 0) codecOptions.Set("forced-idr", "1", 0)
codecOptions.Set("zerolatency", "1", 0) codecOptions.Set("zerolatency", "1", 0)
codecOptions.Set("intra-refresh", "1", 0)
codecOptions.Set("delay", "0", 0) codecOptions.Set("delay", "0", 0)
codecOptions.Set("tune", "ll", 0) codecOptions.Set("tune", "ll", 0)
codecOptions.Set("preset", "p1", 0) codecOptions.Set("preset", "p1", 0)
codecOptions.Set("rc", "cbr", 0) codecOptions.Set("rc", "vbr", 0)
case "vp8_vaapi", "vp9_vaapi", "h264_vaapi", "hevc_vaapi": case "vp8_vaapi", "vp9_vaapi", "h264_vaapi", "hevc_vaapi":
codecOptions.Set("rc_mode", "CBR", 0) codecOptions.Set("rc_mode", "CBR", 0)
} }
@@ -233,18 +236,12 @@ func (e *hardwareEncoder) Read() ([]byte, func(), error) {
if err = e.frame.TransferHardwareData(e.hwFrame); err != nil { if err = e.frame.TransferHardwareData(e.hwFrame); err != nil {
return nil, func() {}, err return nil, func() {}, err
} }
if err := e.codecCtx.SendFrame(e.hwFrame); err != nil { if err = e.codecCtx.SendFrame(e.hwFrame); err != nil {
return nil, func() {}, err return nil, func() {}, err
} }
for { if err = e.codecCtx.ReceivePacket(e.packet); err != nil {
if err = e.codecCtx.ReceivePacket(e.packet); err != nil { return nil, func() {}, err
if errors.Is(err, astiav.ErrEof) || errors.Is(err, astiav.ErrEagain) {
continue
}
return nil, func() {}, err
}
break
} }
data := make([]byte, e.packet.Size()) data := make([]byte, e.packet.Size())
@@ -266,6 +263,8 @@ func (e *hardwareEncoder) SetBitRate(bitrate int) error {
e.mu.Lock() e.mu.Lock()
defer e.mu.Unlock() defer e.mu.Unlock()
e.codecCtx.SetBitRate(int64(bitrate)) e.codecCtx.SetBitRate(int64(bitrate))
e.codecCtx.SetRateControlMaxRate(int64(bitrate + bitrate/10))
e.codecCtx.SetRateControlMinRate(int64(bitrate - bitrate/10))
return nil return nil
} }