service: elementary_stream: remove unused es_vbv_size / es_vbv_delay

diff --git a/src/parsers/parser_h264.c b/src/parsers/parser_h264.c
index 4318d8aee93f95787ee0894d0adc31b6cd6b4c2f..cf4febc827bd4c0d945072a549d0a776b2f15e9d 100644 (file)
--- a/src/parsers/parser_h264.c
+++ b/src/parsers/parser_h264.c
@@ -432,10 +432,10 @@ h264_decode_slice_header(elementary_stream_t *st, bitstream_t *bs, int *pkttype,
     d = 3000; /* 90000/30 = 3000 : 30fps */
   }
 
+#if 0
   if (sps->cbpsize)
     st->es_vbv_size = sps->cbpsize;
-
-  st->es_vbv_delay = -1;
+#endif
 
   width  = sps->width;
   height = sps->height * (2 - sps->mbs_only_flag);

diff --git a/src/parsers/parsers.c b/src/parsers/parsers.c
index 0f8ead6705db0b2b8d398903c6d361cd3ac6365f..6613d25575dd8fd34e61428b8b3a3acf297f8df4 100644 (file)
--- a/src/parsers/parsers.c
+++ b/src/parsers/parsers.c
@@ -944,7 +944,7 @@ static int
 parse_mpeg2video_pic_start(service_t *t, elementary_stream_t *st, int *frametype,
                            bitstream_t *bs)
 {
-  int v, pct;
+  int pct;
 
   if(bs->len < 29)
     return PARSER_RESET;
@@ -957,11 +957,13 @@ parse_mpeg2video_pic_start(service_t *t, elementary_stream_t *st, int *frametype
 
   *frametype = pct;
 
-  v = read_bits(bs, 16); /* vbv_delay */
+#if 0
+  int v = read_bits(bs, 16); /* vbv_delay */
   if(v == 0xffff)
     st->es_vbv_delay = -1;
   else
     st->es_vbv_delay = v;
+#endif
   return 0;
 }
 
@@ -1025,7 +1027,7 @@ static int
 parse_mpeg2video_seq_start(service_t *t, elementary_stream_t *st,
                            bitstream_t *bs)
 {
-  int v, width, height, aspect;
+  int width, height, aspect, duration;
 
   if(bs->len < 61)
     return 1;
@@ -1037,13 +1039,15 @@ parse_mpeg2video_seq_start(service_t *t, elementary_stream_t *st,
   st->es_aspect_num = mpeg2_aspect[aspect][0];
   st->es_aspect_den = mpeg2_aspect[aspect][1];
 
-  int duration = mpeg2video_framedurations[read_bits(bs, 4)];
+  duration = mpeg2video_framedurations[read_bits(bs, 4)];
 
-  v = read_bits(bs, 18) * 400;
+  skip_bits(bs, 18);
   skip_bits(bs, 1);
   
-  v = read_bits(bs, 10) * 16 * 1024 / 8;
+#if 0
+  int v = read_bits(bs, 10) * 16 * 1024 / 8;
   st->es_vbv_size = v;
+#endif
 
   parser_set_stream_vparam(st, width, height, duration);
   return 0;

diff --git a/src/service.h b/src/service.h
index 41613ebaddb719c6f04de24b059c6122409b4c1e..eb9b68191eba03963d725b6aeacab57fd239088c 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -103,9 +103,6 @@ typedef struct elementary_stream {
   /* CA ID's on this stream */
   struct caid_list es_caids;
 
-  int es_vbv_size;        /* Video buffer size (in bytes) */
-  int es_vbv_delay;       /* -1 if CBR */
-
   /* */
 
   int es_delete_me;      /* Temporary flag for deleting streams */