1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-13 18:36:09 +00:00
Commit Graph

29525 Commits

Author SHA1 Message Date
reimar
6765091bfa Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29566 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:36:51 +00:00
reimar
26d8e6a696 Fix video placement with -vo gl2 -fs -wid.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29565 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:12:38 +00:00
reimar
f10dcbacd5 -vo gl2 resize does not need to modify its arguments, so pass int instead of int *.
In particular, this avoids modifying vo_dwidth/vo_dheight which should only
be modified by the "windowing layer" (w32_common, x11_common).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29564 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:10:38 +00:00
reimar
c3067ee82f Simplify -vo gl ass border etc. dimension calculation one bit more.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29563 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:07:15 +00:00
reimar
c2edb80335 Remove useless code that has no effect.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29562 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:01:39 +00:00
reimar
082c7b9446 Simplify and fix ass border calculations for -vo gl and -wid -fs mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:54:53 +00:00
reimar
6ec672e3cc Make panscan cover the same range in -wid -fs mode as in normal mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29560 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:31:12 +00:00
reimar
16c2a6660a Disable -keepaspect with -wid in w32_common code.
This does not work in a useful way and was unintentionally "enabled"
when -wid was made to use a separate window.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29559 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:20:21 +00:00
reimar
e18b64611c Fix aspect_fit to work correctly when borders need to be added on top and
bottom, previous code accidentally compared against screen dimensions,
resulting in cropping instead of added borders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29558 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:38:22 +00:00
reimar
4cbff98bad Forgotten changes to aspect code to handle -wid with -fs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29557 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:35:23 +00:00
reimar
e8429f1f5b First attempts at supporting -fs with -wid, -vo gl on X11 only so far
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29556 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:03:02 +00:00
cehoyos
bdf9a6321d Expand wid explanation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29555 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 11:04:52 +00:00
reimar
b3237275e3 Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29554 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-26 19:06:14 +00:00
reimar
d66f6b4538 Retry deciding to get audio parameters several times on errors, this avoids
failing to init the decoder completely just because the first packet is broken.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29553 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-26 19:05:36 +00:00
diego
0b8fc28ba7 Adjust documentation about filtering out whitespace changes from 'svn diff'.
'svn diff' now has builtin whitespace ignore options.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29552 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-26 17:35:40 +00:00
cehoyos
f485823bc3 Fix DTS in least one Bluray sample with demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29551 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-26 02:43:15 +00:00
cehoyos
88a8408212 Fix AC3 in least one Bluray sample with demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29550 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-26 02:37:56 +00:00
cladisch
f17ed52432 Use a buffer of about half a second, instead of sizing it to have
a constant number of frames.  This improves the behaviour at very
small or large sample rates, and gets rid of lots of obsolete code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29549 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-24 07:32:25 +00:00
ramiro
ec7e2695a6 swscale-example: Rename src->ref so as to not confuse with src being used in doTest().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29548 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-23 20:31:38 +00:00
ramiro
ed3cf3036c swscale-example: Use SWS_BILINEAR instead of hardcoded value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29547 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-23 20:29:49 +00:00
reimar
9e5e535e34 Reuse ds_get_packet in ds_get_packet_pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29546 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-23 15:32:42 +00:00
ramiro
62123551eb Fix inconsistent indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29545 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-22 19:30:19 +00:00
reimar
2b8b5b7053 Add suport for detecting and demuxing DVB teletext streams (nothing beyond that though).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29544 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-21 16:54:57 +00:00
ramiro
728be1cb1a Check return values of sws_allocVec() and sws_getConstVec().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29543 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-20 01:55:45 +00:00
reimar
54af60865f OpenAL: untested support for 8-channel audio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29542 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 16:03:05 +00:00
tack
0d0c303ebe Fix channel reordering when using 24-bit samples by adding breaks to cases
missed by r29427.

Patch submitted by Shane W, shane-mplayer csy ca


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29541 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 13:29:07 +00:00
reimar
11e641f48f Change ao_dart to use AVFifoBuffer instead of its own fifo implementation, too.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29540 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 09:01:37 +00:00
diego
9e9a5a3cac Fix detection of mips arch on NetBSD/sgimips.
based on a patch by Andrew Randrianasulu, randrik mail ru


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29539 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 08:47:46 +00:00
reimar
9d6b461605 Free initial swscale context, too. Avoids a valgrind warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29538 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 08:21:55 +00:00
reimar
78fb0e7f16 Remove useless casts of malloc return value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29537 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 08:18:53 +00:00
ramiro
67636ed48b Introduce and use sws_allocVec().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29536 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 01:33:17 +00:00
ramiro
0f89c75f31 Reuse sws_getConstVec() where possible.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29535 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 01:32:06 +00:00
tack
bc4cc45029 Cosmetics: adjust alignment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29534 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-18 22:25:58 +00:00
tack
f89696a8e2 Fix incorrect channel ordering for lavc audio codecs (specifically ffac3,
ffdca, ffflac, ffaac, fftruehd).  In the process, adds support for 32-bit
samples.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29533 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-18 22:24:36 +00:00
reimar
3961e12fca Fix incompatible pointer types warning, also seems to fix mis-compilation with gcc-4.4.1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29532 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-17 08:02:37 +00:00
reimar
6638304dbf Fix 100l broken flag check found due to compiler warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29531 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-17 07:30:24 +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
reimar
eeaa871baa Get rid of rawaudio control code again that only duplicates the fallback code in
demuxer.c now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29529 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-17 05:56:36 +00:00
reimar
5d058a67c1 Handle demuxers that never set filepos by using stream_tell.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29528 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-17 05:55:40 +00:00
ramiro
69cb72414a swscale-example: Make selection of dstW, dstH, and flags more clear.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29527 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-17 02:06:00 +00:00
reimar
46f8461828 Add some protection to the rawaudio GET_LENGTH/GET_PERCENT_POS in case the
file length is not known (streaming).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29526 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 22:44:29 +00:00
reimar
fef7ef08a0 Implement DEMUXER_CTRL_GET_TIME_LENGTH and DEMUXER_CTRL_GET_PERCENT_POS for
rawaudio demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29525 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 22:39:10 +00:00
ramiro
808ac07940 More indentation changes leftover from r29522:
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29524 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 21:37:07 +00:00
ramiro
b490da35c8 Cosmetics:
- Place curly brackets in the same line as while/for/if/switch/else/do;
- Place curly brackets at column 0 in the next line starting a function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29523 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 21:11:28 +00:00
ramiro
88dafbd9a5 Indent libswscale:
- Use 4 spaces throughout for indentation;
- Fix inconsistent indentation;
- Indent function calls and declarations aligning arguments on multiple lines
  to the column after the opening parentheses;
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29522 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 00:32:04 +00:00
cehoyos
6a101a97f9 Fix file information. Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29521 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 23:41:35 +00:00
cehoyos
4112165879 Add missing major contributors to copyright statement.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29520 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 23:33:56 +00:00
jrash
f868c2ca36 improve previous translation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29519 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 02:55:54 +00:00
ramiro
ca774579f7 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29518 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 02:35:55 +00:00
ramiro
15fb97be65 Vertical yuv -> yuv16 scaler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29517 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-14 15:52:40 +00:00