Fix Sony regression by removing ptp_is_vendor_extension_prop #1044
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@axxel fyi |
|
I did a different fix, moved the Sony code before the above check, kept the EOS one below it. Please verify it works. |
|
EDIT: only now did I see that @msmeissn already did something to the same effect as the below patch. Thanks for bringing this to my attention and sorry for the inconvencience. @knro can you check if the following patch fixes the issue for you? diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index e96603409..01ba8a4b4 100644
--- a/camlibs/ptp2/ptp.c
+++ b/camlibs/ptp2/ptp.c
@@ -4616,10 +4616,8 @@ ptp_generic_getdevicepropdesc (PTPParams *params, uint32_t propcode, PTPDevicePr
ptp_free_devicepropdesc (dpd_in_cache);
}
- if (!ptp_is_vendor_extension_prop(propcode))
- goto generic;
-
- if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
+ if ( ptp_is_vendor_extension_prop(propcode) &&
+ (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
ptp_operation_issupported(params, PTP_OC_CANON_EOS_RequestDevicePropValue)
) {
PTPDevicePropDesc *eos_dpd = ptp_find_eos_devicepropdesc(params, propcode); |
|
Unfortunately I no longer have access to the Sony camera so cannot test
…On Mon, Oct 21, 2024, 11:16 AM axxel ***@***.***> wrote:
Thanks for bringing this to my attention and sorry for the inconvencience.
@knro <https://github.com/knro> can you check if the following patch
fixes the issue for you?
diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index e96603409..01ba8a4b4 100644--- a/camlibs/ptp2/ptp.c+++ b/camlibs/ptp2/ptp.c@@ -4616,10 +4616,8 @@ ptp_generic_getdevicepropdesc (PTPParams *params, uint32_t propcode, PTPDevicePr
ptp_free_devicepropdesc (dpd_in_cache);
}
- if (!ptp_is_vendor_extension_prop(propcode))- goto generic;-- if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&+ if ( ptp_is_vendor_extension_prop(propcode) &&+ (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
ptp_operation_issupported(params, PTP_OC_CANON_EOS_RequestDevicePropValue)
) {
PTPDevicePropDesc *eos_dpd = ptp_find_eos_devicepropdesc(params, propcode);
—
Reply to this email directly, view it on GitHub
<#1044 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABNVQK6BHHSUZODCNXQ76ELZ4SZ7FAVCNFSM6AAAAABQIOZAOKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIMRVHE2DKNJSGU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
That is unfortunate. If your PR positively fixed the issue, then I'm confident that @msmeissn's fix did so as well. |
|
i tested with a Sony A7 and that had capture working now |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A git bisect reveled that ptp_is_vendor_extension_prop introduced in f5e51fd caused a regression for Sony cameras causing some of them to fail to capture completely.