libvpx: Pull from upstream

source/libvpx/test/webm_video_source.h

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #ifndef TEST_WEBM_VIDEO_SOURCE_H_
 #define TEST_WEBM_VIDEO_SOURCE_H_
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <new>
 #include <string>
-#include "nestegg/include/nestegg/nestegg.h"
+#include "third_party/nestegg/include/nestegg/nestegg.h"
 #include "test/video_source.h"
 
 namespace libvpx_test {
 
 static int
 nestegg_read_cb(void *buffer, size_t length, void *userdata) {
   FILE *f = reinterpret_cast<FILE *>(userdata);
 
   if (fread(buffer, 1, length, f) < length) {
     if (ferror(f))
@@ skipping 73 matching lines @@
   virtual void Init() {
   }
 
   virtual void Begin() {
     input_file_ = OpenTestDataFile(file_name_);
     ASSERT_TRUE(input_file_ != NULL) << "Input file open failed. Filename: "
         << file_name_;
 
     nestegg_io io = {nestegg_read_cb, nestegg_seek_cb, nestegg_tell_cb,
                      input_file_};
-    ASSERT_FALSE(nestegg_init(&nestegg_ctx_, io, NULL))
+    ASSERT_FALSE(nestegg_init(&nestegg_ctx_, io, NULL, -1))
         << "nestegg_init failed";
 
     unsigned int n;
     ASSERT_FALSE(nestegg_track_count(nestegg_ctx_, &n))
         << "failed to get track count";
 
     for (unsigned int i = 0; i < n; i++) {
       int track_type = nestegg_track_type(nestegg_ctx_, i);
       ASSERT_GE(track_type, 0) << "failed to get track type";
 
@@ skipping 40 matching lines @@
     }
 
     ASSERT_FALSE(nestegg_packet_data(pkt_, chunk_, &buf_, &buf_sz_))
         << "nestegg_packet_data failed";
     chunk_++;
   }
 
   virtual const uint8_t *cxdata() const {
     return end_of_file_ ? NULL : buf_;
   }
-  virtual const unsigned int frame_size() const { return buf_sz_; }
-  virtual const unsigned int frame_number() const { return frame_; }
+  virtual size_t frame_size() const { return buf_sz_; }
+  virtual unsigned int frame_number() const { return frame_; }
 
  protected:
   std::string file_name_;
   FILE *input_file_;
   nestegg *nestegg_ctx_;
   nestegg_packet *pkt_;
   unsigned int video_track_;
   unsigned int chunk_;
   unsigned int chunks_;
   uint8_t *buf_;
   size_t buf_sz_;
   unsigned int frame_;
   bool end_of_file_;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_WEBM_VIDEO_SOURCE_H_