apps/go-rtsp
1
0
Fork 0
mirror of https://github.com/Danile71/go-rtsp.git synced 2026-04-22 23:57:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

move create decoder to func

Browse Source
This commit is contained in:
danil_e71
2021-07-23 16:51:43 +03:00
parent 9c26e69535
commit 64e440f648
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decoder.go
+17
View File
@@ -24,6 +24,23 @@ func decodeAVPacket(packet *C.AVPacket) (data []byte) {
return
}
func newDecoder(cstream *C.AVStream) (*decoder, error) {
decoder := &decoder{index: int(cstream.index)}
decoder.swrContext = nil
decoder.codecCtx = C.avcodec_alloc_context3(nil)
C.avcodec_parameters_to_context(decoder.codecCtx, cstream.codecpar)
decoder.codec = C.avcodec_find_decoder(decoder.codecCtx.codec_id)
decoder.codecType = int(cstream.codecpar.codec_type)
if decoder.codec == nil {
return nil, fmt.Errorf("ffmpeg: avcodec_find_decoder failed: codec %d not found", decoder.codecCtx.codec_id)
}
if cerr := C.avcodec_open2(decoder.codecCtx, decoder.codec, nil); int(cerr) != 0 {
return nil, fmt.Errorf("ffmpeg: avcodec_open2 failed: %d", cerr)
}
return decoder, nil
}
func (decoder *decoder) Decode(packet *C.AVPacket) (pkt *Packet, err error) {
pkt = &Packet{}
stream.go
+4 -14
View File
@@ -112,22 +112,12 @@ func (stream *Stream) Setup(t Type) (err error) {
switch cstream.codecpar.codec_type {
case C.AVMEDIA_TYPE_VIDEO, C.AVMEDIA_TYPE_AUDIO:
decoder := &decoder{index: int(cstream.index)}
decoder.swrContext = nil
stream.decoders[decoder.index] = decoder
decoder.codecCtx = C.avcodec_alloc_context3(nil)
C.avcodec_parameters_to_context(decoder.codecCtx, cstream.codecpar)
decoder.codec = C.avcodec_find_decoder(decoder.codecCtx.codec_id)
decoder.codecType = int(cstream.codecpar.codec_type)
if decoder.codec == nil {
err = fmt.Errorf("ffmpeg: avcodec_find_decoder failed: codec %d not found", decoder.codecCtx.codec_id)
return
decoder, err := newDecoder(cstream)
if err != nil {
return err
}
if cerr = C.avcodec_open2(decoder.codecCtx, decoder.codec, nil); int(cerr) != 0 {
err = fmt.Errorf("ffmpeg: avcodec_open2 failed: %d", cerr)
return
}
stream.decoders[decoder.index] = decoder
case C.AVMEDIA_TYPE_DATA, C.AVMEDIA_TYPE_SUBTITLE, C.AVMEDIA_TYPE_NB, C.AVMEDIA_TYPE_ATTACHMENT:
// do nothing
default: