Commit Graph

46 Commits

Author SHA1 Message Date
mplayer-svn f200c85906 demux_mf: add j2c and jpc as jpeg2k, add tiff extension as tif image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34587 b3059339-0415-0410-9bf9-f77b7e298cf2

demux_mf: add JPS/PNS image formats

add jps / pns image formats, sync'd from ffmpeg
samples: http://i2.i-2000.com/~siragusa/jpsvpns/data/

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34642 b3059339-0415-0410-9bf9-f77b7e298cf2

Author: compn
2012-08-03 01:43:44 +02:00
Uoti Urpala 8079f4ff82 demux, vd_ffmpeg: fix demux keyframe flag, set AV_PKT_FLAG_KEY
There was some confusion about the "flags" field in demuxer packets.
Demuxers set it to either 1 or 0x10 to indicate a keyframe (and the
field was not used to indicate anything else). This didn't cause
visible problems because nothing read the value. Replace the "flags"
field with a boolean "keyframe" field. Set AV_PKT_FLAG_KEY based on
this field in packets fed to libavcodec video decoders (looks like PNG
and ZeroCodec are the only ones which depend on values from demuxer;
previously this was hardcoded to true for PNG).

Make demux_mf set the keyframe field in every packet. This matters for
PNG files now that the demuxer flag is forwarded to libavcodec.

Fix logic setting the field in demux_mkv. It had probably not been
updated when adding SimpleBlock support. This probably makes no
difference for any current practical use.
2012-07-25 01:10:30 +03:00
wm4 a1244111a7 windows support: unicode filenames
Windows uses a legacy codepage for char* / runtime functions accepting
char *. Using UTF-8 as the codepage with setlocale() is explicitly
forbidden.

Work this around by overriding the MSVCRT functions with wrapper
macros, that assume UTF-8 and use "proper" API calls like _wopen etc.
to deal with unicode filenames. All code that uses standard functions
that take or return filenames must now include osdep/io.h. stat()
can't be overridden, because MinGW-w64 itself defines "stat" as a
macro. Change code to use use mp_stat() instead.

This is not perfectly clean, but still somewhat sane, and much better
than littering the rest of the mplayer code with MinGW specific hacks.
It's also a bit fragile, but that's actually little different from the
previous situation. Also, MinGW is unlikely to ever include a nice way
of dealing with this.
2012-03-09 20:48:54 +02:00
Uoti Urpala 5a13d47b97 demux_mf: fix option value allocated with strdup
demux_mf allocated the "type" suboption of "--mf" with strdup if it
was not explicitly set. This caused a crash after playing an mf://
entry. Fix to use talloc instead.
2011-09-02 08:04:52 +03:00
cboesch fe3c4810e1 cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 13:11:20 +02:00
reimar fe6c4fcae2 cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)
Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace some sizeof(type) by sizeof(*pointer)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizoef(type) by sizeof(*ptrvar).
Besides being consistent with FFmpeg style,
this reduces the size of a patch to rename these
types to not conflict with the windows.h definitions.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(type) by sizeof(*ptrvar)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove a useless cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(type)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove a useless cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace several sizeof(WAVEFORMATEX)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace one more instance of sizeof(WAVEFORMATEX); fix compilation.
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid some pointless uses of sizeof() and one related cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge one malloc() + memset() invocation into calloc().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(WAVEFORMATEX) occurrences.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(BITMAPINFOHEADER)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
reimar 2e557e3b28 Add support for JPEG2000 via FFmpeg/OpenJPEG
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:58:56 +00:00
reimar 9054d57595 Set demuxer->filepos in mf demuxer, since the stream_tell fallback is not
usable. Fixes progress display in mencoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29530 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-17 06:14:12 +00:00
cehoyos bcb5c78ce3 Allow dpx image files as input.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29489 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 17:56:19 +00:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego f077569dff Add standard license header to all files in libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:51:13 +00:00
compn f8a56efb5c map jls (jpeg-ls), thm and db (thumbnails) files to jpg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29025 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-21 19:46:13 +00:00
compn 6d1481e91b add ffptx , works on ptx samples
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26743 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 02:09:47 +00:00
compn 6b9a3bc1a4 sun rasterfile decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26102 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 18:30:02 +00:00
compn 440d7d2575 add ffpcx decoder, works on my samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25993 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-13 21:36:27 +00:00
reimar 5960ddb8e5 Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
reimar 35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
reimar 7342753348 100l, fix uint32_t* instead of uint32_t typo in demux_mf type->fourcc table
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25090 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 10:02:28 +00:00
reimar aa93e8e60d Remove a pointless #ifdef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25062 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 17:28:33 +00:00
reimar d0326807a7 Replace if-else constructs for type -> fourcc mapping by a table in demux_mf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25061 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 17:27:30 +00:00
compn 48a2ba01e5 add tif support to demux_mf
ok'd by diego and reimar


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25048 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-14 13:49:18 +00:00
reimar 60ecafec69 BMP support for mf://
Patch by lode leroy [lode_leroy hotmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22921 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-06 16:58:00 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
reimar 596ab5d0fb mf demuxer only works with mf:// urls, so check for that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22101 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-01 20:31:40 +00:00
reimar a498ea8eb8 Avoid division by zero DEMUXER_CTRL_GET_PERCENT_POS with only one frame by just
returning DONTKNOW. A better formula to calculate position would probably be a better
fix though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19800 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-11 19:01:20 +00:00
reimar cb1dbb73a7 Implement DEMUXER_CTRL_GET_TIME_LENGTH and DEMUXER_CTRL_GET_PERCENT_POS,
patch by Paul-Francois Fontigny pff at filmik be


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19225 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 18:19:44 +00:00
gpoirier 76590563aa fix 3 bugs in libmpdemux/demux_mf.c
1. Relative seek is seeking 1 frame too far.
2. Percent seek is seeking 1 frame too far (beyond EOF) at 100%.
3. Check for EOF is checking 1 frame too far.
Patch by Paul-Francois Fontigny < pff AAA filmik PPP be>
Original thread:
Date: Jul 16, 2006 12:40 PM
Subject: [MPlayer-dev-eng] [PATCH] bugfix for libmpdemux/demux_mf.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19185 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-26 09:30:43 +00:00
corey 1ab575101a Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

I've quadruple checked this time; hopefully I haven't missed anything.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
iive 0aa37a0db2 allow autodetection of pictures type when using mf://@file.list syntax
autodetection is based on first picture instead of the url


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17625 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-14 09:34:30 +00:00
corey 3f6e7ce5f5 Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
corey 15debd85d2 1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

Other demuxers could be modified similarly in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
rtognimp cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
faust3 dbc8d08292 fopen requires binary flag on windows, too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9993 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-26 12:27:56 +00:00
albeu b104833775 Fix this 10L for wich i got so good bugreports :(((
Thx to Sascha.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9946 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-20 14:31:20 +00:00
michael b749836b08 add support for sgi files to mencoder patch by (Todd Kirby <slapcat at pacbell dot net>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9535 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-05 10:38:56 +00:00
arpi 3277c61b77 type autodetection (from filemask/filelist extension)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9149 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 22:00:57 +00:00
arpi 4ccfe264a3 stream layer cleanup - part 1
STREAMTYPE_MF removed, using STREAMTYPE_DUMMY instead
mf.c/demux_mf updated to do the opening in demux_open instead of stream_open


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7408 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-15 19:47:49 +00:00
arpi 5b3e3be175 TGA images (-mf on:type=tga) support
patch by Tilman Sauerbeck <tsauerbeck@users.sourceforge.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7363 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-10 20:59:52 +00:00
albeu 2b955d3b05 Added demuxer uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5811 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-24 15:36:07 +00:00
pontscho f9f6c9fd93 Add IJPG decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5030 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-10 22:49:18 +00:00
pontscho 97654ce7f3 add initial mPNG support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4657 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-11 09:15:59 +00:00
alex 24e208b65b identify jpg with case-insensitive 'jpg' or 'jpeg' string
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4644 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-10 18:09:52 +00:00
pontscho 103a960925 finalize mfi support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4566 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-07 12:07:47 +00:00
arpi 8c6da39840 emulating BITMAPINFOHDR (for win32 codecs)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4557 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-06 22:03:19 +00:00
pontscho e53e5c4694 add mfi demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4551 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-06 20:15:36 +00:00