Skip to content

Commit a5f8b4f

Browse files
authored
Version 2.0.0 (#10)
Moved to using native mmal calls and YUV colour space to drastically improve performance
1 parent 435b826 commit a5f8b4f

File tree

209 files changed

+49303
-865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+49303
-865
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Richard Franks
3+
Copyright (c) 2020 Richard Franks and contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ works well.
7676

7777
# Changelog
7878

79+
## v2.0.0
80+
Completely new method of acquiring the images - now calling `mmal` directly.
81+
This, as well as using YUV colour, drastically improves the speed of the system,
82+
and the smoothness of the outputted video.
83+
7984
## v1.1.1
8085
Upgraded NDI library to v4.6.2
8186

Third Party License

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,5 @@
11
This software uses the following third party libraries:
22

3-
RaspiCam (http://www.uco.es/investiga/grupos/ava/node/40)
4-
=========================================================
5-
6-
Software developed by AVA ( Ava Group of the University of Cordoba, ava at uco
7-
dot es)
8-
Main author Rafael Munoz Salinas (rmsalinas at uco dot es)
9-
This software is released under BSD license as expressed below
10-
-------------------------------------------------------------------
11-
Copyright (c) 2013, AVA ( Ava Group University of Cordoba, ava at uco dot es)
12-
All rights reserved.
13-
Redistribution and use in source and binary forms, with or without
14-
modification, are permitted provided that the following conditions
15-
are met:
16-
1. Redistributions of source code must retain the above copyright
17-
notice, this list of conditions and the following disclaimer.
18-
2. Redistributions in binary form must reproduce the above copyright
19-
notice, this list of conditions and the following disclaimer in the
20-
documentation and/or other materials provided with the distribution.
21-
3. All advertising materials mentioning features or use of this software
22-
must display the following acknowledgement:
23-
This product includes software developed by the Ava group of the University
24-
of Cordoba.
25-
4. Neither the name of the University nor the names of its contributors
26-
may be used to endorse or promote products derived from this software
27-
without specific prior written permission.
28-
29-
THIS SOFTWARE IS PROVIDED BY AVA ''AS IS'' AND ANY
30-
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
32-
DISCLAIMED. IN NO EVENT SHALL AVA BE LIABLE FOR ANY
33-
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
35-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
36-
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
37-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
38-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39-
40-
413
NewTek NDI (https://ndi.tv)
424
===========================
435

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if [ ! -d "build" ]; then
44
mkdir build
55
fi
66

7-
g++ -std=c++11 -pthread -Wl,--allow-shlib-undefined -Wl,--as-needed -Iinclude/ -Llib/ndi -Llib/opencv -Llib/raspicam -o build/raspindi src/main.cpp -lndi -ldl -lconfig++ -lraspicam
7+
g++ -std=c++11 -pthread -Wl,--allow-shlib-undefined -Wl,--as-needed -Iinclude/ -Llib/ndi -L /opt/vc/lib -o build/raspindi src/main.cpp -lndi -ldl -lconfig++ -lmmal_core -lmmal -lmmal_util
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
add_library(brcmjpeg SHARED brcmjpeg.c)
2+
target_link_libraries(brcmjpeg mmal_core mmal_util mmal_vc_client)
3+
4+
include_directories(../../../../host_applications/linux/libs/sm)
5+
add_executable(brcmjpeg_test brcmjpeg_test.c)
6+
target_link_libraries(brcmjpeg_test brcmjpeg vcsm vcos)

0 commit comments

Comments
 (0)