Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR with multiple changes and improvements grouped together #343

Merged
merged 102 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
54c27f9
NVR initial commit
Vinayak-YB Sep 8, 2023
9cfc6da
Removed NVRControl Module, moving to apranvr
Sep 11, 2023
1e63c53
Adding Pipeline.cpp changes
Sep 11, 2023
a377dee
sprint-3 changes
Vinayak-YB Sep 25, 2023
4d7e31f
typo change in rtsp
venkat0907 Sep 25, 2023
70bf9b9
Play/pause and golive working checkpoint
Sep 29, 2023
a4949a3
Sprint-4 changes for ApraPipes
Vinayak-YB Oct 9, 2023
6974742
Thumnail generatormodule
Oct 26, 2023
051d04a
added ifdef condition in thumbnaillistgenerator
venkat0907 Oct 26, 2023
8b53e56
Reverse play ApraPipes(zaki)
Oct 26, 2023
e1a7502
H264DecoderNvCodecHelper changes
venkat0907 Oct 27, 2023
f35abe9
aprapipes sprint 6 changes
mohammedzakikochargi Nov 7, 2023
90e549d
temp commit
Vinayak-YB Jan 5, 2024
19efcd0
GTLGL working perfectly *
Vinayak-YB Jan 30, 2024
356fd12
Reverse play fixes and gtkgl cleanup
Vinayak-YB Feb 12, 2024
05bd236
Resolved plyback jitteriness issue
Feb 13, 2024
d49127c
increased decoder buffered frames limit
Feb 13, 2024
e87b541
Resolved decoder race conditions
Feb 14, 2024
ae9284f
mmq fps issue fix
Feb 19, 2024
648a734
Updated CMake to link with brotli
yashrajsapra Apr 15, 2024
38edbb9
FIxed build issue
yashrajsapra Apr 15, 2024
d54b7c8
Enabled some cuda test
yashrajsapra Apr 15, 2024
b1b5155
Refactoring AbsControlModule
Apr 16, 2024
bc4c4d5
Obsolete commands removed
Apr 17, 2024
4c89075
Imageviewer Module Reset
Apr 17, 2024
3bba389
Updaed CMake to Use System encoder lib
yashrajsapra Apr 17, 2024
5b32946
Merge branch 'ApraNVR_CommonBuild' of https://github.com/Apra-Labs/Ap…
yashrajsapra Apr 17, 2024
cfc2c93
Added a missing return in a function
mohammedzakikochargi Apr 17, 2024
8b5b35f
Updated GtkGlRenderer module to support RGB Frame
yashrajsapra Apr 23, 2024
94e8fa8
Fixed GTKGLRenderer IIssue
yashrajsapra Apr 24, 2024
e40a08e
Update VCPKG to master branch (#346)
joiskash Apr 25, 2024
397489c
-> Remove hardcoded path from test
yashrajsapra Apr 25, 2024
60191a3
merged branch 'main' into ApraNVR_CommonBuild
mraduldubey May 17, 2024
53531ac
vcpkg submodule updated
mraduldubey May 17, 2024
c3a9956
updated baseline
mraduldubey May 17, 2024
3f78f9b
easy pickings round 1 pr changes
mraduldubey May 20, 2024
10b62a9
added source links
mraduldubey May 20, 2024
ba02a6e
control modules can connect over multiple pipelines, get module retur…
mraduldubey May 20, 2024
0c5932e
cant repeat roles in same pipeline
mraduldubey May 20, 2024
02c1eea
added error code for enrollment failure
mraduldubey May 20, 2024
7e1e99a
minor refactor
mraduldubey May 20, 2024
98a7b7c
added stdafx again
mraduldubey May 20, 2024
2f32bfe
typo fix
mraduldubey May 20, 2024
6a72d9e
disable clang for now. not configured properly
mraduldubey May 21, 2024
bd2a262
1. Stubbed control module methods using virtual methods 2. cleanup
mraduldubey May 21, 2024
06c60f1
1. stubbed the control module mp4 missing videotrack commands
mraduldubey May 21, 2024
7f22140
Remove pwd. minor changes in CMake, add !windwos for gtk3
joiskash May 21, 2024
fc3549d
Revert windows option on
joiskash May 21, 2024
0e007a0
added a todo for future - update fps only in parseFS mode on new vide…
mraduldubey May 22, 2024
56933c9
added test data
mraduldubey May 22, 2024
efb6592
Revert "added test data"
mraduldubey May 22, 2024
a2609e3
added files via git lfs
mraduldubey May 22, 2024
adad6c9
writer bug
mraduldubey May 22, 2024
288f945
disabling mmq tests - module will need a review and tests, an update
mraduldubey May 22, 2024
7d797bb
uncommented tests
mraduldubey May 23, 2024
617441a
removed fpermissive flag
mraduldubey May 24, 2024
217663a
linux fixes
kjois May 28, 2024
c4de65a
add export gcc-13 in arm64 boostrap step
kjois May 28, 2024
ceec1e4
Add missing imports and installation of system libraries
joiskash May 29, 2024
29e23b4
Add freeflut for glut.h
kjois May 29, 2024
508a304
Add install steps for vcpkg port
joiskash May 29, 2024
560b955
Add if def arm
joiskash May 29, 2024
86d235f
Merge branch 'ApraNVR_CommonBuild' of https://github.com/Apra-Labs/Ap…
joiskash May 29, 2024
e36c1c6
Updated Dependencies for linux build
yashrajsapra May 29, 2024
919bfc7
Updated Build Dependencies
yashrajsapra May 30, 2024
fe6bd9d
-> Removed gtkglrenderer_tests from source
yashrajsapra May 30, 2024
55dbcb9
Add gcc 13 export command
joiskash May 30, 2024
a37234b
Merge branch 'ApraNVR_CommonBuild' of https://github.com/Apra-Labs/Ap…
joiskash May 30, 2024
7877803
clean up CMakelists.txt and resolve unknown exception in H264Encoder
kushaljain-apra May 30, 2024
e4b4221
increase encoder buffers in h264encodernvcodec
kushaljain-apra May 30, 2024
ba9a611
move MemTypeConversion header in ARM if def
kushaljain-apra May 31, 2024
b2c9129
move ResizeNPPI and header in ARM if def
kushaljain-apra May 31, 2024
261602c
update scripts to install jinja2 using apt-get
kushaljain-apra May 31, 2024
e21076a
add ARM if def for tests using h264decoder
kushaljain-apra May 31, 2024
01f31ff
Update build-test-lin.yml
kushaljain-apra May 31, 2024
ef422be
update cloud script to remove gcc-13 path after vcpkg bootstrap
kushaljain-apra May 31, 2024
db6c950
remove setting PATH for gcc-13
kushaljain-apra May 31, 2024
c2bca33
update gcc path for gcc-11 supported by opencv
kushaljain-apra Jun 3, 2024
28c2215
Merged ApraNVR
Jun 5, 2024
2947998
Removed flush logiv from decoder and fixed a syntax in mmq
mohammedzakikochargi Jun 5, 2024
583bc8b
Updated libmp4 port
mohammedzakikochargi Jun 5, 2024
241ef14
CMakeList commented code fixed
Vinayak-YB Jun 5, 2024
2d2ec94
CmakeList vcpkg env variable refactor
Vinayak-YB Jun 6, 2024
4842e5b
uncomment aprapipesut executable in CMakeLists
kushaljain-apra Jun 6, 2024
e188527
Adding cudnn as a vcpkg overlay port
Vinayak-YB Jun 11, 2024
925e266
CMakelist change to use cudnn from custom overlay port
Vinayak-YB Jun 11, 2024
db23ee7
resolved mereg conflicts and resolved queuecommand issues
mohammedzakikochargi Jun 14, 2024
7dc1a7e
removed comments
mohammedzakikochargi Jun 14, 2024
e914732
Resolved gtk link issues on arm64
mohammedzakikochargi Jun 24, 2024
77df71e
changed gcc version to 8 for arm github build script
mohammedzakikochargi Jun 25, 2024
13053ca
Resolved issues in Mp4Reader regarding the gop changes being in abstr…
mohammedzakikochargi Jun 26, 2024
385e604
changed linux cuda gcc version to 8
mohammedzakikochargi Jun 26, 2024
c81596c
Updated the gitgub worflow file of arm64
mohammedzakikochargi Jun 26, 2024
c507abb
changed build dir name for lin
mohammedzakikochargi Jun 26, 2024
0d2e3c4
Updated the cmakelists and workflow file
mohammedzakikochargi Jun 27, 2024
b558e07
updated cmakelists to include glibconfig.h
mohammedzakikochargi Jun 27, 2024
114285a
added pkg config path as env in the cmakelist
Jun 28, 2024
5eebdf4
Added pkg config path as env only for arm64
Jun 28, 2024
a2d9cb7
Added missing return statements
mohammedzakikochargi Jun 28, 2024
1f713f9
disabled H264 nvcodec tests failing on linux
Jun 28, 2024
0971182
Merge branch 'ApraNVR_CommonBuild' of https://github.com/Apra-Labs/Ap…
Jun 28, 2024
fd4ace6
Updated the encoder test assert
mohammedzakikochargi Jul 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 0 additions & 137 deletions .clang-format

This file was deleted.

2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
data/mp4Reader_saveOrCompare/jpeg/*.jpg filter=lfs diff=lfs merge=lfs -text
data/mp4Reader_saveOrCompare/h264/*.h264 filter=lfs diff=lfs merge=lfs -text
3 changes: 2 additions & 1 deletion .github/workflows/CI-Linux-ARM64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
is-selfhosted: true
cuda: 'ON'
prep-cmd: 'echo skipping builder prep as I can not sudo'
bootstrap-cmd: 'export PATH="$HOME/.local/bin/gcc-8:$PATH" && export VCPKG_FORCE_SYSTEM_BINARIES=1 && ./vcpkg/bootstrap-vcpkg.sh'
cache-path: './none'
cmake-conf-cmd: 'export VCPKG_FORCE_SYSTEM_BINARIES=1 && export VCPKG_OVERLAY_PORTS=../thirdparty/custom-overlay && cmake -B . -DENABLE_ARM64=ON ../base'
cmake-conf-cmd: 'export VCPKG_OVERLAY_PORTS=../thirdparty/custom-overlay && cmake -B . -DENABLE_ARM64=ON ../base'
nProc: 6
jetson-publish:
needs: jetson-build-test
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/CI-Linux-CUDA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
is-selfhosted: true
cuda: 'ON'
prep-cmd: 'echo skipping builder prep as I can not sudo'
bootstrap-cmd: 'export PATH="/usr/bin/gcc-8:$PATH" && ./vcpkg/bootstrap-vcpkg.sh'
cache-path: './none'
nProc: 6
linux-cuda-publish:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-lin-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
prep-cmd:
type: string
description: 'commands required to be run on a builder to prep it for build'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev && pip3 install meson'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev python3-jinja2 && pip3 install meson'
required: false
prep-check-cmd:
type: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-lin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
prep-cmd:
type: string
description: 'commands required to be run on a builder to prep it for build'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxdamage-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev && pip3 install meson'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxdamage-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev python3-jinja2 && pip3 install meson && pip3 install Jinja2'
required: false
prep-check-cmd:
type: string
Expand Down
Loading
Loading