Commit Graph

2621 Commits

Author SHA1 Message Date
reimar f604df4f76 vd_ffmpeg: Minor code simplification.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31336 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-10-27 20:27:39 +03:00
Uoti Urpala 96312757c5 vd_ffmpeg: fix aspect ratio problems with recent FFmpeg
The code left ctx->last_sample_aspect_ratio at 0/0 when allocating a
context. In older FFmpeg versions av_cmp_q() against 0/0 always said
the numbers are equal; but this changed recently, triggering incorrect
overwrite of container aspect ratio. The logic looks like it'd need
further fixes, but for now just initialize last_sample_aspect_ratio to
0/1; this should restore the previous behavior from before FFmpeg
changes, which worked well enough for the most common cases.
2010-10-16 05:14:25 +03:00
Uoti Urpala 266e0341ba vd_ffmpeg: fix calloc/av_free mixup
avctx->palctrl was allocated with calloc() but freed with av_freep().
Free it with free() instead. Also change the main decoder context
allocation to use talloc.
2010-10-16 04:38:20 +03:00
Uoti Urpala 8362ad36ac Merge svn changes up to r31332 2010-06-05 23:37:42 +03:00
Uoti Urpala dde8b753e4 Merge svn changes r31318 to r31328
r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
2010-06-05 23:35:42 +03:00
reimar 7e9ff557a0 Extend -vf format to allow substituting the format for a compatible one
(e.g. chaning rgb24 to bgr24).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31331 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:55:20 +00:00
reimar 1689c3422f Fix -vf format and -vf noformat to work with slices.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31330 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:45:35 +00:00
cehoyos ef14d50ad6 Fix compilation after FFmpeg r23485.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 13:44:20 +00:00
reimar 82aabb77d3 Limit buffered PTS only when we actually got a frame from the decoder.
This avoids some issues with H.264 PAFF due to dropping PTS values too
early because only every second packet actually produced output.
Just keeping up to one additional pts value would have avoided this
particular issue as well, but this is more generic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31312 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 20:59:40 +00:00
cehoyos 1c906775a0 ass_set_aspect_ratio() takes three arguments since 0x00907010.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:12:50 +00:00
Uoti Urpala 80be936a56 Merge svn changes up to r31303 2010-06-02 19:12:01 +03:00
Uoti Urpala 9d14cec1d7 ad_ffmpeg: set lavc drc_scale parameter according to opts->drc_level 2010-06-02 18:38:24 +03:00
Uoti Urpala 3f076c0fb3 options: move -a52drc to option struct
Also allow a range up to 2.
2010-06-02 18:34:21 +03:00
Uoti Urpala 4cf9a52a64 Merge svn changes up to r31265 2010-06-02 17:46:33 +03:00
siretart 1cbf1ec468 avoid using swscale internals by copying in palette8torbg16 and its bgr variant
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31303 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 21:07:02 +00:00
siretart b2dc062825 deprecate palette8topacked32 in favor of public API functions sws_convertPalette8ToPacked32 and -24
additionallym deprecate palette8torgb16 and its bgr variant without
replacement. These functions are not meant to be used by applications.

Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31301 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 19:35:16 +00:00
cehoyos d9396facdc Fix compilation after FFmpeg r23402.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 10:28:45 +00:00
siretart 88c4cbb3f9 remove palette8torgb15 and palette8tobgr15
They contain exactly the same code as their 16bit variants, so this is
effectively code de-duplication.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31298 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 06:53:56 +00:00
reimar a8dab8b521 Forgotten part of previous commit (extern declaration of drc_level).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31287 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:48:18 +00:00
reimar b19b09df54 Use the -a52drc option also for the libavcodec decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31286 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:46:31 +00:00
Uoti Urpala 0e0d88ede9 Merge svn changes up to r31256 2010-05-30 16:39:41 +03:00
Uoti Urpala 2f1a518d45 Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
2010-05-30 16:14:55 +03:00
Uoti Urpala adbb0477a0 Merge svn change r31191 2010-05-30 15:53:08 +03:00
Uoti Urpala e74361c488 Merge svn changes up to r31189 2010-05-30 15:51:33 +03:00
Uoti Urpala a286506467 Merge svn changes up to r31176 2010-05-30 15:37:34 +03:00
Uoti Urpala 6f199ab3d9 Merge svn changes up to r31169 2010-05-30 15:27:58 +03:00
Uoti Urpala 18657beb19 Merge svn changes up to r31145 2010-05-30 15:21:18 +03:00
Uoti Urpala 1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
diego e962e643be cosmetics: Remove some commented-out #includes, fix a comment grammar error.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31260 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:07:10 +00:00
diego 6dda52e496 Directly mark jpeg_buf_src() as void instead of using some indirection marcro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31259 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:06:29 +00:00
cehoyos 95e8630981 Use MSGT_DECVIDEO in a video decoder.
Patch by Giorgio Vazzana, mywing81 gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31249 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 11:52:12 +00:00
diego b17704e6a8 cosmetics: Drop pointless _s suffix from 'struct ad_functions'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31231 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:10:27 +00:00
diego 9bc124bcda cosmetics: Drop pointless _s suffix from 'struct mp_image'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31230 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:08:30 +00:00
diego 67958c9b9f cosmetics: Drop _s suffix from 'struct vd_functions'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31229 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:59:15 +00:00
diego 4ab8fea71b cosmetics: K&R coding style
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31228 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:37 +00:00
diego ca04a9c8ea cosmetics: K&R coding style
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31227 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:11 +00:00
diego e765b9cd43 whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31217 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-25 11:39:58 +00:00
reimar 9016e5cf0a Avoid decoding of 0-size packets. This also fixes that the main loop believes
tehre is an infinite number of delayed frames, thus never finishing (happens
with -demuxer lavf -vc theora).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31206 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 23:24:25 +00:00
diego cc75267c6b cosmetics: reformat ad_pcm.c in K&R style
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31193 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 14:15:27 +00:00
cehoyos 1dce94a26d Ignore (but print out) offset with libtheora decoder.
Patch by Giorgio Vazzana, mywing81 gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31191 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-22 16:32:39 +00:00
iive 31bc24b1d8 Fix compilation broken by FFmpeg-r23201 that changed the api of error logging.
Also fix evaluation after FFmpeg-r23149 "change order of parameters".
Let the filters fail if evaluation can't be done.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31187 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-20 23:17:41 +00:00
Uoti Urpala a47ef5fed6 ad_pcm: don't rely on demux packets staying valid
Change ad_pcm to copy input packet data into an internal buffer
instead of relying on the packet still existing at the next decode()
call. The extra memcpy could be avoided by improving the demuxer API a
bit but I don't feel like implementing that now. Also add a
ADCTRL_RESYNC_STREAM handler to drop buffered data from previous
stream position.
2010-05-15 06:08:44 +03:00
Uoti Urpala c1c68a6914 ad_pcm: fix crash at EOF
Fix use of unsigned type where negative values were needed. When
playing a file with multichannel PCM audio the bug could result in the
channel reorder function scrambling memory at the end of playback,
causing a crash.
2010-05-15 05:52:00 +03:00
Uoti Urpala 584b43e9f8 cosmetics: reindent ad_pcm.c 2010-05-15 05:45:02 +03:00
cehoyos 2b26048cca Fix compilation after r31173.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 14:20:19 +00:00
siretart e3f191fa3f remove vf_yuy2, functionality is replaced by -vf format=yuv2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 13:49:05 +00:00
diego 12f67b8372 Remove internal liba52 copy.
Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 14:45:29 +00:00
reimar d6f2685181 Handle Y8/Y800 formats more similar to other YUV formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31144 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 00:18:26 +00:00
Uoti Urpala 5266b5de98 vd_ffmpeg: remove #ifdef for old FFmpeg-mt versions
The #ifdef is obsolete since trying to compile against the relevant
old versions will fail for other reasons.
2010-05-07 22:15:19 +03:00
Uoti Urpala e1cd86076f Merge svn changes up to r31141 2010-05-07 22:13:35 +03:00