| OLD | NEW | 
|---|
| 1 // Copyright 2012 Google Inc. All Rights Reserved. | 1 // Copyright 2012 Google Inc. All Rights Reserved. | 
| 2 // | 2 // | 
| 3 // This code is licensed under the same terms as WebM: | 3 // Use of this source code is governed by a BSD-style license | 
| 4 //  Software License Agreement:  http://www.webmproject.org/license/software/ | 4 // that can be found in the COPYING file in the root of the source | 
| 5 //  Additional IP Rights Grant:  http://www.webmproject.org/license/additional/ | 5 // tree. An additional intellectual property rights grant can be found | 
|  | 6 // in the file PATENTS. All contributing project authors may | 
|  | 7 // be found in the AUTHORS file in the root of the source tree. | 
| 6 // ----------------------------------------------------------------------------- | 8 // ----------------------------------------------------------------------------- | 
| 7 // | 9 // | 
| 8 //  WebP container demux. | 10 //  WebP container demux. | 
| 9 // | 11 // | 
| 10 | 12 | 
| 11 #ifdef HAVE_CONFIG_H | 13 #ifdef HAVE_CONFIG_H | 
| 12 #include "config.h" | 14 #include "config.h" | 
| 13 #endif | 15 #endif | 
| 14 | 16 | 
| 15 #include <assert.h> | 17 #include <assert.h> | 
| 16 #include <stdlib.h> | 18 #include <stdlib.h> | 
| 17 #include <string.h> | 19 #include <string.h> | 
| 18 | 20 | 
| 19 #include "../utils/utils.h" | 21 #include "../utils/utils.h" | 
| 20 #include "../webp/decode.h"     // WebPGetFeatures | 22 #include "../webp/decode.h"     // WebPGetFeatures | 
| 21 #include "../webp/demux.h" | 23 #include "../webp/demux.h" | 
| 22 #include "../webp/format_constants.h" | 24 #include "../webp/format_constants.h" | 
| 23 | 25 | 
| 24 #if defined(__cplusplus) || defined(c_plusplus) | 26 #if defined(__cplusplus) || defined(c_plusplus) | 
| 25 extern "C" { | 27 extern "C" { | 
| 26 #endif | 28 #endif | 
| 27 | 29 | 
| 28 #define DMUX_MAJ_VERSION 0 | 30 #define DMUX_MAJ_VERSION 0 | 
| 29 #define DMUX_MIN_VERSION 1 | 31 #define DMUX_MIN_VERSION 1 | 
| 30 #define DMUX_REV_VERSION 0 | 32 #define DMUX_REV_VERSION 1 | 
| 31 | 33 | 
| 32 typedef struct { | 34 typedef struct { | 
| 33   size_t start_;        // start location of the data | 35   size_t start_;        // start location of the data | 
| 34   size_t end_;          // end location | 36   size_t end_;          // end location | 
| 35   size_t riff_end_;     // riff chunk end location, can be > end_. | 37   size_t riff_end_;     // riff chunk end location, can be > end_. | 
| 36   size_t buf_size_;     // size of the buffer | 38   size_t buf_size_;     // size of the buffer | 
| 37   const uint8_t* buf_; | 39   const uint8_t* buf_; | 
| 38 } MemBuffer; | 40 } MemBuffer; | 
| 39 | 41 | 
| 40 typedef struct { | 42 typedef struct { | 
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 943   return 0; | 945   return 0; | 
| 944 } | 946 } | 
| 945 | 947 | 
| 946 void WebPDemuxReleaseChunkIterator(WebPChunkIterator* iter) { | 948 void WebPDemuxReleaseChunkIterator(WebPChunkIterator* iter) { | 
| 947   (void)iter; | 949   (void)iter; | 
| 948 } | 950 } | 
| 949 | 951 | 
| 950 #if defined(__cplusplus) || defined(c_plusplus) | 952 #if defined(__cplusplus) || defined(c_plusplus) | 
| 951 }  // extern "C" | 953 }  // extern "C" | 
| 952 #endif | 954 #endif | 
| OLD | NEW | 
|---|