Skip to content

Commit

Permalink
find/replace name so that go get stops complaining
Browse files Browse the repository at this point in the history
  • Loading branch information
bhaney committed Dec 7, 2022
1 parent 6c2a0fe commit e05a38e
Show file tree
Hide file tree
Showing 73 changed files with 150 additions and 150 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ blank_issues_enabled: false

contact_links:
- name: Question
url: https://github.com/aler9/rtsp-simple-server/discussions/new
url: https://github.com/bhaney/rtsp-simple-server/discussions/new
about: Ask the community for help
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Features:
* Natively compatible with the Raspberry Pi Camera
* Compatible with Linux, Windows and macOS, does not require any dependency or interpreter, it's a single executable

[![Test](https://github.com/aler9/rtsp-simple-server/workflows/test/badge.svg)](https://github.com/aler9/rtsp-simple-server/actions?query=workflow:test)
[![Lint](https://github.com/aler9/rtsp-simple-server/workflows/lint/badge.svg)](https://github.com/aler9/rtsp-simple-server/actions?query=workflow:lint)
[![Test](https://github.com/bhaney/rtsp-simple-server/workflows/test/badge.svg)](https://github.com/bhaney/rtsp-simple-server/actions?query=workflow:test)
[![Lint](https://github.com/bhaney/rtsp-simple-server/workflows/lint/badge.svg)](https://github.com/bhaney/rtsp-simple-server/actions?query=workflow:lint)
[![CodeCov](https://codecov.io/gh/aler9/rtsp-simple-server/branch/main/graph/badge.svg)](https://codecov.io/gh/aler9/rtsp-simple-server/branch/main)
[![Release](https://img.shields.io/github/v/release/aler9/rtsp-simple-server)](https://github.com/aler9/rtsp-simple-server/releases)
[![Release](https://img.shields.io/github/v/release/aler9/rtsp-simple-server)](https://github.com/bhaney/rtsp-simple-server/releases)
[![Docker Hub](https://img.shields.io/badge/docker-aler9/rtsp--simple--server-blue)](https://hub.docker.com/r/aler9/rtsp-simple-server)
[![API Documentation](https://img.shields.io/badge/api-documentation-blue)](https://aler9.github.io/rtsp-simple-server)

Expand Down Expand Up @@ -85,7 +85,7 @@ Features:

### Standard

1. Download and extract a precompiled binary from the [release page](https://github.com/aler9/rtsp-simple-server/releases).
1. Download and extract a precompiled binary from the [release page](https://github.com/bhaney/rtsp-simple-server/releases).

2. Start the server:

Expand All @@ -107,7 +107,7 @@ The `--network=host` flag is mandatory since Docker can change the source port o
docker run --rm -it -e RTSP_PROTOCOLS=tcp -p 8554:8554 -p 1935:1935 -p 8888:8888 aler9/rtsp-simple-server
```

Please keep in mind that the Docker image doesn't include _FFmpeg_. if you need to use _FFmpeg_ for an external command or anything else, you need to build a Docker image that contains both _rtsp-simple-server_ and _FFmpeg_, by following instructions [here](https://github.com/aler9/rtsp-simple-server/discussions/278#discussioncomment-549104).
Please keep in mind that the Docker image doesn't include _FFmpeg_. if you need to use _FFmpeg_ for an external command or anything else, you need to build a Docker image that contains both _rtsp-simple-server_ and _FFmpeg_, by following instructions [here](https://github.com/bhaney/rtsp-simple-server/discussions/278#discussioncomment-549104).

## Basic usage

Expand Down Expand Up @@ -365,7 +365,7 @@ The command inserted into `runOnDemand` will start only when a client requests t

Systemd is the service manager used by Ubuntu, Debian and many other Linux distributions, and allows to launch _rtsp-simple-server_ on boot.

Download a release bundle from the [release page](https://github.com/aler9/rtsp-simple-server/releases), unzip it, and move the executable and configuration in the system:
Download a release bundle from the [release page](https://github.com/bhaney/rtsp-simple-server/releases), unzip it, and move the executable and configuration in the system:

```
sudo mv rtsp-simple-server /usr/local/bin/
Expand Down Expand Up @@ -574,7 +574,7 @@ paths:
rpiCameraHeight: 1080
```

All available parameters are listed in the [sample configuration file](https://github.com/aler9/rtsp-simple-server/blob/master/rtsp-simple-server.yml#L230).
All available parameters are listed in the [sample configuration file](https://github.com/bhaney/rtsp-simple-server/blob/master/rtsp-simple-server.yml#L230).

### From OBS Studio

Expand Down
2 changes: 1 addition & 1 deletion internal/conf/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"golang.org/x/crypto/nacl/secretbox"
"gopkg.in/yaml.v2"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

func decrypt(key string, byts []byte) ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/conf/conf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/crypto/nacl/secretbox"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

func writeTempFile(byts []byte) (string, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/conf/hlsvariant.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/aler9/rtsp-simple-server/internal/hls"
"github.com/bhaney/rtsp-simple-server/internal/hls"
)

// HLSVariant is the hlsVariant parameter.
Expand Down
2 changes: 1 addition & 1 deletion internal/conf/logdestination.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"strings"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

// LogDestinations is the logDestionations parameter.
Expand Down
2 changes: 1 addition & 1 deletion internal/conf/loglevel.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

// LogLevel is the logLevel parameter.
Expand Down
4 changes: 2 additions & 2 deletions internal/core/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/gin-gonic/gin"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

func interfaceIsEmpty(i interface{}) bool {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/pion/rtp"
"github.com/stretchr/testify/require"

"github.com/aler9/rtsp-simple-server/internal/rtmp"
"github.com/bhaney/rtsp-simple-server/internal/rtmp"
)

func httpRequest(method string, ur string, in interface{}, out interface{}) error {
Expand Down
10 changes: 5 additions & 5 deletions internal/core/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"github.com/gin-gonic/gin"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/confwatcher"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/aler9/rtsp-simple-server/internal/rlimit"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/confwatcher"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/rlimit"
)

var version = "v0.0.0"
Expand Down
6 changes: 3 additions & 3 deletions internal/core/hls_muxer.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/aler9/gortsplib/pkg/ringbuffer"
"github.com/gin-gonic/gin"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/hls"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/hls"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/core/hls_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

"github.com/gin-gonic/gin"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

type nilWriter struct{}
Expand Down
4 changes: 2 additions & 2 deletions internal/core/hls_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/aler9/gortsplib"

"github.com/aler9/rtsp-simple-server/internal/hls"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/hls"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

type hlsSourceParent interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

func metric(key string, value int64) string {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/aler9/gortsplib"
"github.com/stretchr/testify/require"

"github.com/aler9/rtsp-simple-server/internal/rtmp"
"github.com/bhaney/rtsp-simple-server/internal/rtmp"
)

func TestMetrics(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions internal/core/path.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/aler9/gortsplib/pkg/base"
"github.com/aler9/gortsplib/pkg/url"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

func newEmptyTimer() *time.Timer {
Expand Down
6 changes: 3 additions & 3 deletions internal/core/path_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"sync"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

type pathManagerHLSServer interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/pprof.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
// start pprof
_ "net/http/pprof"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

type pprofParent interface {
Expand Down
4 changes: 2 additions & 2 deletions internal/core/rpicamera_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/aler9/gortsplib"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/aler9/rtsp-simple-server/internal/rpicamera"
"github.com/bhaney/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/rpicamera"
)

type rpiCameraSourceParent interface {
Expand Down
12 changes: 6 additions & 6 deletions internal/core/rtmp_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"github.com/google/uuid"
"github.com/notedit/rtmp/format/flv/flvio"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/aler9/rtsp-simple-server/internal/rtmp"
"github.com/aler9/rtsp-simple-server/internal/rtmp/h264conf"
"github.com/aler9/rtsp-simple-server/internal/rtmp/message"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/rtmp"
"github.com/bhaney/rtsp-simple-server/internal/rtmp/h264conf"
"github.com/bhaney/rtsp-simple-server/internal/rtmp/message"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/core/rtmp_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"sync"
"time"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

type rtmpServerAPIConnsListItem struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/core/rtmp_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/notedit/rtmp/format/flv/flvio"
"github.com/stretchr/testify/require"

"github.com/aler9/rtsp-simple-server/internal/rtmp"
"github.com/aler9/rtsp-simple-server/internal/rtmp/message"
"github.com/bhaney/rtsp-simple-server/internal/rtmp"
"github.com/bhaney/rtsp-simple-server/internal/rtmp/message"
)

func TestRTMPServerPublishRead(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions internal/core/rtmp_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"github.com/aler9/gortsplib/pkg/h264"
"github.com/notedit/rtmp/format/flv/flvio"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/aler9/rtsp-simple-server/internal/rtmp"
"github.com/aler9/rtsp-simple-server/internal/rtmp/message"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/rtmp"
"github.com/bhaney/rtsp-simple-server/internal/rtmp/message"
)

type rtmpSourceParent interface {
Expand Down
4 changes: 2 additions & 2 deletions internal/core/rtmp_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/notedit/rtmp/format/flv/flvio"
"github.com/stretchr/testify/require"

"github.com/aler9/rtsp-simple-server/internal/rtmp"
"github.com/aler9/rtsp-simple-server/internal/rtmp/message"
"github.com/bhaney/rtsp-simple-server/internal/rtmp"
"github.com/bhaney/rtsp-simple-server/internal/rtmp/message"
)

func TestRTMPSource(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions internal/core/rtsp_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/aler9/gortsplib/pkg/headers"
"github.com/google/uuid"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/core/rtsp_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/aler9/gortsplib/pkg/headers"
"github.com/aler9/gortsplib/pkg/liberrors"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

type rtspServerAPIConnsListItem struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/core/rtsp_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/google/uuid"
"github.com/pion/rtp"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/externalcmd"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/core/rtsp_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/pion/rtp"

"github.com/aler9/gortsplib/pkg/url"
"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

type rtspSourceParent interface {
Expand Down
6 changes: 3 additions & 3 deletions internal/core/source_static.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"
"time"

"github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/aler9/rtsp-simple-server/internal/rpicamera"
"github.com/bhaney/rtsp-simple-server/internal/conf"
"github.com/bhaney/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/rpicamera"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/highleveltests/tests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"time"

"github.com/aler9/rtsp-simple-server/internal/core"
"github.com/bhaney/rtsp-simple-server/internal/core"
)

var serverCert = []byte(`-----BEGIN CERTIFICATE-----
Expand Down
2 changes: 1 addition & 1 deletion internal/hls/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/aler9/gortsplib"

"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/hls/client_downloader_primary.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/aler9/gortsplib"
gm3u8 "github.com/grafov/m3u8"

"github.com/aler9/rtsp-simple-server/internal/hls/m3u8"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/bhaney/rtsp-simple-server/internal/hls/m3u8"
"github.com/bhaney/rtsp-simple-server/internal/logger"
)

func clientDownloadPlaylist(ctx context.Context, httpClient *http.Client, ur *url.URL) (m3u8.Playlist, error) {
Expand Down
Loading

0 comments on commit e05a38e

Please sign in to comment.