| Revision | 2a300c58e5e19d00ee572b7c8d392abe89b0eb63 (tree) |
|---|---|
| Zeit | 2019-10-13 14:17:56 |
| Autor | MRSa <mrsa@myad...> |
| Commiter | MRSa |
これでできた感。(Full Image取得)
app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/command/PtpIpCommandPublisher.java (diff) app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/playback/PtpIpFullImageReceiver.java (diff)| @@ -436,6 +436,7 @@ public class PtpIpCommandPublisher implements IPtpIpCommandPublisher, IPtpIpComm | ||
| 436 | 436 | |
| 437 | 437 | try |
| 438 | 438 | { |
| 439 | + Log.v(TAG, " ===== receive_multi() ====="); | |
| 439 | 440 | int receive_message_buffer_size = BUFFER_SIZE; |
| 440 | 441 | byte[] byte_array = new byte[receive_message_buffer_size]; |
| 441 | 442 | InputStream is = socket.getInputStream(); |
| @@ -518,7 +519,7 @@ public class PtpIpCommandPublisher implements IPtpIpCommandPublisher, IPtpIpComm | ||
| 518 | 519 | lenlen = ((((int) byte_array[15]) & 0xff) << 24) + ((((int) byte_array[14]) & 0xff) << 16) + ((((int) byte_array[13]) & 0xff) << 8) + (((int) byte_array[12]) & 0xff); |
| 519 | 520 | packetType = (((int)byte_array[16]) & 0xff); |
| 520 | 521 | } |
| 521 | - Log.v(TAG, " --- [[[ RECEIVED LARGE BLOCK MESSAGE : " + lenlen + " bytes. ]]] --- TYPE : " + packetType); | |
| 522 | + Log.v(TAG, " --- parseDataLength() length: " + lenlen + " TYPE: " + packetType + " read_bytes: " + read_bytes); | |
| 522 | 523 | } |
| 523 | 524 | catch (Exception e) |
| 524 | 525 | { |
| @@ -546,7 +547,7 @@ public class PtpIpCommandPublisher implements IPtpIpCommandPublisher, IPtpIpComm | ||
| 546 | 547 | lenlen = ((((int) byte_array[15]) & 0xff) << 24) + ((((int) byte_array[14]) & 0xff) << 16) + ((((int) byte_array[13]) & 0xff) << 8) + (((int) byte_array[12]) & 0xff); |
| 547 | 548 | packetType = (((int) byte_array[16]) & 0xff); |
| 548 | 549 | } |
| 549 | - Log.v(TAG, " --- <<< RECEIVED LARGE BLOCK MESSAGE : " + len + " bytes. (" + byte_array.length + " bytes.)" + " lenlen : " + lenlen + " >>> --- TYPE : " + packetType); | |
| 550 | + Log.v(TAG, " --- RECEIVED MESSAGE : " + len + " bytes (BUFFER: " + byte_array.length + " bytes)" + " length : " + lenlen + " TYPE : " + packetType + " --- "); | |
| 550 | 551 | if (lenlen == 0) |
| 551 | 552 | { |
| 552 | 553 | // データとしては変なので、なにもしない |
| @@ -61,10 +61,12 @@ public class PtpIpFullImageReceiver implements IPtpIpCommandCallback | ||
| 61 | 61 | } |
| 62 | 62 | else if (id == objectId + 2) |
| 63 | 63 | { |
| 64 | - Log.v(TAG, " RECEIVED : " + id); | |
| 64 | + Log.v(TAG, " TransferComplete() RECEIVED : " + id + " (" + objectId + ") size : " + target_image_size); | |
| 65 | 65 | |
| 66 | 66 | // end of receive sequence. |
| 67 | 67 | callback.onCompleted(); |
| 68 | + received_remain_bytes = 0; | |
| 69 | + received_total_bytes = 0; | |
| 68 | 70 | target_image_size = 0; |
| 69 | 71 | objectId = 0; |
| 70 | 72 | callback = null; |
| @@ -90,7 +92,7 @@ public class PtpIpFullImageReceiver implements IPtpIpCommandCallback | ||
| 90 | 92 | // 受信したデータから、通信のヘッダ部分を削除する |
| 91 | 93 | byte[] body = cutHeader(rx_body); |
| 92 | 94 | int length = (body == null) ? 0 : body.length; |
| 93 | - Log.v(TAG, " onReceiveProgress() " + currentBytes + "/" + totalBytes + " (" + length + " bytes.) : image : " + target_image_size); | |
| 95 | + Log.v(TAG, " onReceiveProgress() " + currentBytes + "/" + totalBytes + " (" + length + " bytes.)"); | |
| 94 | 96 | callback.onProgress(body, length, new IProgressEvent() { |
| 95 | 97 | @Override |
| 96 | 98 | public float getProgress() { |
| @@ -120,6 +122,8 @@ public class PtpIpFullImageReceiver implements IPtpIpCommandCallback | ||
| 120 | 122 | { |
| 121 | 123 | // データを最初に読んだとき。ヘッダ部分を読み飛ばす |
| 122 | 124 | data_position = (int) rx_body[0] & (0xff); |
| 125 | + Log.v(TAG, " FIRST DATA POS. : " + data_position); | |
| 126 | + //SimpleLogDumper.dump_bytes(" [sss]", Arrays.copyOfRange(rx_body, 0, (64))); | |
| 123 | 127 | } |
| 124 | 128 | else if (received_remain_bytes > 0) |
| 125 | 129 | { |
Fork