diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-21 21:31:20 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-21 21:31:20 +0000 |
| commit | a5bd36cf4b999681d2077b9ffce26c9c4e158c1f (patch) | |
| tree | 564857c463cce4f59ebee20efbb4b9e6a53b2a15 /mencoder.c | |
| parent | 1dd16637fb3f63f630fd093b0276410ca9d53f95 (diff) | |
| download | mpv-a5bd36cf4b999681d2077b9ffce26c9c4e158c1f.tar.bz2 mpv-a5bd36cf4b999681d2077b9ffce26c9c4e158c1f.tar.xz | |
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
- multithreaded audio/video buffering (I know mplayer crew hates threads
but it seems to me as the only way of doing reliable a/v capture)
- a/v timebase synchronization (sample count vs. gettimeofday)
- "immediate" mode support for mplayer
- fixed colorspace stuff - RGB?? and YUY2 modes now work as expected
- native ALSA audio capture
- separated audio input layer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7059 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index 423e5dbf93..56e5411226 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1126,7 +1126,7 @@ if(sh_audio && !demuxer2){ if(verbose) { mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d] A/Vms %d/%d D/S %d/%d \r", mux_v->timer, decoded_frameno, (int)(p*100), - (t>1) ? (int)(decoded_frameno/t) : 0, + (t>1) ? (int)(decoded_frameno/t+0.5) : 0, (p>0.001) ? (int)((t/p-t)/60) : 0, (p>0.001) ? (int)(ftello(muxer_f)/p/1024/1024) : 0, v_pts_corr, @@ -1138,7 +1138,7 @@ if(sh_audio && !demuxer2){ } else mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d]\r", mux_v->timer, decoded_frameno, (int)(p*100), - (t>1) ? (int)(decoded_frameno/t) : 0, + (t>1) ? (int)(decoded_frameno/t+0.5) : 0, (p>0.001) ? (int)((t/p-t)/60) : 0, (p>0.001) ? (int)(ftell(muxer_f)/p/1024/1024) : 0, v_pts_corr, @@ -1187,6 +1187,8 @@ if(sh_audio && !demuxer2){ } // while(!at_eof) +if (demuxer) free_demuxer(demuxer); + #ifdef HAVE_MP3LAME // fixup CBR mp3 audio header: if(sh_audio && mux_a->codec==ACODEC_VBRMP3 && !lame_param_vbr){ |