Skip to content

NF: Improved streaming media support #5551

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 61 commits into from
Jun 5, 2023
Merged

NF: Improved streaming media support #5551

merged 61 commits into from
Jun 5, 2023

Conversation

@mdcutone
Copy link
Member

@mdcutone mdcutone commented Apr 26, 2023 •
edited
Loading

This PR contains changes which improve working with streaming media sources (movies, cameras, etc.) with most work refactoring camera support to make it pluggable to support multiple backends.

  • Improved movie file writer with asynchronous disk writes
  • More reliable handling of camera streams
  • Cleaner shutdown for threads used for disk and device I/O
  • FFMPEG and OpenCV camera backends

mdcutone and others added 30 commits April 25, 2023 13:07
@mdcutone
NF: movietools and MovieFileWriter class
0087d4c
@mdcutone
NF: Added pixel formats and numpy array support
6f4a82c
@mdcutone
Merge remote-tracking branch 'upstream/dev' into dev-enh-pluggable-ca…
8df47ea 
…meras
@mdcutone
FF: Removed debug print statement
64cd14e
@mdcutone
ENH: Improved shutdown code
cbf6d1b
@mdcutone
NF: Added addAudioToMovie function with threading
e97191a
@mdcutone
NF: Added atexit handler
e1988fa
@mdcutone
NF: Camera interface classes for plugins
96999e0
@mdcutone
Merge remote-tracking branch 'upstream/dev' into dev-enh-pluggable-ca…
1b61585 
…meras
@mdcutone
NF: Added thread sync barrier for writer
f5ac1e8
@mdcutone
RF: modularized and reworked threading for camera capture
1ec6d4e
@mdcutone
RF: Removed obsolete classes
c52b184
@mdcutone
RF: Moved _movieWriter init
9c7403a
@mdcutone
NF: Added stream enable for recording
cb6ad45
@mdcutone
NF: Added bytesOut to track file size
95db044
@mdcutone
ENH: File saving without a temp dir
1e72eb5
@mdcutone
FF: Audio sync issues
5dce31e
@mdcutone
FF: updated codec
261b080
@mdcutone
FF: Updated demo
ec914bf
@mdcutone
FF: Audio sync with thread barrier
fca07b6
@mdcutone
FF: Codec spec
1c417f1
@mdcutone
NF: OpenCV camera information and code cleanup
97805a2
@mdcutone
NF: OpenCV and feature parity with old camera
12b530f
@mdcutone
Merge remote-tracking branch 'upstream/dev' into dev-enh-pluggable-ca…
1335960 
…meras
@TEParsons
ENH: Allow allowedVals and allowedLabels in Params to be a functi…
940859b 
…on partial, whose value is retrieved on checkDepends
@TEParsons
ENH: Add params for resolution and frame rate to Camera
c99a4bc
@mdcutone
NF: Added additional properties
37211b8
@mdcutone
DOCS: Added movietools documentation
94e6199
@mdcutone
RF: Removed thread locks, some cleanup
2d65f3f
@mdcutone
RF: Hash absolute path to file
6e5f65e
@mdcutone mdcutone requested a review from TEParsons May 30, 2023 23:36
@mdcutone mdcutone marked this pull request as ready for review May 30, 2023 23:36
TEParsons and others added 12 commits May 31, 2023 12:21
@TEParsons
ENH: Sort frame rates and resolutions in Camera component
37a079c
@TEParsons
FF: Use specified cameraLib when getting cameras from Builder
1bc10a0
@mdcutone
RF: Cleaned up imports
072bb5f
@TEParsons
FF: Only show dynamic controls for ffpyplayer, opencv needs open entry
53e23c0
@TEParsons
Merge remote-tracking branch 'mdcutone/dev-enh-pluggable-cameras' int…
45cad77 
…o dev-pluggable-cameras

# Conflicts:
#	psychopy/hardware/camera/__init__.py
@TEParsons
ENH: Only show frameRates which match the current resolution
130e837
@mdcutone
Merge pull request #10 from TEParsons/dev-pluggable-cameras
64dd28f 
RF: Updates to Camera component UI
@mdcutone
FF: Fixed camera init from Builder
a5b61b9
@mdcutone
FF: some camera fixes for builder
45eb32a
@mdcutone
DOCS: better docs for description
ba3446c
FF: Fixe missing attr and file saving
a0315bb
FF: Fixed viewfinder via ImageStim
7bbb950
@mdcutone
Copy link
Member Author

mdcutone commented Jun 1, 2023

Fixed issues in builder, got the viewfinder feature also tested out and working. You'll need to have a valid frameSize entered at the beginning when using the OpenCV video streaming backend or the viewfinder texture will not initialize. We don't get a valid 'default' frameSize/frameRate until after open() is called and the interface is queried.

TEParsons and others added 10 commits June 2, 2023 13:38
@mdcutone mdcutone merged commit c36a897 into psychopy:dev Jun 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TEParsons TEParsons Awaiting requested review from TEParsons

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mdcutone @TEParsons