Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
44d7828
Add resolution configuration
camsim99 Apr 22, 2023
6281eb5
dart side of impl
bparrishMines Apr 26, 2023
9a74cd1
java impls
bparrishMines Apr 26, 2023
03ef376
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 May 15, 2023
2a5c0fc
Fix implementation
camsim99 May 15, 2023
9001ab0
Small cleanup
camsim99 May 15, 2023
fd19de6
Fixing tests and cleanup minus plugin dart impl test
camsim99 May 17, 2023
c9b62ef
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 Jul 18, 2023
725be10
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 Jul 18, 2023
6389ae1
Work on Dart side -- tests, cleanup, bug id
camsim99 Jul 18, 2023
16770de
Fix java unit tests
camsim99 Jul 18, 2023
a8144fa
Fix typo
camsim99 Jul 18, 2023
aba4c34
Fix dart tests
camsim99 Jul 19, 2023
ca5604a
Add integration tests
camsim99 Jul 20, 2023
474745c
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 Aug 16, 2023
b778894
Add res support
camsim99 Aug 16, 2023
8d2cb3a
correct overrides
camsim99 Aug 16, 2023
a145afe
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 Aug 16, 2023
fd3ade2
Self review
camsim99 Aug 16, 2023
1dc6fbd
formatting
camsim99 Aug 16, 2023
fad7cbc
Undo strange change
camsim99 Aug 16, 2023
08edc4c
Fix dart unit tests
camsim99 Aug 16, 2023
1def519
Fix integration test
camsim99 Aug 17, 2023
5bab620
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 Aug 17, 2023
caf819e
Nits
camsim99 Aug 17, 2023
c775756
Update readme
camsim99 Aug 17, 2023
fabaab7
Update packages/camera/camera_android_camerax/lib/src/android_camera_…
camsim99 Aug 22, 2023
810cb54
Update packages/camera/camera_android_camerax/lib/src/android_camera_…
camsim99 Aug 22, 2023
60a47ed
Update packages/camera/camera_android_camerax/lib/src/android_camera_…
camsim99 Aug 22, 2023
474d84c
Update packages/camera/camera_android_camerax/lib/src/android_camera_…
camsim99 Aug 22, 2023
6f45ecb
Add comments to integration tests
camsim99 Aug 22, 2023
5c31de4
Merge branch 'camx_resconfig' of github.com:camsim99/packages into ca…
camsim99 Aug 22, 2023
e4134bd
Updated integration test comment
camsim99 Aug 23, 2023
bb35a61
start quality re-write
camsim99 Aug 29, 2023
5ac1c7c
Replace vid qual const with quality/qualitydata
camsim99 Aug 29, 2023
860b4db
Replace Quality indices with VideoQuality/VideoQualityData class
camsim99 Aug 29, 2023
5ea328e
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 Aug 29, 2023
a163f0e
Fix versionining
camsim99 Aug 29, 2023
2a9671e
Format
camsim99 Aug 29, 2023
0178493
run tests
camsim99 Aug 29, 2023
ff9bd3a
nits
camsim99 Sep 7, 2023
396091c
Merge remote-tracking branch 'upstream/main' into camx_resconfig
camsim99 Sep 7, 2023
206fbb6
Fix changelog
camsim99 Sep 7, 2023
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 integration test
  • Loading branch information
camsim99 committed Aug 17, 2023
commit 1def51944672c9ae5824e012fb9d29e27ff0318d
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public static class QualitySelectorProxy {
@Nullable FallbackStrategy fallbackStrategy) {
// Convert each index of VideoQualityConstraint to Quality.
List<Quality> qualityList = new ArrayList<Quality>();
for (Long qualityIndex : videoQualityConstraintIndexList) {
for (int i = 0; i < videoQualityConstraintIndexList.size(); i++) {
int qualityIndex = ((Number) videoQualityConstraintIndexList.get(i)).intValue();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a fix for Long -> Integer casting issues that the integration test revealed.

Copy link
Member

Choose a reason for hiding this comment

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

What was the issue? Its not clear to me why the previous code would fail - it looks like the logical change here is to go from: calling intValue() on the Long, to: casting to a Number and then using the intValue() implementation for Number instead.

But I would expect either of those to work, and if they both did, would prefer the former. Does this only work with the cast to Number added in?

Copy link
Contributor Author

@camsim99 camsim99 Aug 22, 2023

Choose a reason for hiding this comment

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

Using your former suggestion, this is an example of the error I got: https://firebase.corp.google.com/project/flutter-infra-staging/testlab/histories/bh.90e767c88242d274/matrices/6437969997948729501/executions/bs.a725e88a067fbf4d/testcases/2/test-cases.

I'm open to suggestions, but I could not find a fix and after investigating, it's unclear why I'm getting the error and only in the Firebase test lab like that. May be something with Java versions but unsure.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Turns out this is an issue because I was trying to index an array with a Long, most likely. After talking to @reidbaker, I'm going to take his suggestion and rework how I send aQuality from Dart to Java rather than trying to send indices of enums that represent Qualitys.

qualityList.add(getQualityConstant(qualityIndex));
}

Expand All @@ -59,8 +60,8 @@ public static class QualitySelectorProxy {
}

/** Converts from index of {@link VideoQualityConstraint} to {@link Quality}. */
private Quality getQualityConstant(@NonNull Long qualityIndex) {
VideoQualityConstraint quality = VideoQualityConstraint.values()[qualityIndex.intValue()];
private Quality getQualityConstant(@NonNull int qualityIndex) {
VideoQualityConstraint quality = VideoQualityConstraint.values()[qualityIndex];
return getQualityFromVideoQualityConstraint(quality);
}
}
Expand Down