summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29412Uoti Urpala2009-07-0711-44/+53
|\
| * Print information about chapters with -identify.reimar2009-06-281-0/+7
| | | | | | | | | | | | | | Patch by Adrian Stutz [adrian sttz ch] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29408 b3059339-0415-0410-9bf9-f77b7e298cf2
| * AVStream.language is deprecated, switch to av_get_metadata instead.reimar2009-06-241-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29386 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move allocation to avoid a possible memleak if new_sh_audio fails.reimar2009-06-241-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29385 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless stream count checks, new_sh_* already checks for that.reimar2009-06-241-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29384 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontendsreimar2009-06-241-2/+6
| | | | | | | | | | | | | | can correctly display the languages of audio and subtitle tracks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29383 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation: codec_wav_tags/codec_bmp_tags were renamed toreimar2009-06-231-2/+2
| | | | | | | | | | | | | | ff_codec_wav_tags/ff_codec_bmp_tags. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29382 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move printing of ID_AID_???_LANG to ts_add_stream instead of ts_detect_streams.reimar2009-06-231-2/+4
| | | | | | | | | | | | | | This makes sure it is printed only once per track and after ID_AUDIO_ID. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29381 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Initialize es->lang to ensure a previous value does not get misattributedreimar2009-06-231-0/+1
| | | | | | | | | | | | | | to a different track. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29380 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove duplicate printing of ID_AUDIO_ID/ID_VIDEO_ID, those are alreadyreimar2009-06-211-2/+0
| | | | | | | | | | | | | | printed by the new_sh_... functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29378 b3059339-0415-0410-9bf9-f77b7e298cf2
| * TS demuxer: make the IDs used by DEMUXER_CTRL_SWITCH_* and ↵reimar2009-06-211-9/+4
| | | | | | | | | | | | | | | | | | DEMUXER_CTRL_IDENTIFY_PROGRAM match those printed as ID_VIDEO_ID/ID_AUDIO_ID and accepted with -vid/-aid git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29377 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add const where appropriate, also gets rid of a compiler warning.reimar2009-06-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29338 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, do not read probe buffer if it will not be used because a format was ↵reimar2009-06-011-6/+7
| | | | | | | | | | | | forced. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29337 b3059339-0415-0410-9bf9-f77b7e298cf2
| * In all demux_info_add calls change "name" to "title".reimar2009-05-307-7/+7
| | | | | | | | | | | | | | | | | | Currently "name" and "title" are both used at random, this makes it consistent. "title" was chosen because it is less ambiguous and also the get_meta_title slave mode command uses that (there is no get_meta_name command). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unify over rtsp_transport_tcp as var to hold the -rtsp-stream-over-tcp flag ↵lu_zero2009-05-251-3/+8
| | | | | | | | | | | | and make sure libnemesi only builds are fine git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29322 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-1358-1154/+1154
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-0761-1168/+1148
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-0764-146/+1210
|\|
| * Get rid of some more trailing whitespacereynaldo2009-05-121-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29298 b3059339-0415-0410-9bf9-f77b7e298cf2
| * chunk size = 0 is valid for DATA chunks (used in live streams), don't rtogni2009-05-101-1/+1
| | | | | | | | | | | | | | | | print warning message git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29289 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add standard license header to all files in libmpdemux.diego2009-05-0861-119/+1168
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace informal GPL license header by standard GPL header.diego2009-05-081-11/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29279 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace informal LGPL header by standard LGPL license header.diego2009-05-081-6/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29278 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-0723-153/+157
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-0723-152/+152
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r29277Uoti Urpala2009-05-082-3/+5
|\|
| * Add prototype for mp_a52_framesize().diego2009-05-051-0/+2
| | | | | | | | | | | | | | This fixes an implicit declaration warning when liba52 is disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29264 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libavformat is now the default for mov, update extension.c to match this.reimar2009-04-151-3/+3
| | | | | | | | | | | | | | | | Fixes direct playback of e.g. http://accent.gmu.edu/soundtracks/japanese7.mov which was played by the native demuxer (and that one is broken for it). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29181 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_lavf: Make absolute seek time 0-based instead of file startUoti Urpala2009-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | demux_lavf interpreted absolute seeks as relative to the start of the file, so if the file didn't start at timestamp 0 then seeking to timestamp X went to a position MPlayer would display as start+X. Make the seeks use the same timestamps as used in the original file. This works better for most use cases as no part of MPlayer normally uses or displays such "since start of file" timestamp values. There could be some cases where the old semantics are useful, but I think they do not justify making it the default behavior; a separate feature for that could be added if it turns out to be needed.
* | stheader.h: Allow inclusion before demuxer.hUoti Urpala2009-04-191-4/+5
| | | | | | | | | | | | stheader.h used 'demuxer_t *' without including demuxer.h, causing compilation to fail if demuxer.h had not been included first. Use 'struct demuxer *' instead so the type does not need to be defined.
* | Merge branch 'ordered_chapters'Uoti Urpala2009-04-086-253/+281
|\ \
| * | Support chapter seeking with ordered chaptersUoti Urpala2009-04-022-0/+2
| | |
| * | Change demuxer_seek_chapter() parametersUoti Urpala2009-04-022-57/+17
| | | | | | | | | | | | | | | | | | Remove the "num_chapters" and "mode" parameters that aren't needed by any callers. Change "float *seek_pts" to "double *". Allocate the string returned via "chapter_name" with talloc.
| * | demux_mkv: Remove first_tc and stop_timecodeUoti Urpala2009-04-021-33/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first_tc code was used to force timestamps in the file to start from 0. There should be no need to do this, and it would likely break ordered chapter support for any files it affected (since the chapter timecodes would refer to the original times, not the modified ones). stop_timecode was used to implement end of playback at a specified chapter. There is now common code which implements that and demuxer-specific implementations are not needed.
| * | demux_mkv: Adjust seeks a bit to catch inexact keyframe matchesUoti Urpala2009-04-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a seek to "time X or before" to match a keyframe at X plus 1 ms, and correspondingly for seeks to "X or later". This allows seeks to a known keyframe to succeed even if the time is not quite perfectly exact. The main motivation for this improvement was chapter seeking. Some time ago things worked in practice because chapter times were slightly below the exact target and demux_mkv seeked forward of the specified position by default. Some commits ago demux_mkv started seeking backward by default, which is generally a more desirable behavior, but worked worse for the chapter times which happened to be slightly behind a keyframe rather than ahead. After this commit chapter seeks go to the desired keyframe again.
| * | Add improved relative seek modeUoti Urpala2009-03-243-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the new mode is active relative seeks are converted to absolute ones (current video pts + relative seek amount) and forward/backward flag before being sent to the demuxer. This mode is used if the demuxer has set the accurate_seek field in the demuxer struct and there is a video stream. At the moment the mkv and lavf demuxers enable the flag. This change is useful for later Matroska ordered chapter support (and for more general timelime editing), but also fixes problems in existing functionality. The main problem with the old mode, where relative seeks are passed directly to the demuxer, is that the user wants to seek relative to the currently displayed position but the demuxer does not know what that position is. There can be an arbitrary amount of buffering between the demuxer read position and what is displayed on the screen. In some situations this makes small seeks fail to move backward at all (especially visible at high playback speed, when audio needs to be demuxed and decoded further ahead to fill the output buffers after resampling). Some container formats that can be used with the lavf demuxer do not always have reliable timestamps that could be used for unambiguous absolute seeking. However I made the demuxer always enable the new mode because it already converted all seeks to absolute ones before sending them to libavformat, so cases without reliable absolute seeks were failing already and this should only improve the working cases.
| * | demux_mkv: Parse ordered chapter informationUoti Urpala2009-03-223-3/+92
| | | | | | | | | | | | | | | | | | Parse the ordered chapter structure if present and place the information in the public demuxer structure. Nothing uses the information yet.
| * | Allocate struct demuxer with tallocUoti Urpala2009-03-212-4/+5
| | | | | | | | | | | | Makes it possible to add data to it without explicit freeing code.
| * | demux_mkv: Some cleanup, fix duration printed at verbose levelUoti Urpala2009-03-211-154/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up demux_mkv_read_info() and demux_mkv_read_chapters() somewhat. (Why do the names of static functions have a stupid prefix like that? Didn't remove it now however). Demux_mkv_read_info() now delays printing duration information until the end of the function where we hopefully have the correct timescale for converting it to seconds. The code to calculate the duration had been fixed for that earlier but the message had not.
* | | Merge svn changes up to r29134Uoti Urpala2009-04-023-4/+3
|\ \ \ | | |/ | |/|
| * | Remove unnecessary malloc.h #includes and related #ifdeffery.diego2009-04-021-4/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | override codec tag for pcm s32le and s32be, used in movbcoudurier2009-04-021-0/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29124 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add config.h #include, necessary for HAVE_MALLOC_H check.diego2009-04-011-0/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29123 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Increase probe buffer size to 32kB, this makes ac3 auto-detection far more ↵reimar2009-04-011-1/+1
| | | | | | | | | | | | | | | | | | reliable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29121 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r29117Uoti Urpala2009-04-014-1/+11
|\| | | |/ |/|
| * override lavf tag for pcm s24le, mov uses the same for s24bebcoudurier2009-03-301-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29110 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream isreimar2009-03-291-0/+4
| | | | | | | | | | | | | | | | created that matches the user-requested one. Fixes -slang and -sid with DVDs (anything that uses demux_mpg actually). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29095 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check for _WINGDI_ instead of _WINGDI_H before defining BITMAPINFOHEADERreimar2009-03-271-1/+1
| | | | | | | | | | | | since former works on both 32 and 64 bit MinGW git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29071 b3059339-0415-0410-9bf9-f77b7e298cf2
| * map jls (jpeg-ls), thm and db (thumbnails) files to jpgcompn2009-03-211-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29025 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28951Uoti Urpala2009-03-145-644/+0
|\|
| * Get rid of DEMUXER_TYPE_NUV define, it is no longer used.reimar2009-03-091-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28915 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of nuppelvideo.h and its ugly packed struct and instead write thereimar2009-03-091-80/+0
| | | | | | | | | | | | | | frame header directly in nuv encoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove now unused parts of nuppelvideo.hreimar2009-03-091-99/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28908 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove native nuv demuxer, it only needs more code to achieve the same thingreimar2009-03-092