Changeset 91ad284 for src

Timestamp:

Mar 12, 2017, 2:23:33 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

618ebd5

Parents:

4ac4ebc

Message:

src/io/source_avcodec.c: set a longer timeout when opening urls

File:

• src/io/source_avcodec.c (modified) (4 diffs)

src/io/source_avcodec.c

@@ -76 +76 @@
   uint_t eof;
   uint_t multi;
+  uint_t has_network_url;
 };
 
@@ -90 +91 @@
   av_url_split(proto, proto_size, authorization, authorization_size, hostname,
       hostname_size, port_ptr, uripath, path_size, s->path);
+  s->has_network_url = 0;
   if (strlen(proto)) {
-    return 1;
-  }
-  return 0;
+    s->has_network_url = 1;
+  }
+  return s->has_network_url;
 }
 
@@ -129 +131 @@
   // try opening the file and get some info about it
   AVFormatContext *avFormatCtx = s->avFormatCtx;
+  AVDictionary *streamopts = 0;
+  if (s->has_network_url) {
+    if (av_dict_set(&streamopts, "timeout", "1000000", 0)) { // in microseconds
+      AUBIO_WRN("source_avcodec: Failed setting timeout to 1000000 for %s\n", s->path);
+    } else {
+      AUBIO_WRN("source_avcodec: Setting timeout to 1000000 for %s\n", s->path);
+    }
+  }
   avFormatCtx = NULL;
-  if ( (err = avformat_open_input(&avFormatCtx, s->path, NULL, NULL) ) < 0 ) {
+  if ( (err = avformat_open_input(&avFormatCtx, s->path, NULL, &streamopts) ) < 0 ) {
     char errorstr[256];
     av_strerror (err, errorstr, sizeof(errorstr));
     AUBIO_ERR("source_avcodec: Failed opening %s (%s)\n", s->path, errorstr);
-    goto beach;
+    goto beach_streamopts;
   }
 
@@ -262 +272 @@
   //av_log_set_level(AV_LOG_QUIET);
 
+  av_dict_free(&streamopts);
   return s;
 
+beach_streamopts:
+  av_dict_free(&streamopts);
 beach:
   //AUBIO_ERR("can not read %s at samplerate %dHz with a hop_size of %d\n",