[vlc-commits] avformat mux: use some default values and add debug

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Feb 19 19:50:00 2014 +0100| [535cb1f31d1e031e557db661b4c33c524d0ba24c] | committer: Rafaël Carré

avformat mux: use some default values and add debug

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=535cb1f31d1e031e557db661b4c33c524d0ba24c
---

 modules/demux/avformat/mux.c |   22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 7702bab..0501e98 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -224,16 +224,23 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         codec->sample_rate = fmt->audio.i_rate;
         codec->time_base = (AVRational){1, codec->sample_rate};
         codec->frame_size = fmt->audio.i_frame_length;
+        if (fmt->i_bitrate == 0) {
+            msg_Warn( p_mux, "Missing audio bitrate, assuming 64k" );
+            fmt->i_bitrate = 64000;
+        }
         break;
 
     case VIDEO_ES:
-        if( !fmt->video.i_frame_rate ||
-            !fmt->video.i_frame_rate_base )
-        {
+        if( !fmt->video.i_frame_rate || !fmt->video.i_frame_rate_base ) {
             msg_Warn( p_mux, "Missing frame rate, assuming 25fps" );
             fmt->video.i_frame_rate = 25;
             fmt->video.i_frame_rate_base = 1;
-        }
+        } else
+            msg_Dbg( p_mux, "Muxing framerate will be %d/%d = %.2f fps",
+                    fmt->video.i_frame_rate,
+                    fmt->video.i_frame_rate_base,
+                    (double)fmt->video.i_frame_rate/(double)fmt->video.i_frame_rate_base );
+
         codec->codec_type = AVMEDIA_TYPE_VIDEO;
         codec->width = fmt->video.i_width;
         codec->height = fmt->video.i_height;
@@ -241,10 +248,17 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
                    &codec->sample_aspect_ratio.den,
                    fmt->video.i_sar_num,
                    fmt->video.i_sar_den, 1 << 30 /* something big */ );
+        msg_Dbg(p_mux, "Muxing aspect ratio will be %d/%d",
+                fmt->video.i_sar_num, fmt->video.i_sar_den);
         stream->sample_aspect_ratio.den = codec->sample_aspect_ratio.den;
         stream->sample_aspect_ratio.num = codec->sample_aspect_ratio.num;
         codec->time_base.den = fmt->video.i_frame_rate;
         codec->time_base.num = fmt->video.i_frame_rate_base;
+        if (fmt->i_bitrate == 0) {
+            msg_Warn( p_mux, "Missing video bitrate, assuming 512k" );
+            fmt->i_bitrate = 512000;
+        } else
+            msg_Dbg( p_mux, "Muxing video bitrate will be %d", fmt->i_bitrate );
         break;
 
     }