Handle EINTR and remove offset_t in ffmpeg code.

media/ffmpeg/file_protocol.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/ffmpeg/file_protocol.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #else
 #include <unistd.h>
 #endif
 #include <fcntl.h>
 
 #include "base/compiler_specific.h"
+#include "base/eintr_wrapper.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 // warning C4996: 'open': The POSIX name for this item is deprecated.
 MSVC_PUSH_DISABLE_WARNING(4996)
 
 namespace {
 
 int GetHandle(URLContext *h) {
@@ skipping 13 matching lines @@
 #endif
   int f = open(filename, access, 0666);
   if (f == -1)
     return AVERROR(ENOENT);
   h->priv_data = reinterpret_cast<void*>(static_cast<intptr_t>(f));
   h->is_streamed = false;
   return 0;
 }
 
 int ReadContext(URLContext* h, unsigned char* buf, int size) {
-  return read(GetHandle(h), buf, size);
+  return HANDLE_EINTR(read(GetHandle(h), buf, size));
 }
 
 int WriteContext(URLContext* h, unsigned char* buf, int size) {
-  return write(GetHandle(h), buf, size);
+  return HANDLE_EINTR(write(GetHandle(h), buf, size));
 }
 
-offset_t SeekContext(URLContext* h, offset_t offset, int whence) {
-#if defined(OS_WIN)
-  return lseek(GetHandle(h), static_cast<long>(offset), whence);
-#else
-  return lseek(GetHandle(h), offset, whence);
-#endif
+int64 SeekContext(URLContext* h, int64 offset, int whence) {
+  return lseek(GetHandle(h), static_cast<off_t>(offset), whence);

[wtc, 2010/05/19 17:20:42]

MSVC has _lseeki64, which takes a 64-bit offset argument:
http://msdn.microsoft.com/en-us/library/1yee101t(VS.80).aspx

Should we use _lseeki64 instead to avoid truncating the
'offset' argument?

[agl, 2010/05/19 18:07:32]

I figured that off_t would be 64-bit on Windows, but the page you cited suggests
not. I've changed it to _lseeki64 on Windows and will land if it passes the try
bot.

[awong, 2010/05/19 18:12:56]

Doesn't off_t change on glibc depending on the various features that are
defined?  IIRC, You need _FILE_OFFSET_BITS == 64 right?

[wtc, 2010/05/19 18:44:55]

We can add a static assertion to assert that sizeof(off_t) == 8.

 }
 
 int CloseContext(URLContext* h) {
-  return close(GetHandle(h));
+  return HANDLE_EINTR(close(GetHandle(h)));
 }
 
 }  // namespace
 
 MSVC_POP_WARNING()
 
 URLProtocol kFFmpegFileProtocol = {
   "file",
   &OpenContext,
   &ReadContext,
   &WriteContext,
   &SeekContext,
   &CloseContext,
   NULL,  // *next
   NULL,  // url_read_pause
   NULL,  // url_read_seek
   &GetHandle
 };