apps/go-rtsp
1
0
Fork 0
mirror of https://github.com/Danile71/go-rtsp.git synced 2025-09-27 04:26:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build for linux/windows

Browse Source
This commit is contained in:
danil_e71
2022-05-20 09:20:37 +03:00
parent b9ef7be23e
commit a907cc6e9d
5 changed files with 84 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
decoder.go
View File

@@ -124,19 +124,7 @@ func (decoder *decoder) Decode(packet *C.AVPacket) (pkt *Packet, err error) {
switch frame.format {
case C.AV_SAMPLE_FMT_FLTP:
if decoder.swrContext == nil {
layout := uint64(frame.channel_layout)
decoder.swrContext = C.swr_alloc_set_opts(nil, // we're allocating a new context
C.longlong(layout), // out_ch_layout
C.AV_SAMPLE_FMT_S16, // out_sample_fmt
frame.sample_rate, // out_sample_rate
C.longlong(layout), // in_ch_layout
decoder.codecCtx.sample_fmt, // in_sample_fmt
frame.sample_rate, // in_sample_rate
0, // log_offset
nil) // log_ctx
decoder.swrContext = swrAllocSetOpts(uint64(frame.channel_layout), frame.sample_rate, decoder.codecCtx.sample_fmt)
if cerr = C.swr_init(decoder.swrContext); cerr < C.int(0) {
decoder.swrContext = nil
@@ -166,19 +154,7 @@ func (decoder *decoder) Decode(packet *C.AVPacket) (pkt *Packet, err error) {
case C.AV_SAMPLE_FMT_S32:
if decoder.swrContext == nil {
layout := uint64(frame.channel_layout)
decoder.swrContext = C.swr_alloc_set_opts(nil, // we're allocating a new context
C.longlong(layout), // out_ch_layout
C.AV_SAMPLE_FMT_S16, // out_sample_fmt
frame.sample_rate, // out_sample_rate
C.longlong(layout), // in_ch_layout
decoder.codecCtx.sample_fmt, // in_sample_fmt
frame.sample_rate, // in_sample_rate
0, // log_offset
nil) // log_ctx
decoder.swrContext = swrAllocSetOpts(uint64(frame.channel_layout), frame.sample_rate, decoder.codecCtx.sample_fmt)
if cerr = C.swr_init(decoder.swrContext); cerr < C.int(0) {
decoder.swrContext = nil

6
ffmpeg.h
View File

@@ -1,3 +1,7 @@
#pragma once
#ifndef GO_FFMPEG_H
#define GO_FFMPEG_H
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
#include <libavutil/avutil.h>
@@ -16,3 +20,5 @@ struct AVStream * stream_at(struct AVFormatContext *c, int idx);
void ffmpeginit();
int rtsp_avcodec_encode_wav(AVCodecContext *pCodecCtx, AVFrame *pFrame,AVPacket *packet);
int rtsp_avcodec_encode_resample_wav(AVCodecContext *pCodecCtx,SwrContext *swr_ctx, AVFrame *pFrame,AVPacket *packet);
#endif /* GO_FFMPEG_H */

16
stream.go
View File

@@ -7,6 +7,7 @@ import "C"
import (
"fmt"
"io"
"os"
"runtime"
"sync"
"unsafe"
@@ -62,14 +63,6 @@ func (e ErrTimeout) Error() string {
return e.err.Error()
}
func CErr2Str(code C.int) string {
buf := make([]byte, 64)
C.av_strerror(code, (*C.char)(unsafe.Pointer(&buf[0])), C.ulonglong(len(buf)))
return string(buf)
}
// Setup transport (tcp or udp)
func (stream *Stream) Setup(t Type) (err error) {
transport := C.CString("rtsp_transport")
@@ -84,7 +77,12 @@ func (stream *Stream) Setup(t Type) (err error) {
timeoutKey := C.CString("timeout")
defer C.free(unsafe.Pointer(timeoutKey))
timeout := C.CString("10000000")
goTimeout := os.Getenv("FFMPEG_TIMEOUT")
if goTimeout == "" {
goTimeout = "10000000"
}
timeout := C.CString(goTimeout)
defer C.free(unsafe.Pointer(timeout))
C.av_dict_set(&stream.dictionary, timeoutKey, timeout, 0)

34
types_linux.go Normal file
View File

@@ -0,0 +1,34 @@
// +build linux
package rtsp
/*
#cgo LDFLAGS: -lavformat -lavutil -lavcodec -lswresample -lswscale -lm
#include "ffmpeg.h"
*/
import "C"
import (
"unsafe"
)
func CErr2Str(code C.int) string {
buf := make([]byte, 64)
C.av_strerror(code, (*C.char)(unsafe.Pointer(&buf[0])), C.ulong(len(buf)))
return string(buf)
}
func swrAllocSetOpts(layout uint64, sampleRate C.int, sampleFmt int32) *C.SwrContext {
swrContext := C.swr_alloc_set_opts(nil, // we're allocating a new context
C.long(layout), // out_ch_layout
C.AV_SAMPLE_FMT_S16, // out_sample_fmt
sampleRate, // out_sample_rate
C.long(layout), // in_ch_layout
sampleFmt, // in_sample_fmt
sampleRate, // in_sample_rate
0, // log_offset
nil) // log_ctx
return swrContext
}

34
types_windows.go Normal file
View File

@@ -0,0 +1,34 @@
// +build windows
package rtsp
/*
#cgo LDFLAGS: -lavformat -lavutil -lavcodec -lswresample -lswscale -lm
#include "ffmpeg.h"
*/
import "C"
import (
"unsafe"
)
func CErr2Str(code C.int) string {
buf := make([]byte, 64)
C.av_strerror(code, (*C.char)(unsafe.Pointer(&buf[0])), C.ulonglong(len(buf)))
return string(buf)
}
func swrAllocSetOpts(layout uint64, sampleRate C.int, sampleFmt int32) *C.SwrContext {
swrContext := C.swr_alloc_set_opts(nil, // we're allocating a new context
C.longlong(layout), // out_ch_layout
C.AV_SAMPLE_FMT_S16, // out_sample_fmt
sampleRate, // out_sample_rate
C.longlong(layout), // in_ch_layout
sampleFmt, // in_sample_fmt
sampleRate, // in_sample_rate
0, // log_offset
nil) // log_ctx
return swrContext
}