Changeset 0afe6776db69252dbba8dbb5a6bbe51f8f1c4822

Timestamp:

10/26/07 10:35:52 (11 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1193387752 +0000

git-parent:

[79f436dba64987ab10aa0c8660adfc501f35e55e]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1193387752 +0000

Message:

Fix small issues in mux/ts.c:

- Fix potential memleak with SDT descriptors
- Fix compiler warning about unused variables when not using SDT descriptors
- Fix compiler warning about wrong type of psz_sdt_desc
- Add parenthesis

Files:

• modules/mux/mpeg/ts.c (modified) (5 diffs)

modules/mux/mpeg/ts.c

@@ -1337 +1337 @@
-                p_stream = (ts_stream_t*)p_input->p_sys;
-
-p_stream == p_pcr_stream
-p_stream->i_pes_length < i_shaping_delay
-
-p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length
+( p_stream == p_pcr_stream )
+( p_stream->i_pes_length < i_shaping_delay )
+( 
+  p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length )
-                {
-                    /* Need more data */
-                    if( block_FifoCount( p_input->p_fifo ) <= 1 )
-                    {
-p_input->p_fmt->i_cat == AUDIO_ES
-p_input->p_fmt->i_cat == VIDEO_ES
+( p_input->p_fmt->i_cat == AUDIO_ES )
+( p_input->p_fmt->i_cat == VIDEO_ES )
-                        {
-                            /* We need more data */
@@ -1356 +1356 @@
-                            continue;
-                        }
-
+ if( p_input->p_fmt->i_cat == SPU_ES )
-                        {
-                            /* Don't mux the SPU yet if it is too early */
@@ -1364 +1364 @@
-                                p_spu->i_dts - p_pcr_stream->i_pes_dts;
-
-i_spu_delay > i_shaping_delay
-i_spu_delay < I64C(100000000
+( i_spu_delay > i_shaping_delay )
+( i_spu_delay < I64C(100000000) 
-                                continue;
-
-i_spu_delay >= I64C(100000000)
- || i_spu_delay < I64C(10000
+( i_spu_delay >= I64C(100000000) ) ||
+( i_spu_delay < I64C(10000) 
-                            {
-                                BufferChainClean( p_mux->p_sout,
@@ -2212 +2212 @@
-    sout_mux_sys_t  *p_sys = p_mux->p_sys;
-    block_t   *p_pmt[MAX_PMT];
-
-
-
+
-    dvbpsi_pmt_es_t     *p_es;
-
-
-
+
+
-    int             i_pidinput;
-
-    int             i_stream;
-    int             i;
-    int             *p_usepid = NULL;
+
+#ifdef HAVE_DVBPSI_SDT
+    block_t         *p_sdt;
+    dvbpsi_sdt_t    sdt;
+
+    dvbpsi_psi_section_t* p_section2;
+    dvbpsi_sdt_service_t *p_service;
+
+    uint8_t         *psz_sdt_desc;
+#endif
-
-    if( p_sys->dvbpmt == NULL )
@@ -2254 +2260 @@
-
-            /* FIXME: Ineffecient malloc's & ugly code......  */
-psz_sdtprov != NULL && psz_sdtserv != NULL
+( psz_sdtprov != NULL ) && ( psz_sdtserv != NULL )
-            {
-                psz_sdt_desc = malloc( 3 + strlen(psz_sdtprov)
-                                         + strlen(psz_sdtserv) );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-#undef psz_sdtprov