Skip to content

[video_player_avfoundation, camera_avfoundation] never overwrite but only upgrade audio session category #7143

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

Merged
auto-submit merged 22 commits into from
Jan 13, 2025
Merged

[video_player_avfoundation, camera_avfoundation] never overwrite but only upgrade audio session category #7143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
787f41c
never overwrite but only upgrade audio session category
misos1 Jul 16, 2024
ef43db2
Merge branch 'main' into upgrade_audio_session
misos1 Jul 17, 2024
94a80df
add more options implicitly present with Playback
misos1 Jul 23, 2024
f637396
fix format
misos1 Jul 23, 2024
86922ac
remove HFP and fix using audio session outside of critical section
misos1 Jul 24, 2024
6746391
fix format
misos1 Jul 24, 2024
42bd00a
remove dispatch_sync from upgradeAudioSessionCategory
misos1 Aug 15, 2024
fde86f6
Merge branch 'main' into upgrade_audio_session
misos1 Aug 15, 2024
2f876dd
test for main thread because tests are running it on that
misos1 Aug 20, 2024
4ddc291
remove nil check and rename variables and arguments
misos1 Sep 6, 2024
81a9449
fix format
misos1 Sep 6, 2024
4dd42c1
move upgradeAudioSessionCategory above call
misos1 Sep 19, 2024
e02355c
update comments
misos1 Oct 15, 2024
6569354
Merge branch 'main' into upgrade_audio_session
misos1 Oct 15, 2024
1086400
change comments
misos1 Nov 28, 2024
9edbeef
Merge branch 'main' into upgrade_audio_session
misos1 Nov 28, 2024
6216653
fix format
misos1 Nov 28, 2024
59a7fab
Merge branch 'main' into upgrade_audio_session
misos1 Dec 11, 2024
8f013b6
Merge branch 'main' into upgrade_audio_session
misos1 Dec 11, 2024
acaad4c
Minor grammar fix
stuartmorgan-g Jan 13, 2025
3d4e638
Re-bump camera version
stuartmorgan-g Jan 13, 2025
948937e
Merge branch 'main' into upgrade_audio_session
stuartmorgan-g Jan 13, 2025
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
Prev Previous commit
Next Next commit
fix format
  • Loading branch information
@misos1
misos1 committed Sep 6, 2024
commit 81a9449d893dc055c1e0fa4e7eca7fdf272294d6
3 changes: 2 additions & 1 deletion ...s/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCam.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,8 @@ static void upgradeAudioSessionCategory(AVAudioSessionCategory requestedCategory
setWithObjects:AVAudioSessionCategoryPlayback, AVAudioSessionCategoryPlayAndRecord, nil];
NSSet *recordCategories =
[NSSet setWithObjects:AVAudioSessionCategoryRecord, AVAudioSessionCategoryPlayAndRecord, nil];
NSSet *requiredCategories = [NSSet setWithObjects:requestedCategory, AVAudioSession.sharedInstance.category, nil];
NSSet *requiredCategories =
[NSSet setWithObjects:requestedCategory, AVAudioSession.sharedInstance.category, nil];
BOOL needPlay = [requiredCategories intersectsSet:playCategories];
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Oct 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: requiresPlay, requiresRecord (rather than introduce a second term that means the same thing within the same method).

BOOL needRecord = [requiredCategories intersectsSet:recordCategories];
if (needPlay && needRecord) {
Expand Down
9 changes: 6 additions & 3 deletions ...darwin/video_player_avfoundation/Sources/video_player_avfoundation/FVPVideoPlayerPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,8 @@ static void upgradeAudioSessionCategory(AVAudioSessionCategory requestedCategory
setWithObjects:AVAudioSessionCategoryPlayback, AVAudioSessionCategoryPlayAndRecord, nil];
NSSet *recordCategories =
[NSSet setWithObjects:AVAudioSessionCategoryRecord, AVAudioSessionCategoryPlayAndRecord, nil];
NSSet *requiredCategories = [NSSet setWithObjects:requestedCategory, AVAudioSession.sharedInstance.category, nil];
NSSet *requiredCategories =
[NSSet setWithObjects:requestedCategory, AVAudioSession.sharedInstance.category, nil];
BOOL needPlay = [requiredCategories intersectsSet:playCategories];
BOOL needRecord = [requiredCategories intersectsSet:recordCategories];
if (needPlay && needRecord) {
Expand All @@ -854,9 +855,11 @@ - (void)setMixWithOthers:(BOOL)mixWithOthers
// AVAudioSession doesn't exist on macOS, and audio always mixes, so just no-op.
#else
if (mixWithOthers) {
upgradeAudioSessionCategory(AVAudioSession.sharedInstance.category, AVAudioSessionCategoryOptionMixWithOthers, 0);
upgradeAudioSessionCategory(AVAudioSession.sharedInstance.category,
AVAudioSessionCategoryOptionMixWithOthers, 0);
} else {
upgradeAudioSessionCategory(AVAudioSession.sharedInstance.category, 0, AVAudioSessionCategoryOptionMixWithOthers);
upgradeAudioSessionCategory(AVAudioSession.sharedInstance.category, 0,
AVAudioSessionCategoryOptionMixWithOthers);
}
#endif
}
Expand Down