ffmpeg.git
5 years agoMerge commit '0957b274e312e985d69cb490bee2a7ff820acaa6'
Michael Niedermayer [Sun, 1 Jun 2014 11:46:38 +0000 (13:46 +0200)]
Merge commit '0957b274e312e985d69cb490bee2a7ff820acaa6'

* commit '0957b274e312e985d69cb490bee2a7ff820acaa6':
  lavc: add an option to enable side data-only packets during encoding

Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb800f120d2d42590fde2302fe828c847e41e773'
Michael Niedermayer [Sun, 1 Jun 2014 11:35:17 +0000 (13:35 +0200)]
Merge commit 'eb800f120d2d42590fde2302fe828c847e41e773'

* commit 'eb800f120d2d42590fde2302fe828c847e41e773':
  libavcodec: set AVFrame colorspace fields on decoding

Conflicts:
libavcodec/utils.c

See: a80e622924c89df69fb1c225ba432fe12fe6648e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'
Michael Niedermayer [Sun, 1 Jun 2014 11:06:21 +0000 (13:06 +0200)]
Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'

* commit '8c02adc62d71dfbb079a04753d8c16152c49de88':
  lavu: add all color-related enums to AVFrame

Conflicts:
libavcodec/avcodec.h
libavutil/frame.c
libavutil/frame.h
libavutil/version.h

The version check is changed so they are available with the current ABI
FFmpeg libs should have no problems with added fields, nor should any
application using the libs, and we regularly added fields in the past.
We also moved 2 of these fields to AVFrame already previously without issues.

See: a80e622924c89df69fb1c225ba432fe12fe6648e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cljr: require (v)strict -1 to use width %4 != 0
Michael Niedermayer [Sun, 1 Jun 2014 10:28:56 +0000 (12:28 +0200)]
avcodec/cljr: require (v)strict -1 to use width %4 != 0

Suggested-by: kurosu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'
Michael Niedermayer [Sun, 1 Jun 2014 09:57:43 +0000 (11:57 +0200)]
Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'

* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d':
  matroskaenc: Allow VP9 and Opus in webm

Conflicts:
libavformat/matroskaenc.c

See: 820ffaed0f64b7ec27275d093c6f81e181c86e94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: add an option to enable side data-only packets during encoding
Anton Khirnov [Tue, 29 Apr 2014 13:06:45 +0000 (15:06 +0200)]
lavc: add an option to enable side data-only packets during encoding

Some encoders (e.g. flac) need to send side data when there is no more
data to be output. This enables them to output a packet with no data in
it, only side data.

5 years agolibavcodec: set AVFrame colorspace fields on decoding
wm4 [Fri, 30 May 2014 20:14:22 +0000 (22:14 +0200)]
libavcodec: set AVFrame colorspace fields on decoding

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolavu: add all color-related enums to AVFrame
wm4 [Fri, 30 May 2014 20:14:21 +0000 (22:14 +0200)]
lavu: add all color-related enums to AVFrame

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agomatroskaenc: Allow VP9 and Opus in webm
Tudor Suciu [Sun, 2 Jun 2013 15:49:24 +0000 (17:49 +0200)]
matroskaenc: Allow VP9 and Opus in webm

Bug-Id: 695

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/mjpegenc: disallow encoding amv with height%16!=0
Michael Niedermayer [Sun, 1 Jun 2014 01:57:17 +0000 (03:57 +0200)]
avcodec/mjpegenc: disallow encoding amv with height%16!=0

I do not know on which side to place the padding to encode with 16x16 MBs
If someone knows or has a known to be correct sample, please contact me

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: request a AMV sample with non mod 16 height
Michael Niedermayer [Sun, 1 Jun 2014 01:53:19 +0000 (03:53 +0200)]
avcodec/mjpegdec: request a AMV sample with non mod 16 height

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/motion_est: enable sad16_sse2 on k10 CPUs
James Almer [Sat, 31 May 2014 19:36:45 +0000 (16:36 -0300)]
x86/motion_est: enable sad16_sse2 on k10 CPUs

The check is meant for k8 CPUs. sad16_sse2 is ~20% faster than sad16_mmxext on k10.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cljr: support width%4 encoding
Michael Niedermayer [Sat, 31 May 2014 21:52:50 +0000 (23:52 +0200)]
avcodec/cljr: support width%4 encoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cljr: remove coded_frame code
Michael Niedermayer [Sat, 31 May 2014 20:19:13 +0000 (22:19 +0200)]
avcodec/cljr: remove coded_frame code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/dsputil: add missing vsad8 and vsse8 functions
James Almer [Sat, 31 May 2014 17:25:03 +0000 (14:25 -0300)]
lavc/dsputil: add missing vsad8 and vsse8 functions

the mpeg encoder would try to use them if vsad or vsse were selected for frame_skip_cmp
and frame_skip_threshold or frame_skip_factor were set to values != 0

example: "ffmpeg -i INPUT -c:v mpeg2video -skipcmp vsad -skip_threshold 1 -f null -"

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 31 May 2014 15:24:18 +0000 (17:24 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Read mov files where the moov atom is hidden within a free atom.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/asvenc: fix encoding dimensions %16 != 0
Michael Niedermayer [Sat, 31 May 2014 15:07:12 +0000 (17:07 +0200)]
avcodec/asvenc: fix encoding dimensions %16 != 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/frame: frame_copy_video: support copying from a smaller to a larger frame
Michael Niedermayer [Sat, 31 May 2014 15:06:26 +0000 (17:06 +0200)]
avutil/frame: frame_copy_video: support copying from a smaller to a larger frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow: fix 1 pixel block sizes
Michael Niedermayer [Sat, 31 May 2014 14:26:46 +0000 (16:26 +0200)]
avcodec/snow: fix 1 pixel block sizes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRead mov files where the moov atom is hidden within a free atom.
Carl Eugen Hoyos [Sat, 31 May 2014 13:39:35 +0000 (15:39 +0200)]
Read mov files where the moov atom is hidden within a free atom.

Fixes ticket #1551 / issue 2226.

5 years agoFix compilation with --disable-everything --enable-demuxer=matroska.
Carl Eugen Hoyos [Sat, 31 May 2014 14:27:48 +0000 (16:27 +0200)]
Fix compilation with --disable-everything --enable-demuxer=matroska.

Fixes ticket #3693.

5 years agolavc/jpeglsenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:29:07 +0000 (13:29 +0200)]
lavc/jpeglsenc: Enable frame-threading.

5 years agolavc/lclenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:28:35 +0000 (13:28 +0200)]
lavc/lclenc: Enable frame-threading.

5 years agolavc/ljpegenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:28:16 +0000 (13:28 +0200)]
lavc/ljpegenc: Enable frame-threading.

5 years agolavc/tiffenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:27:51 +0000 (13:27 +0200)]
lavc/tiffenc: Enable frame-threading.

5 years agolavc/utvideoenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:27:01 +0000 (13:27 +0200)]
lavc/utvideoenc: Enable frame-threading.

5 years agoUse rc_max_rate in av_find_best_stream() if bitrate == 0.
Carl Eugen Hoyos [Sat, 31 May 2014 11:25:31 +0000 (13:25 +0200)]
Use rc_max_rate in av_find_best_stream() if bitrate == 0.

Fixes ticket #2042.

5 years agolibavformat: output cues for each subtitle block in MKV muxer
John Peebles [Thu, 22 May 2014 07:22:15 +0000 (03:22 -0400)]
libavformat: output cues for each subtitle block in MKV muxer

Signed-off-by: John Peebles <johnpeeb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810d...
Michael Niedermayer [Sat, 31 May 2014 10:37:53 +0000 (12:37 +0200)]
Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db036628e11a5171134ebe320b187ee6d6"

This has become unneeded due to f797b134cad4d248b1c8955659997980d0668bc3

This reverts commit 1fe40e1b0538a8eb8425123c47775b5d141ae084.

5 years agoMerge commit 'f797b134cad4d248b1c8955659997980d0668bc3'
Michael Niedermayer [Sat, 31 May 2014 10:37:01 +0000 (12:37 +0200)]
Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'

* commit 'f797b134cad4d248b1c8955659997980d0668bc3':
  rtpenc_chain: Don't copy the time base to the source stream by default

See: 1fe40e1b0538a8eb8425123c47775b5d141ae084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortpenc_chain: Don't copy the time base to the source stream by default
Martin Storsjö [Fri, 30 May 2014 22:09:58 +0000 (01:09 +0300)]
rtpenc_chain: Don't copy the time base to the source stream by default

Only copy it manually in the muxers where it makes sense (rtspenc,
sapenc). Don't touch the original AVStream in movenchint, where
the original AVStream should be kept untouched.

This fixes the normal tracks in RTP hinted files after
abb810db - the hint tracks were ok while the normal media tracks
were broken, noticed by Michael Niedermayer.

This reverts abb810db but achieves the same effect for the other
muxers.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohuffyuv: increase VLC_BITS to 12
Christophe Gisquet [Fri, 30 May 2014 11:05:11 +0000 (13:05 +0200)]
huffyuv: increase VLC_BITS to 12

May require a different tuning for arm chips?

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: fix assertion failure after 4h muxing
Michael Niedermayer [Fri, 30 May 2014 23:43:41 +0000 (01:43 +0200)]
avformat/flvenc: fix assertion failure after 4h muxing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: fix compilation of svq1enc_mmx.c with --disable-mmx
James Almer [Fri, 30 May 2014 21:49:22 +0000 (18:49 -0300)]
build: fix compilation of svq1enc_mmx.c with --disable-mmx

It's needed for ff_svq1enc_init_x86() even if simd functions are disabled.

Alternatively, svq1enc_init.c could be made and the relevant code moved there.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/huffyuvdsp: fix some prototypes
James Almer [Fri, 30 May 2014 21:49:23 +0000 (18:49 -0300)]
x86/huffyuvdsp: fix some prototypes

Remove duplicate prototypes and fix int -> intptr_t in another

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'
Michael Niedermayer [Fri, 30 May 2014 21:12:45 +0000 (23:12 +0200)]
Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'

* commit 'd6d767d93e532246cacf3567e6bcad76a821f838':
  ppc: Fix compilation for ppc64le (ELFv2)

Conflicts:
libavcodec/ppc/asm.S

See: 41b928c5fad7d4ed8477b68cb0c2d54a70b0afac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db036628e...
Michael Niedermayer [Fri, 30 May 2014 20:51:57 +0000 (22:51 +0200)]
avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db036628e11a5171134ebe320b187ee6d6

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'abb810db036628e11a5171134ebe320b187ee6d6'
Michael Niedermayer [Fri, 30 May 2014 20:03:34 +0000 (22:03 +0200)]
Merge commit 'abb810db036628e11a5171134ebe320b187ee6d6'

* commit 'abb810db036628e11a5171134ebe320b187ee6d6':
  Revert "rtpenc_chain: Don't copy the time_base back to the caller"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: Fix compilation for ppc64le (ELFv2)
Thierry Fauck [Thu, 29 May 2014 12:22:27 +0000 (15:22 +0300)]
ppc: Fix compilation for ppc64le (ELFv2)

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoRevert "rtpenc_chain: Don't copy the time_base back to the caller"
Martin Storsjö [Thu, 29 May 2014 09:22:26 +0000 (12:22 +0300)]
Revert "rtpenc_chain: Don't copy the time_base back to the caller"

While it strictly isn't necessary to copy the time base (since
any use of it is scaled in ff_write_chained), it still is better
to signal the actual time base to the caller, avoiding one
unnecessary rescaling. This also lets the caller know what the
actual internal time base is, in case that is useful info
for some caller.

This reverts commit 397ffde115f4e0482a007b672f40457596cebfc4.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agox86: huffyuvdsp: fewer functions for x86_64
Christophe Gisquet [Fri, 30 May 2014 09:57:56 +0000 (11:57 +0200)]
x86: huffyuvdsp: fewer functions for x86_64

When there are 2 functions that are <= SSE2, only one is needed for x86_64.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/options: leave priv_data in avcodec_copy_context() intact
Michael Niedermayer [Fri, 30 May 2014 19:00:34 +0000 (21:00 +0200)]
avcodec/options: leave priv_data in avcodec_copy_context() intact

previously it was freed but the pointer not cleared

Found-by: ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresenc_anatoliy: simplify get()
Michael Niedermayer [Fri, 30 May 2014 16:43:22 +0000 (18:43 +0200)]
avcodec/proresenc_anatoliy: simplify get()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresenc_anatoliy: load 4 samples at a time in get()
Michael Niedermayer [Fri, 30 May 2014 16:42:01 +0000 (18:42 +0200)]
avcodec/proresenc_anatoliy: load 4 samples at a time in get()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresenc_anatoliy: Use fdct from DSPContext instead of direct call.
Michael Niedermayer [Fri, 30 May 2014 16:03:22 +0000 (18:03 +0200)]
avcodec/proresenc_anatoliy: Use fdct from DSPContext instead of direct call.

Based-on: a55546f48d55e3d1155840541b2be5f4f8cf18ab by Diego Biurrun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresenc_anatoliy: Set bits_per_raw_sample
Michael Niedermayer [Fri, 30 May 2014 16:22:00 +0000 (18:22 +0200)]
avcodec/proresenc_anatoliy: Set bits_per_raw_sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutenc: Suggest genpts if AV_NOPTS_VALUE
Michael Niedermayer [Fri, 30 May 2014 15:53:36 +0000 (17:53 +0200)]
avformat/nutenc: Suggest genpts if AV_NOPTS_VALUE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix VDPAU decoders, regression since f2f99f07.
Carl Eugen Hoyos [Fri, 30 May 2014 15:33:37 +0000 (17:33 +0200)]
Fix VDPAU decoders, regression since f2f99f07.

5 years agox86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm
Timothy Gu [Fri, 30 May 2014 03:56:03 +0000 (20:56 -0700)]
x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: dsputilenc: move all the function prototypes together
Timothy Gu [Fri, 30 May 2014 03:56:01 +0000 (20:56 -0700)]
x86: dsputilenc: move all the function prototypes together

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests: Add MPEG4 nsse test
Timothy Gu [Fri, 30 May 2014 03:56:02 +0000 (20:56 -0700)]
tests: Add MPEG4 nsse test

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: huffyuvdsp: add_hfyu_left_pred_bgr32
Christophe Gisquet [Wed, 28 May 2014 19:57:38 +0000 (21:57 +0200)]
x86: huffyuvdsp: add_hfyu_left_pred_bgr32

          C   MMX   SSE2
Cycles: 3092  1053  578

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffyuvdsp: Change w to intptr in add_hfyu_median_pred() and add_hfyu_left_pred()
Michael Niedermayer [Fri, 30 May 2014 13:07:36 +0000 (15:07 +0200)]
avcodec/huffyuvdsp: Change w to intptr in add_hfyu_median_pred() and add_hfyu_left_pred()

This avoids potential issues with the high 32bits being random in x86-64 asm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: huffyuvdsp: add SSE2 median prediction
Christophe Gisquet [Tue, 27 May 2014 23:03:23 +0000 (01:03 +0200)]
x86: huffyuvdsp: add SSE2 median prediction

From 5010c to 4566 on lagarith YUY2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: fix off by 1 error in matroska_read_seek()
Michael Niedermayer [Fri, 30 May 2014 03:21:24 +0000 (05:21 +0200)]
avformat/matroskadec: fix off by 1 error in matroska_read_seek()

Fixes out of array read

Fixes: vp9-opus-crash.webm

Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/indeo4: Decode both parts of IP frames
Dirk Ausserhaus [Thu, 29 May 2014 11:30:37 +0000 (13:30 +0200)]
avcodec/indeo4: Decode both parts of IP frames

Fixes part of Ticket845

av_frame_move_ref() idea by Anton Khirnov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/indeo4: Move frametypes into common header.
Dirk Ausserhaus [Thu, 29 May 2014 11:17:49 +0000 (13:17 +0200)]
avcodec/indeo4: Move frametypes into common header.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDo not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init().
Carl Eugen Hoyos [Fri, 30 May 2014 05:38:19 +0000 (07:38 +0200)]
Do not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init().

Fixes a regression since ef48ac65 when decoding speex in f4v, reported
by irc user massdos.

5 years agoImprove frame size calculation in caf muxer to fix adpcm_ms remuxing.
Carl Eugen Hoyos [Fri, 30 May 2014 05:26:18 +0000 (07:26 +0200)]
Improve frame size calculation in caf muxer to fix adpcm_ms remuxing.

Fixes ticket #3645.

5 years agoavcodec/qpeldsp: Restore author attribution
Michael Niedermayer [Fri, 30 May 2014 01:09:23 +0000 (03:09 +0200)]
avcodec/qpeldsp: Restore author attribution

See: 368f50359eb328b0b9d67451f56fda20b3255f9a
See:
similarity index 51%
copy from libavcodec/dsputil.c
copy to libavcodec/qpeldsp.c
index 6d41dfc..0beeab8 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/qpeldsp.c
@@ -1,9 +1,5 @@
 /*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP functions
  *
  * This file is part of FFmpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/qpeldsp_init: Restore author attribution
Michael Niedermayer [Fri, 30 May 2014 01:09:23 +0000 (03:09 +0200)]
avcodec/x86/qpeldsp_init: Restore author attribution

See: 368f50359eb328b0b9d67451f56fda20b3255f9a
See: 44eb49512888143905860af2de2932ab002cdbf7, and many others
See:
similarity index 83%
copy from libavcodec/x86/dsputil_init.c
copy to libavcodec/x86/qpeldsp_init.c
index ebbf97f..8f296a1 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/qpeldsp_init.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP functions
  *
  * This file is part of FFmpeg.
  *

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoqpel_template: Restore author attribution
Michael Niedermayer [Fri, 30 May 2014 01:09:23 +0000 (03:09 +0200)]
qpel_template: Restore author attribution

See: 368f50359eb328b0b9d67451f56fda20b3255f9a
See: 59fe111e8122acc614ace5618e1a4ba7416e9875
See:
similarity index 98%
rename from libavcodec/dsputil_template.c
rename to libavcodec/qpel_template.c
index 95d966e..500c75b 100644
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/qpel_template.c
@@ -1,9 +1,5 @@
 /*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP function templates
  *
  * This file is part of FFmpeg.
  *

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'
Michael Niedermayer [Fri, 30 May 2014 00:17:55 +0000 (02:17 +0200)]
Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'

* commit '368f50359eb328b0b9d67451f56fda20b3255f9a':
  dsputil: Split off quarterpel bits into their own context

Conflicts:
configure
libavcodec/dsputil.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/qpeldsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
Michael Niedermayer [Thu, 29 May 2014 23:23:04 +0000 (01:23 +0200)]
Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'

* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
  dsputil: Move Bink-specific add_pixels8 to binkdsp

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
Michael Niedermayer [Thu, 29 May 2014 22:59:15 +0000 (00:59 +0200)]
Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'

* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
  dsputil: Move APE-specific bits into apedsp

Conflicts:
libavcodec/arm/int_neon.S
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'
Michael Niedermayer [Thu, 29 May 2014 22:42:36 +0000 (00:42 +0200)]
Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'

* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
  dsputil: Move mspel_pixels_tab to the only place it is used

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'
Michael Niedermayer [Thu, 29 May 2014 22:30:42 +0000 (00:30 +0200)]
Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'

* commit '3832a6590156e6abc575bed51cbffa78617ee5fd':
  dsputil: Move ff_alternate_*_scan tables to mpegvideo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/svq1enc_mmx: Add author attribution
Michael Niedermayer [Thu, 29 May 2014 22:13:12 +0000 (00:13 +0200)]
avcodec/x86/svq1enc_mmx: Add author attribution

See: 5900637219ccccdd39ddafa4e7181da20b8e1f1b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'
Michael Niedermayer [Thu, 29 May 2014 22:01:45 +0000 (00:01 +0200)]
Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'

* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
  dsputil: Move SVQ1 encoding specific bits into svq1enc

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'
Michael Niedermayer [Thu, 29 May 2014 21:50:56 +0000 (23:50 +0200)]
Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'

* commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e':
  svq1enc: Rename SVQ1Context to SVQ1EncContext

Conflicts:
libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: fix check for muxing overhead being unknown
Michael Niedermayer [Thu, 29 May 2014 21:39:54 +0000 (23:39 +0200)]
ffmpeg: fix check for muxing overhead being unknown

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/dsputilenc: add missing guards to ff_pix_sum16_xop
James Almer [Thu, 29 May 2014 20:05:57 +0000 (17:05 -0300)]
x86/dsputilenc: add missing guards to ff_pix_sum16_xop

XOP support was added in Yasm 1.0.0 and Nasm 2.06, and we still
support older versions.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: huffyuvdsp: port add_bytes to yasm
Christophe Gisquet [Wed, 28 May 2014 13:52:24 +0000 (15:52 +0200)]
x86: huffyuvdsp: port add_bytes to yasm

          C   MMX  SSE2
Cycles: 2972  587  302

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hpeldsp: better factorization
Christophe Gisquet [Mon, 26 May 2014 19:59:14 +0000 (21:59 +0200)]
x86: hpeldsp: better factorization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests: allow passing dimensions to videogen
Christophe Gisquet [Thu, 29 May 2014 16:48:39 +0000 (18:48 +0200)]
tests: allow passing dimensions to videogen

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agorename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16
Michael Niedermayer [Thu, 29 May 2014 17:49:29 +0000 (19:49 +0200)]
rename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16

This makes the naming more consistent with the 8bit variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agorename add_hfyu_median_prediction_int16 to add_hfyu_median_pred_int16
Michael Niedermayer [Thu, 29 May 2014 17:49:29 +0000 (19:49 +0200)]
rename add_hfyu_median_prediction_int16 to add_hfyu_median_pred_int16

This makes the naming more consistent with the 8bit variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agorename sub_hfyu_median_prediction_int16 to sub_hfyu_median_pred_int16
Michael Niedermayer [Thu, 29 May 2014 17:48:23 +0000 (19:48 +0200)]
rename sub_hfyu_median_prediction_int16 to sub_hfyu_median_pred_int16

This makes the naming more consistent with the 8bit variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/dsputilenc: implement XOP version of pix_sum16
James Almer [Thu, 29 May 2014 03:57:39 +0000 (00:57 -0300)]
x86/dsputilenc: implement XOP version of pix_sum16

SSE2: 137 cycles
XOP:   87 cycles
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '08cd92144e73195eecc28ed0348e66e255516b82'
Michael Niedermayer [Thu, 29 May 2014 16:14:56 +0000 (18:14 +0200)]
Merge commit '08cd92144e73195eecc28ed0348e66e255516b82'

* commit '08cd92144e73195eecc28ed0348e66e255516b82':
  aarch64: Use the correct syntax for relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dpx_parser: Allow frame size to be too small
Michael Niedermayer [Thu, 29 May 2014 15:26:26 +0000 (17:26 +0200)]
avcodec/dpx_parser: Allow frame size to be too small

Fixes Ticket3402

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dpx_parser: fix flushing end out
Michael Niedermayer [Thu, 29 May 2014 15:22:26 +0000 (17:22 +0200)]
avcodec/dpx_parser: fix flushing end out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dpx_parser: reset index when finding a startcode, not after
Michael Niedermayer [Thu, 29 May 2014 15:08:53 +0000 (17:08 +0200)]
avcodec/dpx_parser: reset index when finding a startcode, not after

This is simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodsputil: Split off quarterpel bits into their own context
Diego Biurrun [Wed, 8 Jan 2014 13:00:10 +0000 (14:00 +0100)]
dsputil: Split off quarterpel bits into their own context

5 years agodsputil: Move Bink-specific add_pixels8 to binkdsp
Diego Biurrun [Sun, 29 Dec 2013 10:53:00 +0000 (11:53 +0100)]
dsputil: Move Bink-specific add_pixels8 to binkdsp

5 years agodsputil: Move APE-specific bits into apedsp
Diego Biurrun [Sun, 29 Dec 2013 01:32:16 +0000 (02:32 +0100)]
dsputil: Move APE-specific bits into apedsp

5 years agodsputil: Move mspel_pixels_tab to the only place it is used
Diego Biurrun [Fri, 27 Dec 2013 09:29:14 +0000 (10:29 +0100)]
dsputil: Move mspel_pixels_tab to the only place it is used

5 years agodsputil: Move ff_alternate_*_scan tables to mpegvideo
Diego Biurrun [Fri, 27 Dec 2013 00:12:23 +0000 (01:12 +0100)]
dsputil: Move ff_alternate_*_scan tables to mpegvideo

5 years agodsputil: Move SVQ1 encoding specific bits into svq1enc
Diego Biurrun [Mon, 23 Dec 2013 18:48:43 +0000 (19:48 +0100)]
dsputil: Move SVQ1 encoding specific bits into svq1enc

5 years agosvq1enc: Rename SVQ1Context to SVQ1EncContext
Diego Biurrun [Mon, 23 Dec 2013 18:18:16 +0000 (19:18 +0100)]
svq1enc: Rename SVQ1Context to SVQ1EncContext

This allows making it visible without name clashes.

5 years agohuffyuv: change left prediction access in BGRA
Christophe Gisquet [Thu, 29 May 2014 09:10:39 +0000 (09:10 +0000)]
huffyuv: change left prediction access in BGRA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohuffyuv: avoid duplicated defines
Christophe Gisquet [Thu, 29 May 2014 09:10:38 +0000 (09:10 +0000)]
huffyuv: avoid duplicated defines

Move the defines to the dsp header.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaarch64: Use the correct syntax for relocations
Martin Storsjö [Thu, 29 May 2014 11:37:31 +0000 (14:37 +0300)]
aarch64: Use the correct syntax for relocations

This fixes building in PIC mode with gas. The examples in the gas
manual showed using a # here even though gas itself actually didn't
support that syntax (and the gas test suite only tests it without
the extra hash sign).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'
Michael Niedermayer [Thu, 29 May 2014 11:40:42 +0000 (13:40 +0200)]
Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'

* commit '962d63157322466a9a82f9f9d84c1b6f1b582f65':
  matroskaenc: set the stream timebase earlier

Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'
Michael Niedermayer [Thu, 29 May 2014 11:26:55 +0000 (13:26 +0200)]
Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'

* commit '43e7f0797f9f821a3866a20f05e512e13c82076a':
  flvenc: only write the framerate tag based on avg_frame_rate

Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/seek/lavf-flv_fmt
tests/ref/seek/vsynth2-flv
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'
Michael Niedermayer [Thu, 29 May 2014 11:05:35 +0000 (13:05 +0200)]
Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'

* commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9':
  movenc: write avg_frame_rate as the framerate, not the codec timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'
Michael Niedermayer [Thu, 29 May 2014 10:48:36 +0000 (12:48 +0200)]
Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'

* commit '81eec081afea9fc017a175581ceea7c420a0dfc3':
  matroskaenc: base DefaultDuration on the framerate, not the codec timebase

Conflicts:
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

See: ea83b032af825d10f7d6db8a71933edce5b842a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'
Michael Niedermayer [Thu, 29 May 2014 10:34:12 +0000 (12:34 +0200)]
Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'

* commit 'a53551cba86bb67efcb6105fdc337a36c43132bd':
  frame: fix the error path in av_frame_copy_props()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskaenc: set the stream timebase earlier
Anton Khirnov [Tue, 27 May 2014 08:28:24 +0000 (10:28 +0200)]
matroskaenc: set the stream timebase earlier

Fixes calculating the ts offset for audio codecs with delay.

5 years agoflvenc: only write the framerate tag based on avg_frame_rate
Anton Khirnov [Tue, 27 May 2014 07:49:29 +0000 (09:49 +0200)]
flvenc: only write the framerate tag based on avg_frame_rate

Do not fall back on the codec timebase, since that can be anything for
VFR video.