* fix author field of OSX info dialog

[vlc] / modules / codec / theora.c

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 70bd0750e436d653953efa510b61a599d48795b2..0353b0467ea3022a3cacc0a83fea140f4984f0f5 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -53,6 +53,11 @@ struct decoder_sys_t
     theora_comment   tc;                            /* theora comment header */
     theora_state     td;                   /* theora bitstream user comments */
 
+    /*
+     * Decoding properties
+     */
+    vlc_bool_t b_decoded_first_keyframe;
+
     /*
      * Common properties
      */
@@ -88,6 +93,8 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict );
   "of specifying a particular bitrate. This will produce a VBR stream." )
 
 vlc_module_begin();
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_VCODEC );
     set_description( _("Theora video decoder") );
     set_capability( "decoder", 100 );
     set_callbacks( OpenDecoder, CloseDecoder );
@@ -137,6 +144,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_dec->p_sys->b_packetizer = VLC_FALSE;
 
     p_sys->i_pts = 0;
+    p_sys->b_decoded_first_keyframe = VLC_FALSE;
 
     /* Set output properties */
     p_dec->fmt_out.i_cat = VIDEO_ES;
@@ -294,6 +302,12 @@ static int ProcessHeaders( decoder_t *p_dec )
             p_sys->ti.frame_width / p_sys->ti.frame_height;
     }
 
+    if( p_sys->ti.fps_numerator > 0 && p_sys->ti.fps_denominator > 0 )
+    {
+        p_dec->fmt_out.video.i_frame_rate = p_sys->ti.fps_numerator;
+        p_dec->fmt_out.video.i_frame_rate_base = p_sys->ti.fps_denominator;
+    }
+
     msg_Dbg( p_dec, "%dx%d %.02f fps video, frame content "
              "is %dx%d with offset (%d,%d)",
              p_sys->ti.width, p_sys->ti.height,
@@ -372,6 +386,14 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
     block_t *p_block = *pp_block;
     void *p_buf;
 
+    if( ( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY ) != 0 )
+    {
+        /* Don't send the the first packet after a discontinuity to
+         * theora_decode, otherwise we get purple/green display artifacts
+         * appearing in the video output */
+        return NULL;
+    }
+
     /* Date management */
     if( p_block->i_pts > 0 && p_block->i_pts != p_sys->i_pts )
     {
@@ -420,8 +442,20 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
 
     theora_decode_packetin( &p_sys->td, p_oggpacket );
 
-    /* Decode */
-    theora_decode_YUVout( &p_sys->td, &yuv );
+    /* Check for keyframe */
+    if( !(p_oggpacket->packet[0] & 0x80) /* data packet */ &&
+        !(p_oggpacket->packet[0] & 0x40) /* intra frame */ )
+        p_sys->b_decoded_first_keyframe = VLC_TRUE;
+
+    /* If we haven't seen a single keyframe yet, don't let Theora decode
+     * anything, otherwise we'll get display artifacts.  (This is impossible
+     * in the general case, but can happen if e.g. we play a network stream
+     * using a timed URL, such that the server doesn't start the video with a
+     * keyframe). */
+    if( p_sys->b_decoded_first_keyframe )
+        theora_decode_YUVout( &p_sys->td, &yuv );
+    else
+        return NULL;
 
     /* Get a new picture */
     p_pic = p_dec->pf_vout_buffer_new( p_dec );
@@ -595,7 +629,7 @@ static int OpenEncoder( vlc_object_t *p_this )
     p_sys->ti.frame_width = p_enc->fmt_in.video.i_width;
     p_sys->ti.frame_height = p_enc->fmt_in.video.i_height;
     p_sys->ti.offset_x = 0 /*frame_x_offset*/;
-    p_sys->ti.offset_y = 0/*frame_y_offset*/;
+    p_sys->ti.offset_y = 0 /*frame_y_offset*/;
 
     p_sys->i_width = p_sys->ti.width;
     p_sys->i_height = p_sys->ti.height;
@@ -614,9 +648,14 @@ static int OpenEncoder( vlc_object_t *p_this )
 
     if( p_enc->fmt_in.video.i_aspect )
     {
-        p_sys->ti.aspect_numerator =
-            p_enc->fmt_in.video.i_aspect * p_sys->ti.height / p_sys->ti.width;
-        p_sys->ti.aspect_denominator = VOUT_ASPECT_FACTOR;
+        int64_t i_num, i_den;
+        int i_dst_num, i_dst_den;
+
+        i_num = p_enc->fmt_in.video.i_aspect * (int64_t)p_sys->ti.height;
+        i_den = VOUT_ASPECT_FACTOR * p_sys->ti.width;
+        vlc_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
+        p_sys->ti.aspect_numerator = i_dst_num;
+        p_sys->ti.aspect_denominator = i_dst_den;
     }
     else
     {