1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

20493 Commits

Author SHA1 Message Date
Ramiro Polla
6b052ba88f swscale-example: Make selection of dstW, dstH, and flags more clear.
Originally committed as revision 29527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-17 02:06:00 +00:00
Alex Converse
0cc4701a3a Use the AOT enum instead of integer literals for setting and comparing audio
object types.

Originally committed as revision 19666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-17 00:17:58 +00:00
Måns Rullgård
d691da9508 AVR32: optimisations for intreadwrite.h
Originally committed as revision 19665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-17 00:15:53 +00:00
Måns Rullgård
e482c2e2fb AVR32: inline asm for bswap.h
Originally committed as revision 19664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-17 00:15:51 +00:00
Måns Rullgård
fdcd782dd9 configure: add AVR32 names for --cpu flag
Recognise AVR32 processor names as well as the generic "ap" and "uc"
family names as values for --cpu.  Also define two subtypes, avr32_ap
and avr32_uc.

Originally committed as revision 19663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-17 00:15:48 +00:00
Alex Converse
8ba939d702 Mark the AOT escape value as supported.
Originally committed as revision 19662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-17 00:15:02 +00:00
Alex Converse
08dac48d61 Add USAC and SAOC AOTs to the AudioObjectType enum.
Originally committed as revision 19661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-17 00:14:10 +00:00
Ramiro Polla
c255994b29 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".

Originally committed as revision 29524 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16 21:37:07 +00:00
Ramiro Polla
dd68318cee 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.

Originally committed as revision 29523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16 21:11:28 +00:00
Måns Rullgård
9dc6bb7b9f MIPS: 100L: fix AV_[RW]N64 on MIPS64
Originally committed as revision 19660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-16 18:43:36 +00:00
Måns Rullgård
4a051891f6 cosmetics: reformat intreadwrite.h
Originally committed as revision 19659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-16 18:06:25 +00:00
Måns Rullgård
63826ceb32 intreadwrite: ensure arch-specific versions are always used if defined
The per-arch headers can define any combination of B/L/N variants.
This ensures that whatever is defined in an arch header gets used
for all equivalents not defined there.  E.g. on a little-endian
machine, AV_RN and AV_RL should give the same code.

Originally committed as revision 19658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-16 15:51:55 +00:00
Måns Rullgård
57c36bdcea intreadwrite: allow arch-specific 24-bit access macros
Originally committed as revision 19657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-16 15:51:52 +00:00
Måns Rullgård
e6956a6e48 ARM: first value loaded in AV_RN64 needs to be early-clobber
Originally committed as revision 19656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-16 15:51:50 +00:00
Måns Rullgård
7f6d9b3089 version.sh: use standard sed syntax
Originally committed as revision 19655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-16 15:51:47 +00:00
Ramiro Polla
9b734d44ab 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".

Originally committed as revision 29522 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16 00:32:04 +00:00
Diego Biurrun
2513b2b436 Use pkg-config to generate the linker flags for libdirac.
We do the same for libschroedinger and already use pkg-config to generate
the CFLAGS for libdirac anyway, so there is no new dependency.
Thanks to Kovensky for reporting breakage on IRC.

Originally committed as revision 19654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 12:35:15 +00:00
Anuradha Suraparaju
d15f2e00c5 Fix bug caused by difference in stride and picture width.
When a frame is allocated using libschroedinger routines, the frame data size
does not match the actual frame size if the width is not a multiple of 16. So
we cannot do a straightforward memcpy of the frame returned by libschroedinger
into the FFmpeg picture as the stride differs from the width.

Fix this bug by allocating for the libschroedinger frame with the dimensions
in AVCodecContext within libavcodec and passing the frame to libschroedinger.

patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 19653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:59:53 +00:00
Diego Biurrun
0ebe3b8e2b cosmetics: indentation, prettyprinting, K&R coding style
Originally committed as revision 19652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:42:15 +00:00
Diego Biurrun
c64380009d Drop some more useless braces around if/for constructs.
Originally committed as revision 19651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:32:11 +00:00
Diego Biurrun
e6cb49bfa9 Simplify another 'if' condition: Replace 'exp == 0' by '!exp'.
Originally committed as revision 19650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:31:42 +00:00
Colin McQuillan
bb937155ec Add a function that can apply an order 2 rational transfer function in-place.
This function will be used in the upcoming AMR-NB floating point decoder for
high-pass filtering.

Patch by Colin McQuillan ( m.niloc googlemail com )

Originally committed as revision 19649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:22:55 +00:00
Diego Biurrun
735a38045a Remove useless braces around if/for/while expressions.
Originally committed as revision 19648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:12:47 +00:00
Diego Biurrun
7c809dc3e2 Simplify 'if' condition statements.
Drop useless '!= 0' from 'exp != 0', replace 'exp == 0' by '!exp'.

Originally committed as revision 19647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:02:50 +00:00
Reimar Döffinger
cea0b5272d Fix start_display_time/end_display_time to be relative to packet pts in xsub decoder.
Makes no difference for the sample AVI files since they all have no packet pts values.

Originally committed as revision 19646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 09:12:58 +00:00
Ramiro Polla
ebe5dec22b Indent.
Originally committed as revision 29518 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-15 02:35:55 +00:00
Reimar Döffinger
4a3190ed40 Reindent.
Originally committed as revision 19645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:58:26 +00:00
Reimar Döffinger
fd35d6d097 Remove code that is now dead.
Originally committed as revision 19644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:57:24 +00:00
Reimar Döffinger
90ea6fce1e Simplify initialization of AVSubtitle by using memset.
Originally committed as revision 19643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:52:41 +00:00
Reimar Döffinger
df47d24501 Make sure AVSubtitle is initialized, memset it to 0.
Originally committed as revision 19642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:46:33 +00:00
Reimar Döffinger
266649a52f 100l, error out if subtitle encoder failed instead of writing an AVPacket
with ridiculous size and thus crashing.

Originally committed as revision 19641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:37:31 +00:00
Reimar Döffinger
ffbe087b58 Fix cmd_pos bounds check to avoid the overflow case.
Originally committed as revision 19640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:02:42 +00:00
Carl Eugen Hoyos
84c1b149b2 Fix typo.
Originally committed as revision 19639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-14 16:41:21 +00:00
Ramiro Polla
52154148f4 Vertical yuv -> yuv16 scaler.
Originally committed as revision 29517 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-14 15:52:40 +00:00
Peter Schlaile
562f685307 BGR32 MMX special convertor.
Patch by Peter Schlaile < peter at schlaile dot de >

Originally committed as revision 29515 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-14 02:15:28 +00:00
Måns Rullgård
9ae443f420 10L: remove instruction left over from debugging
Originally committed as revision 19638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-14 01:05:48 +00:00
Måns Rullgård
e814015d69 ARM: NEON optimised vorbis_inverse_coupling
12% faster Vorbis decoding on Cortex-A8.

Originally committed as revision 19637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-14 01:02:06 +00:00
Ramiro Polla
737cbcde08 Indent.
Originally committed as revision 29512 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 19:03:14 +00:00
Ramiro Polla
f51fb686de Introduce av_clip_uint16().
Originally committed as revision 19636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-13 18:47:13 +00:00
Ramiro Polla
d426ea20c9 swscale-example: Don't check for chroma planes in mono formats.
Originally committed as revision 29511 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 18:39:39 +00:00
Ramiro Polla
48f4c61252 MMX2 horizontal scaler: Determine code size at runtime.
Originally committed as revision 29510 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 18:31:07 +00:00
Ramiro Polla
0728778885 Protect mmx2 filter code buffers so they are not executable and writeable at
the same time (only mmap for now).

Originally committed as revision 29509 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 18:29:54 +00:00
Ramiro Polla
b0e1343b85 Remove duplicate define (it is the same in the lum code).
Originally committed as revision 29508 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 18:28:55 +00:00
Ramiro Polla
bcdedf675f Rename "funny" code to "mmx2 filter" code.
Originally committed as revision 29507 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 18:28:17 +00:00
Ramiro Polla
475f361308 Indent.
Originally committed as revision 29506 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 13:18:59 +00:00
Ramiro Polla
e55ed689a2 swscale-example: Remove hack to end loop by setting variables to break.
Originally committed as revision 29505 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 11:48:06 +00:00
Ramiro Polla
d7cf0a6ff7 swscale-example: Don't return random value from main().
Originally committed as revision 29504 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 11:34:27 +00:00
Ramiro Polla
f5a9c4ee50 swscale-example: Check for Gray formats.
Originally committed as revision 29503 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-13 11:33:18 +00:00
Colin McQuillan
d4d6ae1603 Add ff_celp_circ_addf() function to be used for sparse vector circular
convolution in the upcoming AMR-NB floating point decoder. The function scales
and adds a vector, that is lagged by some offset, to another vector with the
same number of elements.

Patch by Colin McQuillan ( m.niloc googlemail com )

Originally committed as revision 19634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-12 19:54:28 +00:00
Shehzad Salim
51fdb6f08d Fix a memleak with win32 threads: the handle returned by _beginthreadex
must be closed (this differs from _beginthread).
Patch by Shehzad Salim (shehzadsalim gmail com)

Originally committed as revision 19633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-12 13:25:37 +00:00