From 6d6488dbf628dfd6993ebd54c3403513346b940a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 4 May 2014 16:11:35 +0000 Subject: [PATCH] improved event handling for the OLC stuff git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14935 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/ptp-pack.c | 119 +++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 44 deletions(-) diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index a0a904efe..ce1f93181 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -1603,10 +1603,11 @@ ptp_pack_EOS_CustomFuncEx (PTPParams* params, unsigned char* data, char* str) #define PTP_ece_OA_Name 0x28 static inline int -ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, PTPCanon_changes_entry **ce) +ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, PTPCanon_changes_entry **pce) { int i = 0, entries = 0; unsigned char *curdata = data; + PTPCanon_changes_entry *ce; if (data==NULL) return 0; @@ -1614,42 +1615,49 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, uint32_t size = dtoh32a(&curdata[PTP_ece_Size]); uint32_t type = dtoh32a(&curdata[PTP_ece_Type]); - curdata += size; if ((size == 8) && (type == 0)) break; + if (type == PTP_EC_CANON_EOS_OLCInfoChanged) { + unsigned int j; + + for (j=0;j<31;j++) + if (dtoh32a(curdata+12) & (1<canon_props[j].dpd; - (*ce)[i].type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY; - (*ce)[i].u.propid = proptype; + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY; + ce[i].u.propid = proptype; /* fix GetSet value */ switch (proptype) { @@ -2000,7 +2008,7 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, } len = dtoh32a(curdata+8); if (len != size-8) { - (*ce)[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; ptp_debug (params, "event %d: size %d, len %d", i, size, len); break; } @@ -2008,6 +2016,10 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, curoff = 8+4+4; if (mask & 1) { ptp_debug (params, "olc: mask 0<<2 not handled"); + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; + ce[i].u.info = malloc(strlen("Button 1234567")); + sprintf(ce[i].u.info, "Button %d", dtoh16a(curdata+curoff)); + i++; curoff += 2; } @@ -2024,20 +2036,38 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, dpd = ¶ms->canon_props[j].dpd; dpd->CurrentValue.u16 = curdata[curoff+5]; /* just use last byte */ - (*ce)[i].type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY; - (*ce)[i].u.propid = proptype; + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY; + ce[i].u.propid = proptype; curoff += 6; - break; + i++; + } + if (mask & 4) { + /* 5 bytes: 01 01 5b 30 30 */ + /* this seesm to be the aperture record */ + proptype = PTP_DPC_CANON_EOS_Aperture; + for (j=0;jnrofcanon_props;j++) + if (params->canon_props[j].proptype == proptype) + break; + if (j == params->nrofcanon_props) + ptp_debug (params, "event %d: shutterspeed not found yet, handle this", i); + + dpd = ¶ms->canon_props[j].dpd; + dpd->CurrentValue.u16 = curdata[curoff+4]; /* just use last byte */ + + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY; + ce[i].u.propid = proptype; + curoff += 5; + i++; } /* handle more masks */ - (*ce)[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; - (*ce)[i].u.info = malloc(strlen("OLCInfo event mask 0123456789")); - sprintf((*ce)[i].u.info, "OLCInfo event mask=%x", dtoh16a(curdata+8+2)); + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; + ce[i].u.info = malloc(strlen("OLCInfo event mask 0123456789")); + sprintf(ce[i].u.info, "OLCInfo event mask=%x", mask); break; } case PTP_EC_CANON_EOS_CameraStatusChanged: - (*ce)[i].type = PTP_CANON_EOS_CHANGES_TYPE_CAMERASTATUS; - (*ce)[i].u.status = dtoh32a(curdata+8); + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_CAMERASTATUS; + ce[i].u.status = dtoh32a(curdata+8); ptp_debug (params, "event %d: EOS event CameraStatusChanged (size %d) = %d", i, size, dtoh32a(curdata+8)); params->eos_camerastatus = dtoh32a(curdata+8); break; @@ -2047,16 +2077,16 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, ptp_debug (params, "event %d: EOS event 0, but size %d", i, size); break; case PTP_EC_CANON_EOS_BulbExposureTime: - (*ce)[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; - (*ce)[i].u.info = malloc(strlen("BulbExposureTime 123456789")); - sprintf ((*ce)[i].u.info, "BulbExposureTime %d", dtoh32a(curdata+8)); + ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; + ce[i].u.info = malloc(strlen("BulbExposureTime 123456789")); + sprintf (ce[i].u.info, "BulbExposureTime %d", dtoh32a(curdata+8)); break; default: switch (type) { #define XX(x) case PTP_EC_CANON_EOS_##x: \ ptp_debug (params, "event %d: unhandled EOS event "#x" (size %d)", i, size); \ - (*ce)[i].u.info = malloc(strlen("unhandled EOS event "#x" (size 123456789)")); \ - sprintf ((*ce)[i].u.info, "unhandled EOS event "#x" (size %d)", size); \ + ce[i].u.info = malloc(strlen("unhandled EOS event "#x" (size 123456789)")); \ + sprintf (ce[i].u.info, "unhandled EOS event "#x" (size %d)", size); \ break; XX(RequestGetEvent) XX(ObjectRemoved) @@ -2086,19 +2116,20 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, for (j=8;j