Merge commit 'origin/1.0-bugfix'

Conflicts:

	modules/codec/dmo/dmo.c

diff --combined modules/codec/dmo/dmo.c
index fff44f6f40b9f3f3b8c406367eec3b8fc573eb4d,684d80ea9e36f23416121533235237025d6a14b9..3875791fee4ef84b9b57ec54e914d52eaee24326
--- 1/modules/codec/dmo/dmo.c
--- 2/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@@ -141,7 -141,9 +141,9 @@@ struct decoder_sys_
      vlc_cond_t   wait_input, wait_output;
      bool         b_ready, b_works;
      block_t    **pp_input;
-     void        *p_output;
+ 
+     int          i_output;
+     void       **pp_output;
  };
  
  const GUID IID_IWMCodecPrivateData = {0x73f0be8e, 0x57f7, 0x4f01, {0xaa, 0x66, 0x9f, 0x57, 0x34, 0xc, 0xfe, 0xe}};
@@@ -184,29 -186,44 +186,30 @@@ typedef struc
  static const codec_dll decoders_table[] =
  {
      /* WVC1 */
 -    { VLC_FOURCC('W','V','C','1'), "wvc1dmod.dll", &guid_wvc1 },
 -    { VLC_FOURCC('w','v','c','1'), "wvc1dmod.dll", &guid_wvc1 },
 +    { VLC_CODEC_VC1,    "wvc1dmod.dll", &guid_wvc1 },
      /* WMV3 */
 -    { VLC_FOURCC('W','M','V','3'), "wmv9dmod.dll", &guid_wmv9 },
 -    { VLC_FOURCC('w','m','v','3'), "wmv9dmod.dll", &guid_wmv9 },
 -    { VLC_FOURCC('W','M','V','P'), "wmv9dmod.dll", &guid_wmv9 },
 -    { VLC_FOURCC('w','m','v','p'), "wmv9dmod.dll", &guid_wmv9 },
 +    { VLC_CODEC_WMV3,   "wmv9dmod.dll", &guid_wmv9 },
      /* WMV2 */
 -    { VLC_FOURCC('W','M','V','2'), "wmvdmod.dll", &guid_wmv },
 -    { VLC_FOURCC('w','m','v','2'), "wmvdmod.dll", &guid_wmv },
 +    { VLC_CODEC_WMV2,   "wmvdmod.dll", &guid_wmv },
      /* WMV1 */
 -    { VLC_FOURCC('W','M','V','1'), "wmvdmod.dll", &guid_wmv },
 -    { VLC_FOURCC('w','m','v','1'), "wmvdmod.dll", &guid_wmv },
 +    { VLC_CODEC_WMV1,   "wmvdmod.dll", &guid_wmv },
      /* Screen codecs */
      { VLC_FOURCC('M','S','S','2'), "wmsdmod.dll", &guid_wms },
      { VLC_FOURCC('m','s','s','2'), "wmsdmod.dll", &guid_wms },
      { VLC_FOURCC('M','S','S','1'), "wmsdmod.dll", &guid_wms },
      { VLC_FOURCC('m','s','s','1'), "wmsdmod.dll", &guid_wms },
      /* Windows Media Video Adv */
 -    { VLC_FOURCC('W','M','V','A'), "wmvadvd.dll", &guid_wmva },
 -    { VLC_FOURCC('w','m','v','a'), "wmvadvd.dll", &guid_wmva },
 -    { VLC_FOURCC('W','V','P','2'), "wmvadvd.dll", &guid_wmva },
 -    { VLC_FOURCC('w','v','p','2'), "wmvadvd.dll", &guid_wmva },
 +    { VLC_CODEC_WMVA,   "wmvadvd.dll", &guid_wmva },
  
      /* WMA 3 */
 -    { VLC_FOURCC('W','M','A','3'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','3'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('W','M','A','P'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','p'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('W','M','A','L'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','l'), "wma9dmod.dll", &guid_wma9 },
 +    { VLC_CODEC_WMAP,   "wma9dmod.dll", &guid_wma9 },
 +    { VLC_CODEC_WMAL,   "wma9dmod.dll", &guid_wma9 },
++
      /* WMA 2 */
 -    { VLC_FOURCC('W','M','A','2'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','2'), "wma9dmod.dll", &guid_wma9 },
 +    { VLC_CODEC_WMA2,   "wma9dmod.dll", &guid_wma9 },
  
      /* WMA Speech */
 -    { VLC_FOURCC('W','M','A','S'), "wmspdmod.dll", &guid_wma },
 -    { VLC_FOURCC('w','m','a','s'), "wmspdmod.dll", &guid_wma },
 +    { VLC_CODEC_WMAS,   "wmspdmod.dll", &guid_wma },
  
      /* */
      { 0, NULL, NULL }
@@@ -215,16 -232,21 +218,16 @@@
  static const codec_dll encoders_table[] =
  {
      /* WMV3 */
 -    { VLC_FOURCC('W','M','V','3'), "wmvdmoe2.dll", &guid_wmv_enc2 },
 -    { VLC_FOURCC('w','m','v','3'), "wmvdmoe2.dll", &guid_wmv_enc2 },
 +    { VLC_CODEC_WMV3, "wmvdmoe2.dll", &guid_wmv_enc2 },
      /* WMV2 */
 -    { VLC_FOURCC('W','M','V','2'), "wmvdmoe2.dll", &guid_wmv_enc2 },
 -    { VLC_FOURCC('w','m','v','2'), "wmvdmoe2.dll", &guid_wmv_enc2 },
 +    { VLC_CODEC_WMV2, "wmvdmoe2.dll", &guid_wmv_enc2 },
      /* WMV1 */
 -    { VLC_FOURCC('W','M','V','1'), "wmvdmoe2.dll", &guid_wmv_enc2 },
 -    { VLC_FOURCC('w','m','v','1'), "wmvdmoe2.dll", &guid_wmv_enc2 },
 +    { VLC_CODEC_WMV1, "wmvdmoe2.dll", &guid_wmv_enc2 },
  
      /* WMA 3 */
 -    { VLC_FOURCC('W','M','A','3'), "wmadmoe.dll", &guid_wma_enc },
 -    { VLC_FOURCC('w','m','a','3'), "wmadmoe.dll", &guid_wma_enc },
 +    { VLC_CODEC_WMAP, "wmadmoe.dll", &guid_wma_enc },
      /* WMA 2 */
 -    { VLC_FOURCC('W','M','A','2'), "wmadmoe.dll", &guid_wma_enc },
 -    { VLC_FOURCC('w','m','a','2'), "wmadmoe.dll", &guid_wma_enc },
 +    { VLC_CODEC_WMA2, "wmadmoe.dll", &guid_wma_enc },
  
      /* */
      { 0, NULL, NULL }
@@@ -280,7 -302,7 +283,7 @@@ found
      p_sys->b_works =
      p_sys->b_ready = false;
      p_sys->pp_input = NULL;
-     p_sys->p_output = NULL;
+     TAB_INIT( p_sys->i_output, p_sys->pp_output );
  
      if( vlc_clone( &p_sys->thread, DecoderThread, p_dec,
                     VLC_THREAD_PRIORITY_INPUT ) )
@@@ -317,6 -339,7 +320,7 @@@ static void DecoderClose( vlc_object_t 
      vlc_mutex_unlock( &p_sys->lock );
  
      vlc_join( p_sys->thread, NULL );
+     TAB_CLEAN( p_sys->i_output, p_sys->pp_output );
      vlc_cond_destroy( &p_sys->wait_input );
      vlc_cond_destroy( &p_sys->wait_output );
      vlc_mutex_destroy( &p_sys->lock );
@@@ -329,12 -352,22 +333,22 @@@ static void *DecodeBlock( decoder_t *p_
      void *p_ret;
  
      vlc_mutex_lock( &p_sys->lock );
-     p_sys->pp_input = pp_block;
-     vlc_cond_signal( &p_sys->wait_input );
+     if( p_sys->i_output <= 0 )
+     {
+         p_sys->pp_input = pp_block;
+         vlc_cond_signal( &p_sys->wait_input );
+ 
+         while( p_sys->pp_input )
+             vlc_cond_wait( &p_sys->wait_output, &p_sys->lock );
+     }
+ 
+     p_ret = NULL;
+     if( p_sys->i_output > 0 )
+     {
+         p_ret = p_sys->pp_output[0];
+         TAB_REMOVE( p_sys->i_output, p_sys->pp_output, p_ret );
+     }
  
-     while( p_sys->pp_input )
-         vlc_cond_wait( &p_sys->wait_output, &p_sys->lock );
-     p_ret = p_sys->p_output;
      vlc_mutex_unlock( &p_sys->lock );
  
      return p_ret;
@@@ -385,7 -418,7 +399,7 @@@ static int DecOpen( decoder_t *p_dec 
  
          dmo_input_type.majortype  = MEDIATYPE_Audio;
          dmo_input_type.subtype    = dmo_input_type.majortype;
 -        dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_codec;
 +        dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec;
          fourcc_to_wf_tag( p_dec->fmt_in.i_codec, &i_tag );
          if( i_tag ) dmo_input_type.subtype.Data1 = i_tag;
  
@@@ -416,7 -449,7 +430,7 @@@
              memcpy( &p_vih[1], p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
  
          p_bih = &p_vih->bmiHeader;
 -        p_bih->biCompression = p_dec->fmt_in.i_codec;
 +        p_bih->biCompression = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec;
          p_bih->biWidth = p_dec->fmt_in.video.i_width;
          p_bih->biHeight = p_dec->fmt_in.video.i_height;
          p_bih->biBitCount = p_dec->fmt_in.video.i_bits_per_pixel;
@@@ -431,7 -464,7 +445,7 @@@
  
          dmo_input_type.majortype  = MEDIATYPE_Video;
          dmo_input_type.subtype    = dmo_input_type.majortype;
 -        dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_codec;
 +        dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec;
          dmo_input_type.formattype = FORMAT_VideoInfo;
          dmo_input_type.bFixedSizeSamples = 0;
          dmo_input_type.bTemporalCompression = 1;
@@@ -453,7 -486,7 +467,7 @@@
      if( p_dec->fmt_in.i_cat == AUDIO_ES )
      {
          /* Setup the format */
 -        p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
 +        p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
          p_dec->fmt_out.audio.i_rate     = p_dec->fmt_in.audio.i_rate;
          p_dec->fmt_out.audio.i_channels = p_dec->fmt_in.audio.i_channels;
          p_dec->fmt_out.audio.i_bitspersample = 16;//p_dec->fmt_in.audio.i_bitspersample; We request 16
@@@ -484,14 -517,14 +498,14 @@@
      {
          BITMAPINFOHEADER *p_bih;
          DMO_MEDIA_TYPE mt;
 -        unsigned i_chroma = VLC_FOURCC('Y','U','Y','2');
 +        unsigned i_chroma = VLC_CODEC_YUYV;
          int i_planes = 1, i_bpp = 16;
          int i = 0;
  
          /* Find out which chroma to use */
          while( !p_dmo->vt->GetOutputType( p_dmo, 0, i++, &mt ) )
          {
 -            if( mt.subtype.Data1 == VLC_FOURCC('Y','V','1','2') )
 +            if( mt.subtype.Data1 == VLC_CODEC_YV12 )
              {
                  i_chroma = mt.subtype.Data1;
                  i_planes = 3; i_bpp = 12;
@@@ -500,8 -533,8 +514,8 @@@
              DMOFreeMediaType( &mt );
          }
  
 -        p_dec->fmt_out.i_codec = i_chroma == VLC_FOURCC('Y','V','1','2') ?
 -            VLC_FOURCC('I','4','2','0') : i_chroma;
 +        p_dec->fmt_out.i_codec = i_chroma == VLC_CODEC_YV12 ?
 +            VLC_CODEC_I420 : i_chroma;
          p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width;
          p_dec->fmt_out.video.i_height = p_dec->fmt_in.video.i_height;
          p_dec->fmt_out.video.i_bits_per_pixel = i_bpp;
@@@ -663,7 -696,7 +677,7 @@@ static int LoadDMO( vlc_object_t *p_thi
          uint16_t i_tag;
          dmo_partial_type.type = MEDIATYPE_Audio;
          dmo_partial_type.subtype = dmo_partial_type.type;
 -        dmo_partial_type.subtype.Data1 = p_fmt->i_codec;
 +        dmo_partial_type.subtype.Data1 = p_fmt->i_original_fourcc ?: p_fmt->i_codec;
          fourcc_to_wf_tag( p_fmt->i_codec, &i_tag );
          if( i_tag ) dmo_partial_type.subtype.Data1 = i_tag;
      }
@@@ -671,7 -704,7 +685,7 @@@
      {
          dmo_partial_type.type = MEDIATYPE_Video;
          dmo_partial_type.subtype = dmo_partial_type.type;
 -        dmo_partial_type.subtype.Data1 = p_fmt->i_codec;
 +        dmo_partial_type.subtype.Data1 = p_fmt->i_original_fourcc ?: p_fmt->i_codec;
      }
  
  #ifndef LOADER
@@@ -1022,7 -1055,13 +1036,13 @@@ static void *DecoderThread( void *data 
          if( !p_sys->b_ready )
              break;
  
-         p_sys->p_output = DecBlock( p_dec, p_sys->pp_input );
+         for( ;; )
+         {
+             void *p_output = DecBlock( p_dec, p_sys->pp_input );
+             if( !p_output )
+                 break;
+             TAB_APPEND( p_sys->i_output, p_sys->pp_output, p_output );
+         }
          p_sys->pp_input = NULL;
          vlc_cond_signal( &p_sys->wait_output );
      }
@@@ -1104,7 -1143,7 +1124,7 @@@ static int EncoderSetVideoType( encoder
      memset( &vih, 0, sizeof(VIDEOINFOHEADER) );
  
      p_bih = &vih.bmiHeader;
 -    p_bih->biCompression = VLC_FOURCC('I','4','2','0');
 +    p_bih->biCompression = VLC_CODEC_I420;
      p_bih->biWidth = p_enc->fmt_in.video.i_width;
      p_bih->biHeight = p_enc->fmt_in.video.i_height;
      p_bih->biBitCount = p_enc->fmt_in.video.i_bits_per_pixel;
@@@ -1219,7 -1258,7 +1239,7 @@@
      i_err = p_dmo->vt->SetOutputType( p_dmo, 0, &dmo_type, 0 );
  
      p_vih = (VIDEOINFOHEADER *)dmo_type.pbFormat;
 -    p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0');
 +    p_enc->fmt_in.i_codec = VLC_CODEC_I420;
  
      DMOFreeMediaType( &dmo_type );
      if( i_err )
@@@ -1247,7 -1286,7 +1267,7 @@@ static int EncoderSetAudioType( encoder
      fourcc_to_wf_tag( p_enc->fmt_out.i_codec, &i_tag );
      if( i_tag == 0 ) return VLC_EGENERIC;
  
 -    p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
 +    p_enc->fmt_in.i_codec = VLC_CODEC_S16N;
      p_enc->fmt_in.audio.i_bitspersample = 16;
  
      /* We first need to choose an output type from the predefined

diff --combined src/input/input.c
index 542f1295a3c2fe3d0055a1debc3686b575386597,cfb306575a9ae015abc31eb3135a6a33b46de8f7..119b41c730b2272c96b20e741320ae8faad7cb30
--- 1/src/input/input.c
--- 2/src/input/input.c
+++ b/src/input/input.c
@@@ -1203,9 -1203,7 +1203,9 @@@ static int Init( input_thread_t * p_inp
          i_length = 0;
      if( i_length <= 0 )
          i_length = input_item_GetDuration( p_input->p->p_item );
 -    input_SendEventTimes( p_input, 0.0, 0, i_length );
 +    input_SendEventLength( p_input, i_length );
 +
 +    input_SendEventPosition( p_input, 0.0, 0 );
  
      if( !p_input->b_preparsing )
      {
@@@ -2435,7 -2433,7 +2435,7 @@@ static int InputSourceInit( input_threa
              in->b_can_pause = false;
          var_SetBool( p_input, "can-pause", in->b_can_pause || !in->b_can_pace_control ); /* XXX temporary because of es_out_timeshift*/
          var_SetBool( p_input, "can-rate", !in->b_can_pace_control || in->b_can_rate_control ); /* XXX temporary because of es_out_timeshift*/
-         var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control );
+         var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control && in->b_can_rate_control );
  
          bool b_can_seek;
          if( demux_Control( in->p_demux, DEMUX_CAN_SEEK, &b_can_seek ) )