Skip to content

Commit

Permalink
PR with multiple changes and improvements grouped together (#343)
Browse files Browse the repository at this point in the history
* NVR initial commit

* Removed NVRControl Module, moving to apranvr

* Adding Pipeline.cpp changes

* sprint-3 changes

* typo change in rtsp

* Play/pause and golive working checkpoint

* Sprint-4 changes for ApraPipes

* Thumnail generatormodule

* added ifdef condition in thumbnaillistgenerator

* Reverse play ApraPipes(zaki)

* H264DecoderNvCodecHelper changes

* aprapipes sprint 6 changes

* temp commit

* GTLGL working perfectly *

* Reverse play fixes and gtkgl cleanup

* Resolved plyback jitteriness issue

* increased decoder buffered frames limit

* Resolved decoder race conditions

* mmq fps issue fix

* Updated CMake to link with brotli

* FIxed build issue
Added GtkGlRenderer module

* Enabled some cuda test

* Refactoring AbsControlModule

* Obsolete commands removed

* Imageviewer Module Reset

* Updaed CMake to Use System encoder lib

* Added a missing return in a function

* Updated GtkGlRenderer module to support RGB Frame

* Fixed GTKGLRenderer IIssue

* Update VCPKG to master branch  (#346)

* update submodule

* Update vcpkg and move gtk, glew to vcpkg dependecies

* fixed build issue

---------

Co-authored-by: kashhash <[email protected]>
Co-authored-by: Yashraj <[email protected]>

* -> Remove hardcoded path from test
-> Removed Duplicate code

* vcpkg submodule updated

* updated baseline

* easy pickings round 1 pr changes

* added source links

* control modules can connect over multiple pipelines, get module returns bool & sp

* cant repeat roles in same pipeline

* added error code for enrollment failure

* minor refactor

* added stdafx again

* typo fix

* disable clang for now. not configured properly

* 1. Stubbed control module methods using virtual methods 2. cleanup

* 1. stubbed the control module mp4 missing videotrack commands
2. update fps for every new video

* Remove pwd. minor changes in CMake, add !windwos for gtk3

* Revert windows option on

* added a todo for future - update fps only in parseFS mode on new video open

* added test data

* Revert "added test data"

This reverts commit 56933c9.

* added files via git lfs

* writer bug

* disabling mmq tests - module will need a review and tests, an update

* uncommented tests

* removed fpermissive flag

* linux fixes

* add export gcc-13 in arm64 boostrap step

* Add missing imports and installation of system libraries

* Add freeflut for glut.h

* Add install steps for vcpkg port

* Add if def arm

* Updated Dependencies for linux build

* Updated Build Dependencies

* -> Removed gtkglrenderer_tests from source
->  Removed Warning
-> Removed  Redundant Logs

* Add gcc 13 export command

* clean up CMakelists.txt and resolve unknown exception in H264Encoder

* increase encoder buffers in h264encodernvcodec

* move MemTypeConversion header in ARM if def

* move ResizeNPPI and  header in ARM if def

* update scripts to install jinja2 using apt-get

* add ARM if def for tests using h264decoder

* Update build-test-lin.yml

* update cloud script to remove gcc-13 path after vcpkg bootstrap

* remove setting PATH for gcc-13

* update gcc path for gcc-11 supported by opencv

* Merged ApraNVR

* Removed flush logiv from decoder and fixed a syntax in mmq

* Updated libmp4 port

* CMakeList commented code fixed

* CmakeList  vcpkg env variable refactor

* uncomment aprapipesut executable in CMakeLists

* Adding cudnn as a vcpkg overlay port

* CMakelist change to use cudnn from custom overlay port

* resolved mereg conflicts and resolved queuecommand issues

* removed comments

* Resolved gtk link issues on arm64

* changed gcc version to 8 for arm github build script

* Resolved issues in Mp4Reader regarding the gop changes being in abstract class

* changed linux cuda gcc version to 8

* Updated the gitgub worflow file of arm64

* changed build dir name for lin

* Updated the cmakelists and workflow file

* updated cmakelists to include glibconfig.h

* added pkg config path as env in the cmakelist

* Added pkg config path as env only for arm64

* Added missing return statements

* disabled H264 nvcodec tests failing on linux

* Updated the encoder test assert

---------

Co-authored-by: Vinayak-YB <[email protected]>
Co-authored-by: Venkat <[email protected]>
Co-authored-by: venkat0907 <[email protected]>
Co-authored-by: Vinayak-YB <[email protected]>
Co-authored-by: Vinayak-YB <[email protected]>
Co-authored-by: Yashraj <[email protected]>
Co-authored-by: kashhash <[email protected]>
Co-authored-by: mradul <[email protected]>
Co-authored-by: Kushal Jain <[email protected]>
Co-authored-by: Kushal Jain <[email protected]>
Co-authored-by: Ankush Jain <[email protected]>
  • Loading branch information
12 people authored Jul 2, 2024
1 parent 221719b commit 53157e2
Show file tree
Hide file tree
Showing 127 changed files with 5,176 additions and 807 deletions.
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

0 comments on commit 53157e2

Please sign in to comment.