Mercurial > libavformat.hg

changeset 5219:583eb737b1c4 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix pes overhead computation, patch by Niobos, niobos at dest-unreach dot be
author bcoudurier
date Thu, 17 Sep 2009 19:07:09 +0000
parents ebbaf1c20a84
children cad276e8f96e
files mpegtsenc.c
diffstat 1 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mpegtsenc.c	Thu Sep 17 18:46:50 2009 +0000
+++ b/mpegtsenc.c	Thu Sep 17 19:07:09 2009 +0000
@@ -428,10 +428,18 @@
         total_bit_rate += st->codec->bit_rate;
         /* PES header size */
         if (st->codec->codec_type == CODEC_TYPE_VIDEO ||
-            st->codec->codec_type == CODEC_TYPE_SUBTITLE)
-            total_bit_rate += 25 * 8 / av_q2d(st->codec->time_base);
-        else
-            total_bit_rate += total_bit_rate * 25 / DEFAULT_PES_PAYLOAD_SIZE;
+            st->codec->codec_type == CODEC_TYPE_SUBTITLE) {
+            /* 1 PES per frame
+             * 19 bytes of PES header
+             * on average a half TS-packet (184/2) of padding-overhead every PES */
+            total_bit_rate += (19 + 184/2)*8 / av_q2d(st->codec->time_base);
+        } else {
+            /* 1 PES per DEFAULT_PES_PAYLOAD_SIZE bytes of audio data
+             * 14 bytes of PES header
+             * on average a half TS-packet (184/2) of padding-overhead every PES */
+            total_bit_rate += (14 + 184/2) *
+                st->codec->bit_rate / DEFAULT_PES_PAYLOAD_SIZE;
+        }
     }
 
     /* if no video stream, use the first stream as PCR */