summaryrefslogtreecommitdiffstats
path: root/libmpdemux/muxer_mpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* typo fix: inited --> initializeddiego2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Put bff_mask into muxer context instead of a global variable.reimar2008-01-131-6/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25748 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function write_psm_block(), fixes the warning:diego2007-11-211-19/+0
| | | | | | | muxer_mpeg.c:763: warning: 'write_psm_block' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25126 b3059339-0415-0410-9bf9-f77b7e298cf2
* prevent unlikely memleaknicodvb2007-11-021-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24938 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, priv->use_psm can be 1 only if the format is genmpeg2nicodvb2007-11-021-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24937 b3059339-0415-0410-9bf9-f77b7e298cf2
* add streams to the PSM only if priv->use_psm is set, otherwise the muxer wouldnicodvb2007-11-021-1/+1
| | | | | | | write the map also for ordinary mpeg audio and video streams (wasting space) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24936 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to fix_parameters() the decision of the necessity of the PSM based on ↵nicodvb2007-11-021-2/+3
| | | | | | the format of the video stream git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24935 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed no more needed variablenicodvb2007-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24934 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to fix_parameters() the code that decides if the PSM is needednicodvb2007-11-021-11/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24933 b3059339-0415-0410-9bf9-f77b7e298cf2
* repeat the PSM once every second (in terms of delta_scr) otherwise playing ↵nicodvb2007-11-021-0/+23
| | | | | | the file from the middle would miss the first instance git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24932 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove the registration descriptor from the PSM: writing the fourcc in it ↵nicodvb2007-11-021-7/+2
| | | | | | makes it total crap git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24931 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100% cosmetics: reformatted with tabs and symmetric braces and removed ↵nicodvb2007-11-021-319/+324
| | | | | | useless braces and trailing tabs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24930 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed bug introduced with previous commit: patch_panscan() must work in the ↵nicodvb2007-09-281-1/+1
| | | | | | sequence_display_extension, not on se_ptr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24651 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l, the tff flag was never cleared before being overwritten with the ↵nicodvb2007-09-281-2/+4
| | | | | | | | | | | value on bff_mask; also, the sequence extension pointer was set to point to the sequence_display_extension, so the progressive_sequence was never set and the sde was being corrupted patch by Christopher Montgomery (xhiphmont xiph org) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24650 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use proper PRI?64 format stringsreimar2007-06-241-5/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23657 b3059339-0415-0410-9bf9-f77b7e298cf2
* added :interleaving2, a better method to determine which stream whouls be ↵nicodvb2007-04-081-0/+14
| | | | | | | | | | flushed at every iteration of the loop (based on the lowest percentage of buffer used - same algo as libavformat) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22947 b3059339-0415-0410-9bf9-f77b7e298cf2
* in mpegfile_write_header(only for mpeg1/2) don't overwrite the values of ↵nicodvb2007-04-081-10/+0
| | | | | | bufsize with dwSuggestedBufferSize (those values are completely invented) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22945 b3059339-0415-0410-9bf9-f77b7e298cf2
* reindentationnicodvb2007-04-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22944 b3059339-0415-0410-9bf9-f77b7e298cf2
* in the system header set audio_locked/video_locked only for dvd and vcdnicodvb2007-04-081-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22943 b3059339-0415-0410-9bf9-f77b7e298cf2
* small syntax fix: muxrate is expressed in units of 400 bits/second, not 50 ↵nicodvb2007-04-081-1/+1
| | | | | | bytes per second git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22942 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, the scr must be reset before overwriting the first pack with the ↵nicodvb2007-04-071-0/+3
| | | | | | correct system header (format=mpeg1|2) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22935 b3059339-0415-0410-9bf9-f77b7e298cf2
* reversed r22879 until I discover why it's giving so many sync problems; I'll ↵nicodvb2007-04-071-3/+24
| | | | | | eventually recommit it in a fixed form git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22927 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed init_apts and init_vpts; added :adelay in addition to :vdelaynicodvb2007-04-011-6/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22899 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: removed trailing spacesnicodvb2007-04-011-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22897 b3059339-0415-0410-9bf9-f77b7e298cf2
* in flush_buffers() removed code that required the presence of an amount of ↵nicodvb2007-04-011-24/+3
| | | | | | audio data >= video data in the temporal domain git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* 2 less variablesnicodvb2007-02-251-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22351 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: reformattednicodvb2007-02-251-65/+65
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22350 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variablesnicodvb2007-02-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22349 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplified parse_mpeg12_video()nicodvb2007-02-251-82/+72
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22348 b3059339-0415-0410-9bf9-f77b7e298cf2
* member real_framerate is completely uselessnicodvb2007-02-251-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22346 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: reindentednicodvb2007-02-251-10/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22341 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed commented/useless code from parse_mpeg12_video()nicodvb2007-02-251-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22340 b3059339-0415-0410-9bf9-f77b7e298cf2
* all options must be GLOBAL; patch by Trent Piepho (xyzzy speakeasy org)nicodvb2007-02-181-21/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22261 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a few gcc warnings, approved by Diego and Reimar.rathann2007-02-051-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxers now write to output muxer->stream rather than to muxer->filenicodvb2006-12-181-11/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
* align vbuf_size to the max value allowed by main profile @ high levelnicodvb2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-091-5/+5
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* disable telecining when it can't be appliednicodvb2006-12-041-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
* since display_frames in increased by a possibly negative number it had ↵nicodvb2006-12-041-1/+1
| | | | | | better be signed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmeticsnicodvb2006-12-041-16/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed dead codenicodvb2006-12-041-17/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
* reimplemented :telecine and :film2pal in terms of dgpulldownnicodvb2006-12-041-76/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
* pre-store in bff_mask the correct or-mask to be saved in the pce (slightly ↵nicodvb2006-12-041-5/+4
| | | | | | faster) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: wrong bitmask when patching the pce_ptr in soft_telecine()nicodvb2006-12-041-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
* added generalized teleciner by Donald Graftnicodvb2006-12-041-4/+61
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21483 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: anti-chaos reindentationnicodvb2006-12-031-15/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21464 b3059339-0415-0410-9bf9-f77b7e298cf2
* permit to specify the sizes of the decoders' buffersnicodvb2006-12-011-10/+41
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21429 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.diego2006-11-291-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
* permit muxing to raw pes (VDR uses this)nicodvb2006-11-211-5/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21157 b3059339-0415-0410-9bf9-f77b7e298cf2
* if no stream could be muxed flush_buffers() returns 0: prevents while(1) ↵nicodvb2006-10-221-0/+3
| | | | | | stall at the end git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20350 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove duplicate min/max macro definition.diego2006-10-111-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20159 b3059339-0415-0410-9bf9-f77b7e298cf2
* forgotten to pass the crc32 be2me_32()nicodvb2006-09-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19643 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variables, patch by Stefan Huehner stefan at huehner org.diego2006-07-081-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
* try to reduce the distance between consecutive frames with pts to no more ↵nicodvb2006-06-181-1/+1
| | | | | | than 0.4 seconds (required by dvds) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18754 b3059339-0415-0410-9bf9-f77b7e298cf2
* prevent buffer overflow in the STD; simplified fill_packet() (moving part of ↵nicodvb2006-06-181-87/+111
| | | | | | the code to get_packet_stats()) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18748 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-1/+13
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed more unused stuffnicodvb2006-04-241-7/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18250 b3059339-0415-0410-9bf9-f77b7e298cf2
* when muxing mpeg audio streams analyze the first 32 KB of data to obtain the ↵nicodvb2006-04-241-3/+51
| | | | | | 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
* simplified parse_audio()nicodvb2006-04-241-72/+63
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18239 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed more unused code and struct membersnicodvb2006-04-221-17/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18201 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variablesnicodvb2006-04-221-6/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18200 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved inline at beginning of declarationnicodvb2006-04-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18198 b3059339-0415-0410-9bf9-f77b7e298cf2
* finally replaced the old interleaving with the new one that respects ↵nicodvb2006-04-221-591/+137
| | | | | | 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
* introduced new functions to handle pack writing and interleaving strategy ↵nicodvb2006-04-221-0/+351
| | | | | | (will soon replace current ones) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18193 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed muxrates for xvcd and xsvcdnicodvb2006-04-221-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18188 b3059339-0415-0410-9bf9-f77b7e298cf2
* audio init code was previously moved to fix_parameters() so removed from ↵nicodvb2006-04-221-18/+0
| | | | | | write_chunk() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18187 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduced structures and code to keep track of decoder's buffers sizesnicodvb2006-04-221-0/+88
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18184 b3059339-0415-0410-9bf9-f77b7e298cf2
* new code to simplify assignment of timestamps; removed temp_ref from ↵nicodvb2006-04-221-258/+133
| | | | | | 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
* removed useless (and broken as hell) buffering code from muxer1; buffering ↵nicodvb2006-04-201-42/+1
| | | | | | 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
* removed skip_padding (never used and totally useless)nicodvb2006-04-201-11/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18166 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for DX50 and dx50 4CCsnicodvb2006-04-201-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18165 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed wrong operator precedence in parse_mpeg4_video()nicodvb2006-04-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18164 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplified code to patch the video framerate (removed silly comparisons)nicodvb2006-04-201-11/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18163 b3059339-0415-0410-9bf9-f77b7e298cf2
* changed timebase from 1024 to 300 (no rounding errors with any of the ↵nicodvb2006-04-201-73/+55
| | | | | | 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
* workaround to prevent segfault: when using -ve lavc with b-frames ↵nicodvb2006-04-051-0/+2
| | | | | | 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
* dereference muxer->priv only after having checked muxer!=NULL in ↵nicodvb2006-03-111-1/+2
| | | | | | write_chunk(