From: Rafaël Carré <rafael.carre@gmail.com>
Date: Tue, 23 Nov 2010 17:28:52 +0000 (+0100)
Subject: Revert "input: Fill in the input_item es"
X-Git-Tag: 1.2.0-pre1~4489
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2ca4cf27ef0d6dc906f5523babb35633d3b6bcd1;p=vlc

Revert "input: Fill in the input_item es"

This reverts commit eea468e632fe620228778b01bec36468222556bc.

When the media is played, the formats represent decoder output, and the ids are not preserved (video ES can be replaced by audio ES)
---

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 788f338c43..635b2e9893 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -45,7 +45,6 @@
 #include "es_out.h"
 #include "event.h"
 #include "info.h"
-#include "item.h"
 
 #include "../stream_output/stream_output.h"
 
@@ -2856,8 +2855,6 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t *
     const es_format_t *p_fmt_es = &es->fmt;
     lldiv_t         div;
 
-    input_item_UpdateTracksInfo(input_GetItem(p_input), fmt);
-
     /* Create category */
     char psz_cat[128];
     snprintf( psz_cat, sizeof(psz_cat),_("Stream %d"), es->i_meta_id );
diff --git a/src/input/item.c b/src/input/item.c
index e47a1e156d..0d374afc22 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -1050,35 +1050,3 @@ void input_item_node_PostAndDelete( input_item_node_t *p_root )
 
   input_item_node_Delete( p_root );
 }
-
-/* Called by es_out when a new Elementary Stream is added or updated. */
-void input_item_UpdateTracksInfo(input_item_t *item, const es_format_t *fmt)
-{
-    int i;
-    es_format_t *fmt_copy = malloc(sizeof *fmt_copy);
-    if (!fmt_copy)
-        return;
-
-    es_format_Copy(fmt_copy, fmt);
-    /* XXX: we could free p_extra to save memory, we will likely not need
-     * the decoder specific data */
-
-    vlc_mutex_lock( &item->lock );
-
-    for( i = 0; i < item->i_es; i++ )
-    {
-        if (item->es[i]->i_id != fmt->i_id)
-            continue;
-
-        /* We've found the right ES, replace it */
-        es_format_Clean(item->es[i]);
-        free(item->es[i]);
-        item->es[i] = fmt_copy;
-        vlc_mutex_unlock( &item->lock );
-        return;
-    }
-
-    /* ES not found, insert it */
-    TAB_APPEND(item->i_es, item->es, fmt_copy);
-    vlc_mutex_unlock( &item->lock );
-}
diff --git a/src/input/item.h b/src/input/item.h
index 9b021366f9..cd231f87ab 100644
--- a/src/input/item.h
+++ b/src/input/item.h
@@ -27,6 +27,5 @@
 #include "input_interface.h"
 
 void input_item_SetErrorWhenReading( input_item_t *p_i, bool b_error );
-void input_item_UpdateTracksInfo( input_item_t *item, const es_format_t *fmt );
 
 #endif