Browse Source

move rpicamera into internal/protocols (#2607)

pull/2616/head
Alessandro Ros 2 years ago committed by GitHub
parent
commit
4c25529369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      README.md
  2. 2
      internal/core/rpicamera_source.go
  3. 0
      internal/protocols/rpicamera/exe/Makefile
  4. 0
      internal/protocols/rpicamera/exe/base64.c
  5. 0
      internal/protocols/rpicamera/exe/base64.h
  6. 0
      internal/protocols/rpicamera/exe/camera.cpp
  7. 0
      internal/protocols/rpicamera/exe/camera.h
  8. 0
      internal/protocols/rpicamera/exe/encoder.c
  9. 0
      internal/protocols/rpicamera/exe/encoder.h
  10. 0
      internal/protocols/rpicamera/exe/main.c
  11. 0
      internal/protocols/rpicamera/exe/parameters.c
  12. 0
      internal/protocols/rpicamera/exe/parameters.h
  13. 0
      internal/protocols/rpicamera/exe/pipe.c
  14. 0
      internal/protocols/rpicamera/exe/pipe.h
  15. 0
      internal/protocols/rpicamera/exe/sensor_mode.c
  16. 0
      internal/protocols/rpicamera/exe/sensor_mode.h
  17. 0
      internal/protocols/rpicamera/exe/text.c
  18. 0
      internal/protocols/rpicamera/exe/text.h
  19. 0
      internal/protocols/rpicamera/exe/text_font.ttf
  20. 0
      internal/protocols/rpicamera/exe/window.c
  21. 0
      internal/protocols/rpicamera/exe/window.h
  22. 0
      internal/protocols/rpicamera/params.go
  23. 0
      internal/protocols/rpicamera/pipe.go
  24. 0
      internal/protocols/rpicamera/rpicamera.go
  25. 0
      internal/protocols/rpicamera/rpicamera_disabled.go
  26. 20
      scripts/binaries.mk

4
README.md

@ -1657,9 +1657,9 @@ The server can be compiled with native support for the Raspberry Pi Camera. Comp @@ -1657,9 +1657,9 @@ The server can be compiled with native support for the Raspberry Pi Camera. Comp
Download the repository, open a terminal in it and run:
```sh
cd internal/rpicamera/exe
cd internal/protocols/rpicamera/exe
make
cd ../../../
cd ../../../../
go build -tags rpicamera .
```

2
internal/core/rpicamera_source.go

@ -9,7 +9,7 @@ import ( @@ -9,7 +9,7 @@ import (
"github.com/bluenviron/mediamtx/internal/conf"
"github.com/bluenviron/mediamtx/internal/logger"
"github.com/bluenviron/mediamtx/internal/rpicamera"
"github.com/bluenviron/mediamtx/internal/protocols/rpicamera"
"github.com/bluenviron/mediamtx/internal/stream"
"github.com/bluenviron/mediamtx/internal/unit"
)

0
internal/rpicamera/exe/Makefile → internal/protocols/rpicamera/exe/Makefile

0
internal/rpicamera/exe/base64.c → internal/protocols/rpicamera/exe/base64.c

0
internal/rpicamera/exe/base64.h → internal/protocols/rpicamera/exe/base64.h

0
internal/rpicamera/exe/camera.cpp → internal/protocols/rpicamera/exe/camera.cpp

0
internal/rpicamera/exe/camera.h → internal/protocols/rpicamera/exe/camera.h

0
internal/rpicamera/exe/encoder.c → internal/protocols/rpicamera/exe/encoder.c

0
internal/rpicamera/exe/encoder.h → internal/protocols/rpicamera/exe/encoder.h

0
internal/rpicamera/exe/main.c → internal/protocols/rpicamera/exe/main.c

0
internal/rpicamera/exe/parameters.c → internal/protocols/rpicamera/exe/parameters.c

0
internal/rpicamera/exe/parameters.h → internal/protocols/rpicamera/exe/parameters.h

0
internal/rpicamera/exe/pipe.c → internal/protocols/rpicamera/exe/pipe.c

0
internal/rpicamera/exe/pipe.h → internal/protocols/rpicamera/exe/pipe.h

0
internal/rpicamera/exe/sensor_mode.c → internal/protocols/rpicamera/exe/sensor_mode.c

0
internal/rpicamera/exe/sensor_mode.h → internal/protocols/rpicamera/exe/sensor_mode.h

0
internal/rpicamera/exe/text.c → internal/protocols/rpicamera/exe/text.c

0
internal/rpicamera/exe/text.h → internal/protocols/rpicamera/exe/text.h

0
internal/rpicamera/exe/text_font.ttf → internal/protocols/rpicamera/exe/text_font.ttf

0
internal/rpicamera/exe/window.c → internal/protocols/rpicamera/exe/window.c

0
internal/rpicamera/exe/window.h → internal/protocols/rpicamera/exe/window.h

0
internal/rpicamera/params.go → internal/protocols/rpicamera/params.go

0
internal/rpicamera/pipe.go → internal/protocols/rpicamera/pipe.go

0
internal/rpicamera/rpicamera.go → internal/protocols/rpicamera/rpicamera.go

0
internal/rpicamera/rpicamera_disabled.go → internal/protocols/rpicamera/rpicamera_disabled.go

20
scripts/binaries.mk

@ -4,15 +4,15 @@ define DOCKERFILE_BINARIES @@ -4,15 +4,15 @@ define DOCKERFILE_BINARIES
FROM $(RPI32_IMAGE) AS rpicamera32
RUN ["cross-build-start"]
RUN apt update && apt install -y --no-install-recommends g++ pkg-config make libcamera-dev libfreetype-dev xxd
WORKDIR /s/internal/rpicamera/exe
COPY internal/rpicamera/exe .
WORKDIR /s/internal/protocols/rpicamera/exe
COPY internal/protocols/rpicamera/exe .
RUN make -j$$(nproc)
FROM $(RPI64_IMAGE) AS rpicamera64
RUN ["cross-build-start"]
RUN apt update && apt install -y --no-install-recommends g++ pkg-config make libcamera-dev libfreetype-dev xxd
WORKDIR /s/internal/rpicamera/exe
COPY internal/rpicamera/exe .
WORKDIR /s/internal/protocols/rpicamera/exe
COPY internal/protocols/rpicamera/exe .
RUN make -j$$(nproc)
FROM $(BASE_IMAGE) AS build-base
@ -44,22 +44,22 @@ RUN GOOS=darwin GOARCH=arm64 go build -ldflags "-X github.com/bluenviron/mediamt @@ -44,22 +44,22 @@ RUN GOOS=darwin GOARCH=arm64 go build -ldflags "-X github.com/bluenviron/mediamt
RUN tar -C tmp -czf binaries/$(BINARY_NAME)_$${VERSION}_darwin_arm64.tar.gz --owner=0 --group=0 $(BINARY_NAME) mediamtx.yml LICENSE
FROM build-base AS build-linux-armv6
COPY --from=rpicamera32 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/
COPY --from=rpicamera32 /s/internal/protocols/rpicamera/exe/exe internal/protocols/rpicamera/exe/
RUN GOOS=linux GOARCH=arm GOARM=6 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/$(BINARY_NAME) -tags rpicamera
RUN tar -C tmp -czf binaries/$(BINARY_NAME)_$${VERSION}_linux_armv6.tar.gz --owner=0 --group=0 $(BINARY_NAME) mediamtx.yml LICENSE
RUN rm internal/rpicamera/exe/exe
RUN rm internal/protocols/rpicamera/exe/exe
FROM build-base AS build-linux-armv7
COPY --from=rpicamera32 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/
COPY --from=rpicamera32 /s/internal/protocols/rpicamera/exe/exe internal/protocols/rpicamera/exe/
RUN GOOS=linux GOARCH=arm GOARM=7 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/$(BINARY_NAME) -tags rpicamera
RUN tar -C tmp -czf binaries/$(BINARY_NAME)_$${VERSION}_linux_armv7.tar.gz --owner=0 --group=0 $(BINARY_NAME) mediamtx.yml LICENSE
RUN rm internal/rpicamera/exe/exe
RUN rm internal/protocols/rpicamera/exe/exe
FROM build-base AS build-linux-arm64
COPY --from=rpicamera64 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/
COPY --from=rpicamera64 /s/internal/protocols/rpicamera/exe/exe internal/protocols/rpicamera/exe/
RUN GOOS=linux GOARCH=arm64 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/$(BINARY_NAME) -tags rpicamera
RUN tar -C tmp -czf binaries/$(BINARY_NAME)_$${VERSION}_linux_arm64v8.tar.gz --owner=0 --group=0 $(BINARY_NAME) mediamtx.yml LICENSE
RUN rm internal/rpicamera/exe/exe
RUN rm internal/protocols/rpicamera/exe/exe
FROM $(BASE_IMAGE)
COPY --from=build-windows-amd64 /s/binaries /s/binaries

Loading…
Cancel
Save