1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 04:15:13 +00:00
Commit Graph

68 Commits

Author SHA1 Message Date
nicodvb
a5d54eea12 if no stream could be muxed flush_buffers() returns 0: prevents while(1) stall at the end
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20350 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-22 10:32:59 +00:00
diego
155d28bf01 Remove duplicate min/max macro definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20159 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 15:28:54 +00:00
nicodvb
549b7f03c8 forgotten to pass the crc32 be2me_32()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19643 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:00:30 +00:00
diego
a356cbcc01 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 17:28:36 +00:00
nicodvb
01526d08f8 try to reduce the distance between consecutive frames with pts to no more than 0.4 seconds (required by dvds)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18754 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-18 16:40:29 +00:00
nicodvb
d79d8b2ea4 prevent buffer overflow in the STD; simplified fill_packet() (moving part of the code to get_packet_stats())
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18748 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-18 10:39:09 +00:00
rtogni
9da9317579 Fix potential integer overflows in memory allocation.
Patch by Rich and me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:41:27 +00:00
nicodvb
2bea0ef1dd removed more unused stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18250 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 14:23:03 +00:00
nicodvb
ac1506c8b3 when muxing mpeg audio streams analyze the first 32 KB of data to obtain the most likely correct layer, otherwise every misdetection during parse_audio() will lead to wrong timestamps and loss of synchrony
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18249 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 14:04:10 +00:00
nicodvb
538ae3dd8c simplified parse_audio()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18239 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 09:48:57 +00:00
nicodvb
e48466f86c removed more unused code and struct members
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18201 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 18:15:23 +00:00
nicodvb
d78862db6a removed unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18200 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 18:02:19 +00:00
nicodvb
bf75c942fc moved inline at beginning of declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18198 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 17:55:39 +00:00
nicodvb
1733f0847a finally replaced the old interleaving with the new one that respects buffering and [pd]ts<->scr constraints; don't check spriv->framebuf_used in find_best_stream()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18197 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 17:47:53 +00:00
nicodvb
168e6e1daf introduced new functions to handle pack writing and interleaving strategy (will soon replace current ones)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18193 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 15:41:16 +00:00
nicodvb
37dae9ebcb fixed muxrates for xvcd and xsvcd
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18188 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 13:31:05 +00:00
nicodvb
6ba9d6ce20 audio init code was previously moved to fix_parameters() so removed from write_chunk()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18187 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 13:25:46 +00:00
nicodvb
2c06ca54a2 introduced structures and code to keep track of decoder's buffers sizes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18184 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 13:18:32 +00:00
nicodvb
f86a32a270 new code to simplify assignment of timestamps; removed temp_ref from mpeg_frame_t and modified add_frame() accordingly; removed no more used drop_delayed_audio() and save_delayed_audio()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18182 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 13:05:01 +00:00
nicodvb
26b3c3f9ca removed useless (and broken as hell) buffering code from muxer1; buffering constraints will be fully respected when one of the forthcoming patches is applied
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18167 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-20 21:40:03 +00:00
nicodvb
280b8e3875 removed skip_padding (never used and totally useless)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18166 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-20 20:53:48 +00:00
nicodvb
a160c8687f added support for DX50 and dx50 4CCs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18165 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-20 20:48:55 +00:00
nicodvb
aa0de16882 fixed wrong operator precedence in parse_mpeg4_video()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18164 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-20 20:44:43 +00:00
nicodvb
471dc6e589 simplified code to patch the video framerate (removed silly comparisons)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18163 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-20 20:38:09 +00:00
nicodvb
1cbc74c755 changed timebase from 1024 to 300 (no rounding errors with any of the allowed framerates); write scr_extension accordingly. This is the first of a long series of patches to rewrite the muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18162 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-20 20:32:36 +00:00
nicodvb
ecdfed5122 workaround to prevent segfault: when using -ve lavc with b-frames write_chunk(1st video frame) gets called with len=-1UL; -1ULl to whomever calls me that way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18045 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-05 20:51:35 +00:00
nicodvb
a8ea2c96c9 dereference muxer->priv only after having checked muxer!=NULL in write_chunk(); closes cid 206
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17819 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-11 23:38:54 +00:00
nicodvb
c8ceab9843 init delta_pts before using it; fixes cid 239
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17816 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-11 23:21:09 +00:00
nicodvb
a30246e193 check pce_ptr before using it; fixes cid 207
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17815 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-11 23:15:57 +00:00
nicodvb
e7275c7781 delay rff by 6, not 3 frames, so the rff will be in the middle of the 12 frames sequence
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17604 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 11:47:36 +00:00
nicodvb
ea0696a999 experimental film2pal and ntsc2pal soft teleciner
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17601 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 11:04:12 +00:00
nicodvb
574d5451fe init frame duration to 1/fps when we have a frame but not the enclosing sequence header: it's workaround against lavf's demuxer that doesn't sync to seq_hdr unlike mplayer's native demuxers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17592 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-11 21:45:42 +00:00
nicodvb
ff5e9324bb tff wasn't correctly unset in soft_telecine()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17584 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-10 22:28:32 +00:00
nicodvb
17102bc24c removed unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17541 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-06 21:22:30 +00:00
nicodvb
6f759b4d40 fixed wrong delta_frame calculation that would affect soft-telecine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17540 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-06 20:59:19 +00:00
nicodvb
2b3fe64e58 removed forgotten fprintf()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17519 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-30 21:18:53 +00:00
nicodvb
783976c512 use mp_a52_framesize() when liba52 is not available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17494 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-27 23:07:53 +00:00
michael
e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-26 19:32:07 +00:00
rathann
2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
nicodvb
c28b22845c removed previously forgotten reording options/flags
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17302 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-03 22:14:27 +00:00
nicodvb
a5092cfa00 removed broken frame reording code; unified audio and video frame storing code (in memory, not in the packets); simple workaround to handle non-standard framerate mpeg1/2 video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17299 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-03 22:02:11 +00:00
nicodvb
c00dfe452b simplification: don't use residual_buffer, but prepend remainder of current frame to next one (needed for future work; init frame->pos to 0 in reorder_frame(); fix: don't go beyond last frame in flush_buffer()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17272 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-30 18:46:56 +00:00
rathann
9d4d23cad6 fix
muxer_mpeg.c:2315: warning: implicit declaration of function 'mp_get_mp3_header'
muxer_mpeg.c:2339: warning: implicit declaration of function 'a52_syncinfo'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17092 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-05 01:26:09 +00:00
nicodvb
6ac24fccd8 fixed wrong telecine trf pattern; fall back to mpeg2 when user specifies unknown format
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17067 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-30 21:45:32 +00:00
reynaldo
2ae5a0788d Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17066 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-29 22:04:57 +00:00
nicodvb
7a8f8317fd buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17024 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-21 22:53:14 +00:00
diego
36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
reimar
169416fd51 Use PRI?64 defines as format strings for 64 bit variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 18:33:56 +00:00
rfelker
5c416790ce reconcile with earlier fps fix in mpeg header parser
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16193 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-10 01:42:06 +00:00
reimar
1da3dc91bd set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
decoder sets it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16163 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-01 18:36:50 +00:00