From 4c25529369cce07e8321aaf00dcb5e52b1044cd9 Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Mon, 30 Oct 2023 11:40:55 +0100 Subject: [PATCH] move rpicamera into internal/protocols (#2607) --- README.md | 4 ++-- internal/core/rpicamera_source.go | 2 +- .../{ => protocols}/rpicamera/exe/Makefile | 0 .../{ => protocols}/rpicamera/exe/base64.c | 0 .../{ => protocols}/rpicamera/exe/base64.h | 0 .../{ => protocols}/rpicamera/exe/camera.cpp | 0 .../{ => protocols}/rpicamera/exe/camera.h | 0 .../{ => protocols}/rpicamera/exe/encoder.c | 0 .../{ => protocols}/rpicamera/exe/encoder.h | 0 internal/{ => protocols}/rpicamera/exe/main.c | 0 .../rpicamera/exe/parameters.c | 0 .../rpicamera/exe/parameters.h | 0 internal/{ => protocols}/rpicamera/exe/pipe.c | 0 internal/{ => protocols}/rpicamera/exe/pipe.h | 0 .../rpicamera/exe/sensor_mode.c | 0 .../rpicamera/exe/sensor_mode.h | 0 internal/{ => protocols}/rpicamera/exe/text.c | 0 internal/{ => protocols}/rpicamera/exe/text.h | 0 .../rpicamera/exe/text_font.ttf | Bin .../{ => protocols}/rpicamera/exe/window.c | 0 .../{ => protocols}/rpicamera/exe/window.h | 0 internal/{ => protocols}/rpicamera/params.go | 0 internal/{ => protocols}/rpicamera/pipe.go | 0 .../{ => protocols}/rpicamera/rpicamera.go | 0 .../rpicamera/rpicamera_disabled.go | 0 scripts/binaries.mk | 20 +++++++++--------- 26 files changed, 13 insertions(+), 13 deletions(-) rename internal/{ => protocols}/rpicamera/exe/Makefile (100%) rename internal/{ => protocols}/rpicamera/exe/base64.c (100%) rename internal/{ => protocols}/rpicamera/exe/base64.h (100%) rename internal/{ => protocols}/rpicamera/exe/camera.cpp (100%) rename internal/{ => protocols}/rpicamera/exe/camera.h (100%) rename internal/{ => protocols}/rpicamera/exe/encoder.c (100%) rename internal/{ => protocols}/rpicamera/exe/encoder.h (100%) rename internal/{ => protocols}/rpicamera/exe/main.c (100%) rename internal/{ => protocols}/rpicamera/exe/parameters.c (100%) rename internal/{ => protocols}/rpicamera/exe/parameters.h (100%) rename internal/{ => protocols}/rpicamera/exe/pipe.c (100%) rename internal/{ => protocols}/rpicamera/exe/pipe.h (100%) rename internal/{ => protocols}/rpicamera/exe/sensor_mode.c (100%) rename internal/{ => protocols}/rpicamera/exe/sensor_mode.h (100%) rename internal/{ => protocols}/rpicamera/exe/text.c (100%) rename internal/{ => protocols}/rpicamera/exe/text.h (100%) rename internal/{ => protocols}/rpicamera/exe/text_font.ttf (100%) rename internal/{ => protocols}/rpicamera/exe/window.c (100%) rename internal/{ => protocols}/rpicamera/exe/window.h (100%) rename internal/{ => protocols}/rpicamera/params.go (100%) rename internal/{ => protocols}/rpicamera/pipe.go (100%) rename internal/{ => protocols}/rpicamera/rpicamera.go (100%) rename internal/{ => protocols}/rpicamera/rpicamera_disabled.go (100%) diff --git a/README.md b/README.md index 7829dff6..c73a693a 100644 --- a/README.md +++ b/README.md @@ -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 . ``` diff --git a/internal/core/rpicamera_source.go b/internal/core/rpicamera_source.go index e1b7ced4..2979c0d1 100644 --- a/internal/core/rpicamera_source.go +++ b/internal/core/rpicamera_source.go @@ -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" ) diff --git a/internal/rpicamera/exe/Makefile b/internal/protocols/rpicamera/exe/Makefile similarity index 100% rename from internal/rpicamera/exe/Makefile rename to internal/protocols/rpicamera/exe/Makefile diff --git a/internal/rpicamera/exe/base64.c b/internal/protocols/rpicamera/exe/base64.c similarity index 100% rename from internal/rpicamera/exe/base64.c rename to internal/protocols/rpicamera/exe/base64.c diff --git a/internal/rpicamera/exe/base64.h b/internal/protocols/rpicamera/exe/base64.h similarity index 100% rename from internal/rpicamera/exe/base64.h rename to internal/protocols/rpicamera/exe/base64.h diff --git a/internal/rpicamera/exe/camera.cpp b/internal/protocols/rpicamera/exe/camera.cpp similarity index 100% rename from internal/rpicamera/exe/camera.cpp rename to internal/protocols/rpicamera/exe/camera.cpp diff --git a/internal/rpicamera/exe/camera.h b/internal/protocols/rpicamera/exe/camera.h similarity index 100% rename from internal/rpicamera/exe/camera.h rename to internal/protocols/rpicamera/exe/camera.h diff --git a/internal/rpicamera/exe/encoder.c b/internal/protocols/rpicamera/exe/encoder.c similarity index 100% rename from internal/rpicamera/exe/encoder.c rename to internal/protocols/rpicamera/exe/encoder.c diff --git a/internal/rpicamera/exe/encoder.h b/internal/protocols/rpicamera/exe/encoder.h similarity index 100% rename from internal/rpicamera/exe/encoder.h rename to internal/protocols/rpicamera/exe/encoder.h diff --git a/internal/rpicamera/exe/main.c b/internal/protocols/rpicamera/exe/main.c similarity index 100% rename from internal/rpicamera/exe/main.c rename to internal/protocols/rpicamera/exe/main.c diff --git a/internal/rpicamera/exe/parameters.c b/internal/protocols/rpicamera/exe/parameters.c similarity index 100% rename from internal/rpicamera/exe/parameters.c rename to internal/protocols/rpicamera/exe/parameters.c diff --git a/internal/rpicamera/exe/parameters.h b/internal/protocols/rpicamera/exe/parameters.h similarity index 100% rename from internal/rpicamera/exe/parameters.h rename to internal/protocols/rpicamera/exe/parameters.h diff --git a/internal/rpicamera/exe/pipe.c b/internal/protocols/rpicamera/exe/pipe.c similarity index 100% rename from internal/rpicamera/exe/pipe.c rename to internal/protocols/rpicamera/exe/pipe.c diff --git a/internal/rpicamera/exe/pipe.h b/internal/protocols/rpicamera/exe/pipe.h similarity index 100% rename from internal/rpicamera/exe/pipe.h rename to internal/protocols/rpicamera/exe/pipe.h diff --git a/internal/rpicamera/exe/sensor_mode.c b/internal/protocols/rpicamera/exe/sensor_mode.c similarity index 100% rename from internal/rpicamera/exe/sensor_mode.c rename to internal/protocols/rpicamera/exe/sensor_mode.c diff --git a/internal/rpicamera/exe/sensor_mode.h b/internal/protocols/rpicamera/exe/sensor_mode.h similarity index 100% rename from internal/rpicamera/exe/sensor_mode.h rename to internal/protocols/rpicamera/exe/sensor_mode.h diff --git a/internal/rpicamera/exe/text.c b/internal/protocols/rpicamera/exe/text.c similarity index 100% rename from internal/rpicamera/exe/text.c rename to internal/protocols/rpicamera/exe/text.c diff --git a/internal/rpicamera/exe/text.h b/internal/protocols/rpicamera/exe/text.h similarity index 100% rename from internal/rpicamera/exe/text.h rename to internal/protocols/rpicamera/exe/text.h diff --git a/internal/rpicamera/exe/text_font.ttf b/internal/protocols/rpicamera/exe/text_font.ttf similarity index 100% rename from internal/rpicamera/exe/text_font.ttf rename to internal/protocols/rpicamera/exe/text_font.ttf diff --git a/internal/rpicamera/exe/window.c b/internal/protocols/rpicamera/exe/window.c similarity index 100% rename from internal/rpicamera/exe/window.c rename to internal/protocols/rpicamera/exe/window.c diff --git a/internal/rpicamera/exe/window.h b/internal/protocols/rpicamera/exe/window.h similarity index 100% rename from internal/rpicamera/exe/window.h rename to internal/protocols/rpicamera/exe/window.h diff --git a/internal/rpicamera/params.go b/internal/protocols/rpicamera/params.go similarity index 100% rename from internal/rpicamera/params.go rename to internal/protocols/rpicamera/params.go diff --git a/internal/rpicamera/pipe.go b/internal/protocols/rpicamera/pipe.go similarity index 100% rename from internal/rpicamera/pipe.go rename to internal/protocols/rpicamera/pipe.go diff --git a/internal/rpicamera/rpicamera.go b/internal/protocols/rpicamera/rpicamera.go similarity index 100% rename from internal/rpicamera/rpicamera.go rename to internal/protocols/rpicamera/rpicamera.go diff --git a/internal/rpicamera/rpicamera_disabled.go b/internal/protocols/rpicamera/rpicamera_disabled.go similarity index 100% rename from internal/rpicamera/rpicamera_disabled.go rename to internal/protocols/rpicamera/rpicamera_disabled.go diff --git a/scripts/binaries.mk b/scripts/binaries.mk index 2c06580c..849e56fa 100644 --- a/scripts/binaries.mk +++ b/scripts/binaries.mk @@ -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 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