Skip to content

Commit

Permalink
Version 2.0.0 (#10)
Browse files Browse the repository at this point in the history
Moved to using native mmal calls and YUV colour space to drastically improve performance
  • Loading branch information
rf152 authored May 18, 2021
1 parent 435b826 commit a5f8b4f
Show file tree
Hide file tree
Showing 209 changed files with 49,303 additions and 865 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Richard Franks
Copyright (c) 2020 Richard Franks and contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ works well.

# Changelog

## v2.0.0
Completely new method of acquiring the images - now calling `mmal` directly.
This, as well as using YUV colour, drastically improves the speed of the system,
and the smoothness of the outputted video.

## v1.1.1
Upgraded NDI library to v4.6.2

Expand Down
38 changes: 0 additions & 38 deletions Third Party License
Original file line number Diff line number Diff line change
@@ -1,43 +1,5 @@
This software uses the following third party libraries:

RaspiCam (http://www.uco.es/investiga/grupos/ava/node/40)
=========================================================

Software developed by AVA ( Ava Group of the University of Cordoba, ava at uco
dot es)
Main author Rafael Munoz Salinas (rmsalinas at uco dot es)
This software is released under BSD license as expressed below
-------------------------------------------------------------------
Copyright (c) 2013, AVA ( Ava Group University of Cordoba, ava at uco dot es)
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by the Ava group of the University
of Cordoba.
4. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY AVA ''AS IS'' AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL AVA BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


NewTek NDI (https://ndi.tv)
===========================

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ if [ ! -d "build" ]; then
mkdir build
fi

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
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
6 changes: 6 additions & 0 deletions include/interface/mmal/client/brcmjpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
add_library(brcmjpeg SHARED brcmjpeg.c)
target_link_libraries(brcmjpeg mmal_core mmal_util mmal_vc_client)

include_directories(../../../../host_applications/linux/libs/sm)
add_executable(brcmjpeg_test brcmjpeg_test.c)
target_link_libraries(brcmjpeg_test brcmjpeg vcsm vcos)
Loading

0 comments on commit a5f8b4f

Please sign in to comment.