Revert "input core: add status field per elementary stream"

This reverts commit d8199d8cbe0e4e3f4920580c4735364a4664fc7e.

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 17f8d5d7d22bf85098b184020419cf8c86e15176..1e7c8a6f160cd27fc3123abf64c62a52b62f5111 100644 (file)
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -24,7 +24,6 @@
 #ifndef VLC_CODEC_H
 #define VLC_CODEC_H 1
 
-#include <vlc_atomic.h>
 #include <vlc_block.h>
 #include <vlc_es.h>
 #include <vlc_picture.h>
@@ -132,7 +131,7 @@ struct decoder_t
     /* Private structure for the owner of the decoder */
     decoder_owner_sys_t *p_owner;
 
-    atomic_bool       b_error;
+    bool                b_error;
 };
 
 /**

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index c08741c3b51dee44a5502b46717bc87c821b43d1..cf1abcec08467eb495ad62474e055c1500f358b6 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -45,9 +45,7 @@ enum es_out_query_e
 
     /* force selection/unselection of the ES (bypass current mode) */
     ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=bool   */
-    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=bool* arg3=bool* res=can fail
-                         * arg2 is true if es has been selected, false otherwise,
-                         * arg3 is true if es has an error, false otherwise */
+    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=bool*  */
 
     /* */
     ES_OUT_SET_GROUP,   /* arg1= int                            */

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 61258ca9697b1f1e756b9693bf9d4b824a14b35a..4098e6b6559c0ddbbd565ca441dc3d0b29592a66 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -297,14 +297,6 @@ typedef enum input_state_e
     ERROR_S,
 } input_state_e;
 
-/* same order as es_out_state_es_e enum in vlc_es_out.h */
-typedef enum input_es_state_e
-{
-    INPUT_ES_STATE_DISABLED = 0,
-    INPUT_ES_STATE_ENABLED,
-    INPUT_ES_STATE_ERROR,
-} input_es_state_e;
-
 /**
  * Input rate.
  *
@@ -488,9 +480,6 @@ enum input_query_e
     /* External clock managments */
     INPUT_GET_PCR_SYSTEM,   /* arg1=mtime_t *, arg2=mtime_t *       res=can fail */
     INPUT_MODIFY_PCR_SYSTEM,/* arg1=int absolute, arg2=mtime_t      res=can fail */
-
-    /* Ask status of main ES objects */
-    INPUT_GET_ES_STATE,     /* arg1=int (AUDIO/VIDEO/SPU_ES), arg2=es_out state * res=can fail */
 };
 
 /** @}*/
@@ -617,17 +606,6 @@ static inline int input_GetPcrSystem( input_thread_t *p_input, mtime_t *pi_syste
 {
     return input_Control( p_input, INPUT_GET_PCR_SYSTEM, pi_system, pi_delay );
 }
-
-/**
- * It will return the state of the current selected elementary streams for this input.
- */
-static inline input_es_state_e input_GetEsState( input_thread_t *p_input, const int i_cat )
-{
-    input_es_state_e state = INPUT_ES_STATE_DISABLED;
-    input_Control( p_input, INPUT_GET_ES_STATE, i_cat, &state );
-    return state;
-}
-
 /**
  * \see input_clock_ChangeSystemOrigin
  */

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index 4efa6082de83bc7b9377e0dbed91a9ac0459cef2..4fec50c7c073dbb5d2228062cd957be81f2dee40 100644 (file)
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -294,7 +294,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         case STATE_SEND_DATA:
             if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
             {
-                //atomic_store( &p_dec->b_error, true );
+                //p_dec->b_error = true;
                 return NULL;
             }
 

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 429de09d68aff7daf2edb96982b1c0fe86f74d28..b62ea938c206f0f18d5d6482ccb6726fbb34a75f 100644 (file)
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -921,7 +921,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
         const char *name = av_get_pix_fmt_name( p_sys->p_context->pix_fmt );
         msg_Err( p_dec, "Unsupported decoded output format %d (%s)",
                  p_sys->p_context->pix_fmt, name ? name : "unknown" );
-        atomic_store( &p_dec->b_error, true );
+        p_dec->b_error = 1;
     }
 }
 

diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index 6289d6edd50b2afbe72053d2cb8f5969bd00ed38..09ebc0d75727cb402aa26df3cefc97a58785d9bb 100644 (file)
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -310,7 +310,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
             if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
             {
-                //atomic_store( &p_dec->b_error, true );
+                //p_dec->b_error = true;
                 return NULL;
             }
 

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index d0e7d0f272a6e282eda8e6774fb9eb6e892833ba..e67abeba49e0d0a6e606fd60dba42c2a490c68f9 100644 (file)
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -440,7 +440,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         case STATE_SEND_DATA:
             if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
             {
-                //atomic_store( &p_dec->b_error, true );
+                //p_dec->b_error = true;
                 return NULL;
             }
 

diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index e671b519a616a4953fa94e3f6ab539df92b20480..885c758e7ca6c220cd7265c3196bfb91216e1929 100644 (file)
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -538,7 +538,7 @@ static block_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
         if( OpenAudio( p_dec ) )
         {
             /* Fatal */
-            atomic_store( &p_dec->b_error, true );
+            p_dec->b_error = true;
             return NULL;
         }
 
@@ -883,7 +883,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
         if( OpenVideo( p_dec ) )
         {
             /* Fatal */
-            atomic_store( &p_dec->b_error, true );
+            p_dec->b_error = true;
             return NULL;
         }
         p_sys = p_dec->p_sys;

diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index cfd87aa63972d10bb52e0573bd94215f3a3b7e10..e17cac11e4640c5c964175dbd1238cc627275356 100644 (file)
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -1057,7 +1057,7 @@ static block_t *PacketizeStreamBlock(decoder_t *p_dec, block_t **pp_block)
 
         p_out_buffer = block_Alloc(p_sys->i_frame_size);
         if (!p_out_buffer) {
-            //atomic_store( &p_dec->b_error, true );
+            //p_dec->b_error = true;
             return NULL;
         }
         p_buf = p_out_buffer->p_buffer;

diff --git a/src/input/control.c b/src/input/control.c
index 4003a3f66330af16f040243384a0cee25d2953a9..a4b2842cf369c6c08c181d9179050c092002e0cd 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -36,7 +36,6 @@
 #include "resource.h"
 #include "es_out.h"
 
-typedef enum input_es_state_e input_es_state_e;
 
 static void UpdateBookmarksOption( input_thread_t * );
 
@@ -495,24 +494,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             return es_out_ControlModifyPcrSystem( p_input->p->p_es_out_display, b_absolute, i_system );
         }
 
-        case INPUT_GET_ES_STATE:
-        {
-            int i_cat = (int)va_arg( args, int );
-            input_es_state_e *pi_state = (input_es_state_e *)va_arg( args, input_es_state_e* );
-
-            bool b_selected = false, b_error = false;
-            int ret = es_out_GetEsState( p_input->p->p_es_out_display, i_cat, &b_selected, &b_error);
-            if (ret != VLC_SUCCESS)
-            {
-                *pi_state = INPUT_ES_STATE_DISABLED;
-                return VLC_EGENERIC;
-            }
-
-            *pi_state = b_error ? INPUT_ES_STATE_ERROR :
-                               ( b_selected ? INPUT_ES_STATE_ENABLED : INPUT_ES_STATE_DISABLED );
-            return ret;
-        }
-
         default:
             msg_Err( p_input, "unknown query in input_vaControl" );
             return VLC_EGENERIC;
@@ -573,3 +554,4 @@ static void UpdateBookmarksOption( input_thread_t *p_input )
 
     input_SendEventBookmark( p_input );
 }
+

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 1a776908c9a1c5edf4907446750be30f16ba316c..46129fc9c2071ce1b847f9c825abe6f134f05429 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -729,8 +729,6 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
     p_dec->pf_get_cc = NULL;
     p_dec->pf_packetize = NULL;
 
-    atomic_init( &p_dec->b_error, false );
-
     /* Initialize the decoder */
     p_dec->p_module = NULL;
 
@@ -1536,7 +1534,7 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block )
             {
                 msg_Err( p_dec, "cannot create packetizer output (%4.4s)",
                          (char *)&p_owner->sout.i_codec );
-                atomic_store( &p_dec->b_error, true );
+                p_dec->b_error = true;
 
                 block_ChainRelease(p_sout_block);
                 break;
@@ -1760,7 +1758,7 @@ static void DecoderProcess( decoder_t *p_dec, block_t *p_block )
     decoder_owner_sys_t *p_owner = (decoder_owner_sys_t *)p_dec->p_owner;
     const bool b_flush_request = p_block && (p_block->i_flags & BLOCK_FLAG_CORE_FLUSH);
 
-    if( atomic_load( &p_dec->b_error ) )
+    if( p_dec->b_error )
     {
         if( p_block )
             block_Release( p_block );
@@ -1812,7 +1810,7 @@ static void DecoderProcess( decoder_t *p_dec, block_t *p_block )
         else
         {
             msg_Err( p_dec, "unknown ES format" );
-            atomic_store( &p_dec->b_error, true );
+            p_dec->b_error = true;
         }
     }
 
@@ -2024,7 +2022,7 @@ static int aout_update_format( decoder_t *p_dec )
         if( p_aout == NULL )
         {
             msg_Err( p_dec, "failed to create audio output" );
-            atomic_store( &p_dec->b_error, true );
+            p_dec->b_error = true;
             return -1;
         }
 
@@ -2157,7 +2155,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
         if( p_vout == NULL )
         {
             msg_Err( p_dec, "failed to create video output" );
-            atomic_store( &p_dec->b_error, true );
+            p_dec->b_error = true;
             return NULL;
         }
     }
@@ -2166,7 +2164,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
      */
     for( ;; )
     {
-        if( DecoderIsExitRequested( p_dec ) || atomic_load( &p_dec->b_error ) )
+        if( DecoderIsExitRequested( p_dec ) || p_dec->b_error )
             return NULL;
 
         picture_t *p_picture = vout_GetPicture( p_owner->p_vout );
@@ -2212,7 +2210,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec,
 
     while( i_attempts-- )
     {
-        if( DecoderIsExitRequested( p_dec ) || atomic_load( &p_dec->b_error ) )
+        if( DecoderIsExitRequested( p_dec ) || p_dec->b_error )
             break;
 
         p_vout = input_resource_HoldVout( p_owner->p_resource );

diff --git a/src/input/es_out.c b/src/input/es_out.c
index bbba71f9214b2ea8252247ac4a21eb2ac61ededb..b41460f79c0b75b3e0910d6a2160379cfbd5640e 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -247,6 +247,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
     p_sys->b_active = false;
     p_sys->i_mode   = ES_OUT_MODE_NONE;
 
+
     TAB_INIT( p_sys->i_pgrm, p_sys->pgrm );
 
     TAB_INIT( p_sys->i_es, p_sys->es );
@@ -297,33 +298,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
     return out;
 }
 
-int es_out_GetEsState( es_out_t *out, const int i_cat, bool *b_selected, bool *b_error)
-{
-    if( !out && !out->p_sys )
-        return VLC_EGENERIC;
-
-    es_out_id_t *p_es;
-    switch( i_cat )
-    {
-        case VIDEO_ES:
-            p_es = out->p_sys->p_es_video;
-            break;
-        case AUDIO_ES:
-            p_es = out->p_sys->p_es_audio;
-            break;
-        case SPU_ES:
-            p_es = out->p_sys->p_es_sub;
-            break;
-        default:
-            p_es = NULL;
-            return VLC_EGENERIC;
-    }
-    if( !p_es )
-        return VLC_EGENERIC;
-
-    return es_out_Control( out, ES_OUT_GET_ES_STATE, p_es, b_selected, b_error );
-}
-
 /*****************************************************************************
  *
  *****************************************************************************/
@@ -618,6 +592,8 @@ static void EsOutChangePosition( es_out_t *out )
     p_sys->i_preroll_end = -1;
 }
 
+
+
 static void EsOutDecodersStopBuffering( es_out_t *out, bool b_forced )
 {
     es_out_sys_t *p_sys = out->p_sys;
@@ -1594,7 +1570,6 @@ static void EsCreateDecoder( es_out_t *out, es_out_id_t *p_es )
 
     EsOutDecoderChangeDelay( out, p_es );
 }
-
 static void EsDestroyDecoder( es_out_t *out, es_out_id_t *p_es )
 {
     VLC_UNUSED(out);
@@ -2157,10 +2132,8 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
     {
         es_out_id_t *es = va_arg( args, es_out_id_t * );
         bool *pb = va_arg( args, bool * );
-        bool *pb_error = va_arg( args, bool *);
 
         *pb = EsIsSelected( es );
-        *pb_error = (es->p_dec ? atomic_load( &es->p_dec->b_error ) : false);
         return VLC_SUCCESS;
     }
 
@@ -2723,7 +2696,6 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
         return VLC_EGENERIC;
     }
 }
-
 static int EsOutControl( es_out_t *out, int i_query, va_list args )
 {
     es_out_sys_t *p_sys = out->p_sys;

diff --git a/src/input/es_out.h b/src/input/es_out.h
index b817adaa15bf9ab81f7f7d98858b01741912d94a..56cefed7c99acf5898d9a7064b1ee3dac50f5449 100644 (file)
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -168,8 +168,6 @@ static inline void es_out_Eos( es_out_t *p_out )
     assert( !i_ret );
 }
 
-int es_out_GetEsState( es_out_t *p_out, const int i_cat, bool *b_selected, bool *b_error);
-
 es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
 
 #endif

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 92b9d904eec161e444f5d48cf1df664160ddf728..c12d73ad496dd7e8313fa4c7809ace09a64c02c2 100644 (file)
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -623,15 +623,13 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
     {
         es_out_id_t *p_es = (es_out_id_t*)va_arg( args, es_out_id_t * );
         bool *pb_enabled = (bool*)va_arg( args, bool* );
-        bool *pb_error = (bool*)va_arg( args, bool* );
 
         if( p_sys->b_delayed )
         {
             *pb_enabled = true;
             return VLC_SUCCESS;
         }
-        return es_out_Control( p_sys->p_out, ES_OUT_GET_ES_STATE, p_es->p_es,
-                               pb_enabled, pb_error );
+        return es_out_Control( p_sys->p_out, ES_OUT_GET_ES_STATE, p_es->p_es, pb_enabled );
     }
     /* Special internal input control */
     case ES_OUT_GET_EMPTY: