Remove dependency on getLength from webp decoder.

src/images/SkImageDecoder_libwebp.cpp

 /*
  * Copyright 2010, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 42 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
 static const size_t WEBP_VP8_HEADER_SIZE = 64;
 static const size_t WEBP_IDECODE_BUFFER_SZ = (1 << 16);
 
 // Parse headers of RIFF container, and check for valid Webp (VP8) content.
 static bool webp_parse_header(SkStream* stream, int* width, int* height, int* alpha) {
     unsigned char buffer[WEBP_VP8_HEADER_SIZE];
-    const uint32_t contentSize = stream->getLength();
-    const size_t len = stream->read(buffer, WEBP_VP8_HEADER_SIZE);
-    const uint32_t read_bytes =
-            (contentSize < WEBP_VP8_HEADER_SIZE) ? contentSize : WEBP_VP8_HEADER_SIZE;
-    if (len != read_bytes) {
-        return false; // can't read enough
-    }
+    size_t bytesToRead = WEBP_VP8_HEADER_SIZE;
+    size_t totalBytesRead = 0;
+    do {
+        unsigned char* dst = buffer + totalBytesRead;
+        const size_t bytesRead = stream->read(dst, bytesToRead);
+        if ((size_t)-1 == bytesRead) {

[djsollen, 2013/08/12 17:54:57]

I don't think our stream should ever return -1.  If we return 0 then we should
check if we are at end of the stream so I think replacing the break with a
continue will suffice.

[scroggo, 2013/08/12 19:08:10]

Done.

+            // Could not read any bytes, so we have read the entire stream.
+            break;
+        }
+        bytesToRead -= bytesRead;
+        totalBytesRead += bytesRead;
+        SkASSERT(bytesToRead + totalBytesRead == WEBP_VP8_HEADER_SIZE);
+    } while (!stream->isAtEnd() && bytesToRead > 0);

[vikasa, 2013/08/12 18:25:41]

Assumption here is that 'stream->isAtEnd()' works reliably across all use-cases
(different types of file descriptors (ParcelFileDescriptor) etc).

[djsollen, 2013/08/12 18:46:52]

Yes, As part of this we are also updating the code that converts Java Streams to
SkStreams to support the new features in SkStream.

 
     WebPBitstreamFeatures features;
-    VP8StatusCode status = WebPGetFeatures(buffer, read_bytes, &features);
+    VP8StatusCode status = WebPGetFeatures(buffer, totalBytesRead, &features);
     if (VP8_STATUS_OK != status) {
         return false; // Invalid WebP file.
     }
     *width = features.width;
     *height = features.height;
     *alpha = features.has_alpha;
 
     // sanity check for image size that's about to be decoded.
     {
         Sk64 size;
@@ skipping 102 matching lines @@
 // Incremental WebP image decoding. Reads input buffer of 64K size iteratively
 // and decodes this block to appropriate color-space as per config object.
 static bool webp_idecode(SkStream* stream, WebPDecoderConfig* config) {
     WebPIDecoder* idec = WebPIDecode(NULL, 0, config);
     if (NULL == idec) {
         WebPFreeDecBuffer(&config->output);
         return false;
     }
 
     stream->rewind();
-    const uint32_t contentSize = stream->getLength();
-    const uint32_t readBufferSize = (contentSize < WEBP_IDECODE_BUFFER_SZ) ?
-                                       contentSize : WEBP_IDECODE_BUFFER_SZ;
+    const size_t readBufferSize = stream->hasLength() ?
+            SkTMin(stream->getLength(), WEBP_IDECODE_BUFFER_SZ) : WEBP_IDECODE_BUFFER_SZ;

[vikasa, 2013/08/12 18:25:41]

As mentioned by Craig (w.r.t https://codereview.chromium.org/22629010/), the
return value of stream->getLength() can be relied-upon.

[scroggo, 2013/08/12 18:44:57]

Right. That is why I only check stream->getLength() if stream->hasLength()
returns true, in which case we assume that the length is reliable. I also need
to update CreateJavaOutputStreamAdaptor to return false for hasLength as
appropriate.

     SkAutoMalloc srcStorage(readBufferSize);
     unsigned char* input = (uint8_t*)srcStorage.get();
     if (NULL == input) {
         WebPIDelete(idec);
         WebPFreeDecBuffer(&config->output);
         return false;
     }
 
     bool success = true;
     VP8StatusCode status = VP8_STATUS_SUSPENDED;
@@ skipping 380 matching lines @@
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
       return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
 }
 
 static SkTRegistry<SkImageDecoder*, SkStream*> gDReg(sk_libwebp_dfactory);
 static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_webp);
 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libwebp_efactory);