Used VLC_CODEC_BD_PG in TS demuxer.

[vlc] / modules / access_filter / bandwidth.c

diff --git a/modules/access_filter/bandwidth.c b/modules/access_filter/bandwidth.c
index 77f7e0cc3164e120a53eab5ad45b4ef3f6b6a6e4..43bce412c4a2f85fd8754abc9ff7668e984236f9 100644 (file)
--- a/modules/access_filter/bandwidth.c
+++ b/modules/access_filter/bandwidth.c
@@ -2,7 +2,7 @@
  * bandwidth.c
  *****************************************************************************
  * Copyright © 2007 Rémi Denis-Courmont
- * $Id: dump.c 19948 2007-04-26 19:53:53Z courmisch $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,10 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <assert.h>
 #include <errno.h>
 
@@ -38,20 +41,20 @@ static void Close (vlc_object_t *);
 
 /* TODO: burst support */
 
-vlc_module_begin ();
-    set_shortname (_("Bandwidth"));
-    set_description (_("Bandwidth limiter"));
-    set_category (CAT_INPUT);
-    set_subcategory (SUBCAT_INPUT_ACCESS_FILTER);
-    set_capability ("access_filter", 0);
-    add_shortcut ("bandwidth");
-    set_callbacks (Open, Close);
+vlc_module_begin ()
+    set_shortname (N_("Bandwidth"))
+    set_description (N_("Bandwidth limiter"))
+    set_category (CAT_INPUT)
+    set_subcategory (SUBCAT_INPUT_ACCESS_FILTER)
+    set_capability ("access_filter", 0)
+    add_shortcut ("bandwidth")
+    set_callbacks (Open, Close)
 
     add_integer ("access-bandwidth", 65536, NULL, BANDWIDTH_TEXT,
-                 BANDWIDTH_LONGTEXT, VLC_FALSE);
-vlc_module_end();
+                 BANDWIDTH_LONGTEXT, false);
+vlc_module_end ()
 
-static int Read (access_t *access, uint8_t *buffer, int len);
+static ssize_t Read (access_t *access, uint8_t *buffer, size_t len);
 static int Seek (access_t *access, int64_t offset);
 static int Control (access_t *access, int cmd, va_list ap);
 
@@ -84,15 +87,15 @@ static int Open (vlc_object_t *obj)
     access->pf_control = Control;
     access->info = src->info;
 
-    access_sys_t *p_sys = access->p_sys = malloc (sizeof (*p_sys));
-    if (p_sys == NULL)
+    access_sys_t *p_sys = access->p_sys = calloc( 1, sizeof (*p_sys) );
+    if( !p_sys )
         return VLC_ENOMEM;
 
-    memset (p_sys, 0, sizeof (*p_sys));
     p_sys->bandwidth = var_CreateGetInteger (access, "access-bandwidth");
     p_sys->last_time = mdate ();
 
-    msg_Dbg (obj, "bandwidth limit: %u bytes/s", p_sys->bandwidth);
+    msg_Dbg (obj, "bandwidth limit: %lu bytes/s",
+             (unsigned long)p_sys->bandwidth);
     return VLC_SUCCESS;
 }
 
@@ -108,7 +111,7 @@ static void Close (vlc_object_t *obj)
 }
 
 
-static int Read (access_t *access, uint8_t *buffer, int len)
+static ssize_t Read (access_t *access, uint8_t *buffer, size_t len)
 {
     access_t *src = access->p_source;
     access_sys_t *p_sys = access->p_sys;
@@ -140,7 +143,7 @@ retry:
 
     if (len > delta)
     {
-        msg_Dbg (access, "reading %u bytes instead of %u", (unsigned)delta,
+        msg_Dbg (access, "reading %"PRIu64" bytes instead of %zu", delta,
                  len);
         len = (int)delta;
     }
@@ -150,7 +153,7 @@ retry:
     len = src->pf_read (src, buffer, len);
     access->info = src->info;
 
-    msg_Dbg (access, "read %u bytes", len);
+    msg_Dbg (access, "read %zu bytes", len);
     return len;
 }
 
@@ -171,3 +174,4 @@ static int Seek (access_t *access, int64_t offset)
     access->info = src->info;
     return ret;
 }
+