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.

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

Added audio levels, git ignore, and project example file #1

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open

Added audio levels, git ignore, and project example file #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
d0c1c21
moved project example
obviousjim Jul 10, 2013
48e74cc
added volume control
obviousjim Jul 10, 2013
7adcbd7
added git ignore
obviousjim Jul 10, 2013
78cd5e3
should play method
obviousjim Jul 16, 2013
4c52633
scrub to time for pre rolling on load
obviousjim Jul 22, 2013
96bff2e
set position in seconds
obviousjim Jul 22, 2013
f1bcb72
no longer loop
obviousjim Jul 24, 2013
2900d72
First attempt at audio metering.
prisonerjohn Jul 24, 2013
b4febaa
Now it works.
prisonerjohn Jul 25, 2013
d9f9531
Added an audioReady flag.
prisonerjohn Jul 25, 2013
b198954
Fixed bug calculating the volume range.
prisonerjohn Jul 26, 2013
ec2693e
Fixed var naming.
prisonerjohn Jul 26, 2013
5539666
Updated the data structure used to store audio.
prisonerjohn Jul 26, 2013
5d4daa8
Merge pull request #1 from prisonerjohn/feature-audio-metering
obviousjim Jul 26, 2013
76b55aa
Added getNumAmplitudes() method.
prisonerjohn Jul 27, 2013
3dc99cb
Added FFT analysis to example.
prisonerjohn Jul 27, 2013
2940478
fixed crash on exit
obviousjim Jul 27, 2013
78f5583
Merge branch 'master' of github.com:obviousjim/ofxAVFVideoPlayer
obviousjim Jul 27, 2013
0d6b70e
Making sure the pos is between 0 and 1.
prisonerjohn Jul 27, 2013
9dbeab3
Merge remote-tracking branch 'elie/feature-audio-metering'
obviousjim Jul 27, 2013
f44e180
Quick fixes for audio amplitude buffer to handle 16 bit stereo values…
kitschpatrol Jul 29, 2013
16ba78b
Merge pull request #3 from kitschpatrol/master
obviousjim Jul 29, 2013
7b216ee
Making sure file has audio before trying to read from the audio buffer.
prisonerjohn Aug 8, 2013
2b70112
Removed smoothing function cause that just makes no sense over here.
prisonerjohn Aug 8, 2013
a425320
Added a method to check if the audio is fully loaded.
prisonerjohn Aug 8, 2013
b2adc9a
Switched back to using floats. But this time our asset reader makes s…
prisonerjohn Aug 8, 2013
42dd5e8
Added a fun example showing how to access all the audio data.
prisonerjohn Aug 8, 2013
4490cc8
Merge pull request #4 from prisonerjohn/feature-audio-metering
obviousjim Aug 10, 2013
0ad9387
catch video files with no audio
obviousjim Sep 9, 2013
f7666df
Merge branch 'master' of github.com:obviousjim/ofxAVFVideoPlayer
obviousjim Sep 9, 2013
4f93504
fixed crash on 10.7 targets
obviousjim Sep 15, 2013
6219ca5
default return values
obviousjim Sep 20, 2013
451d119
return typo
obviousjim Sep 21, 2013
d8bdccb
isPlaying
obviousjim Oct 18, 2013
91658df
Stripped out all the extra stuff from the basic example.
prisonerjohn Nov 23, 2013
60c2853
Added call to close movie in the destructor.
prisonerjohn Nov 23, 2013
04951bb
Got some video out using CVPixelBuffer!
prisonerjohn Nov 23, 2013
606e913
Refactored everything.
prisonerjohn Nov 24, 2013
7b424ae
Added tests to sample app.
prisonerjohn Nov 24, 2013
0de7f33
Re-enabled audio metering.
prisonerjohn Nov 24, 2013
5a10c8c
Added back the old school way to render a frame (drawing in an FBO).
prisonerjohn Nov 24, 2013
3c88bfe
Added looping (no palindrome yet).
prisonerjohn Nov 24, 2013
b775a1b
Boom, streaming!
prisonerjohn Nov 24, 2013
0704570
Added pixel format setter. Looks like it works, but not 100%…
prisonerjohn Nov 24, 2013
12c55a9
Cleaned up.
prisonerjohn Nov 24, 2013
51d51a0
Added volume control.
prisonerjohn Nov 24, 2013
f7e5270
playing with the example, texture draw guard and project rename
obviousjim Nov 24, 2013
ad77d6d
Added get/setPositionInSeconds() methods for CLOUDS compatibility.
prisonerjohn Nov 25, 2013
7cf930a
Fixed getting current playhead time in old school method.
prisonerjohn Nov 25, 2013
25c3c75
Merge branch 'cvbuffermagic' of github.com:obviousjim/ofxAVFVideoPlay…
prisonerjohn Nov 25, 2013
b866b93
Replaced preprocessor macro by a flag to determine which render metho…
prisonerjohn Nov 25, 2013
3c334a3
Deallocation fixes.
prisonerjohn Nov 25, 2013
99233d4
auto release and memory fixes
obviousjim Nov 26, 2013
5ca7c08
Got rid of unused deallocWhenLoaded flag.
prisonerjohn Nov 28, 2013
156ad54
Moved private properties to the .m file.
prisonerjohn Nov 28, 2013
79f58c7
Cleaned up.
prisonerjohn Nov 28, 2013
f7d3189
Cleaned up last bit.
prisonerjohn Nov 28, 2013
8abaa04
set bMovieDone flag to false when looping is enabled and video is fin…
samatt Dec 27, 2013
097dc40
comment
samatt Dec 27, 2013
0580cb7
Reset _bMovieDone to NO when the method stop() is called.
smallfly Jan 24, 2014
3700e1f
Merge pull request #6 from morethanlogic/hotfix/reset_bMovieDone
prisonerjohn Jan 27, 2014
ef5b3e7
fixing memory leak in audio-reading block
Feb 20, 2015
9e4a110
using finalize to fix memory leak if movie was never played (with aud…
Feb 20, 2015
b0b67dc
updating examples
i-n-g-o Feb 20, 2015
ab38763
fixing indentations, removing debug logs
i-n-g-o Mar 15, 2015
d2d6dba
Merge pull request #7 from i-n-g-o/memory_fixes
prisonerjohn Mar 15, 2015
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
58 changes: 58 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
*.mode*
*.pbxuser
build/
obj/
*.o
openFrameworks.a
openFrameworksDebug.a
openFrameworksUniversal.a
*.app/

CustomAdddons/

#rule to avoid non-official addons going into git
#see addons/.gitignore

#codeblocks files
apps/*/*/*.layout
apps/*/*/*.depend
apps/*/*/bin/clickToLaunch*
apps/*/*/bin/libs
apps/*/*/obj

#rule to avoid non-official apps going into git
#see apps/.gitignore
apps

#codeblocks OF lib files
libs/openFrameworksCompiled/project/*/*.depend
libs/openFrameworksCompiled/project/*/*.layout

#linux temporary files
*~

#eclipse build folders
#Mac OS X
addons/Debug Mac OS X
addons/Release Mac OS X
libs/openFrameworks/Debug Mac OS X
libs/openFrameworks/Release Mac OS X
apps/*/*/Debug Mac OS X
apps/*/*/Release Mac OS X
.DS_Store
*.perspectivev3
xcuserdata/


#Linux
addons/Debug Linux
addons/Release Linux
libs/openFrameworks/Debug Linux
libs/openFrameworks/Release Linux
apps/*/*/Debug Linux
apps/*/*/Release Linux
apps/*/*/Debug Linux64
apps/*/*/Release Linux64



9 changes: 9 additions & 0 deletions example-audioData/Project.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT.
//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
OF_PATH = ../../..

//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"

OTHER_LDFLAGS = $(OF_CORE_LIBS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
Binary file added example-audioData/bin/data/cat.mp4
View file
Open in desktop
Binary file not shown.
614 changes: 614 additions & 0 deletions example-audioData/emptyExample.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions example-audioData/emptyExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 84 additions & 0 deletions example-audioData/emptyExample.xcodeproj/xcshareddata/xcschemes/emptyExample Debug.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Debug"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
84 changes: 84 additions & 0 deletions ...ple-audioData/emptyExample.xcodeproj/xcshareddata/xcschemes/emptyExample Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Release">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "emptyExample.app"
BlueprintName = "emptyExample"
ReferencedContainer = "container:emptyExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
20 changes: 20 additions & 0 deletions example-audioData/openFrameworks-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.openFrameworks</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
</dict>
</plist>
Loading