Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

Browse Source 
* commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563':
  vble: Do not abort decoding when version is not 1
  lavr: do not pass consumed samples as a parameter to ff_audio_resample()
  lavr: correct the documentation for the ff_audio_resample() return value
  lavr: do not pass sample count as a parameter to ff_audio_convert()
  x86: h264_weight: port to cpuflags
  configure: Enable avconv filter dependencies automatically

Conflicts:
	configure
	libavcodec/x86/h264_weight.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/8/head
Michael Niedermayer 12 years ago
parent b0d9b011c7 f5fa03660d
commit 264441715b
6 changed files with 73 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 119
      libavcodec/x86/h264_weight.asm
  2. 3
      libavresample/audio_convert.c
  3. 7
      libavresample/audio_convert.h
  4. 9
      libavresample/resample.c
  5. 6
      libavresample/resample.h
  6. 12
      libavresample/utils.c

119
libavcodec/x86/h264_weight.asm
Unescape View File

@ -70,8 +70,8 @@ SECTION .text
packuswb m0, m1 packuswb m0, m1
%endmacro %endmacro
INIT_MMX INIT_MMX mmxext
cglobal h264_weight_16_mmxext, 6, 6, 0 cglobal h264_weight_16, 6, 6, 0
WEIGHT_SETUP WEIGHT_SETUP
.nextrow: .nextrow:
WEIGHT_OP 0, 4 WEIGHT_OP 0, 4
@ -83,8 +83,8 @@ cglobal h264_weight_16_mmxext, 6, 6, 0
jnz .nextrow jnz .nextrow
REP_RET REP_RET
%macro WEIGHT_FUNC_MM 3 %macro WEIGHT_FUNC_MM 2
cglobal h264_weight_%1_%3, 6, 6, %2 cglobal h264_weight_%1, 6, 6, %2
WEIGHT_SETUP WEIGHT_SETUP
.nextrow: .nextrow:
WEIGHT_OP 0, mmsize/2 WEIGHT_OP 0, mmsize/2
@ -95,13 +95,13 @@ cglobal h264_weight_%1_%3, 6, 6, %2
REP_RET REP_RET
%endmacro %endmacro
INIT_MMX INIT_MMX mmxext
WEIGHT_FUNC_MM 8, 0, mmxext WEIGHT_FUNC_MM 8, 0
INIT_XMM INIT_XMM sse2
WEIGHT_FUNC_MM 16, 8, sse2 WEIGHT_FUNC_MM 16, 8
%macro WEIGHT_FUNC_HALF_MM 3 %macro WEIGHT_FUNC_HALF_MM 2
cglobal h264_weight_%1_%3, 6, 6, %2 cglobal h264_weight_%1, 6, 6, %2
WEIGHT_SETUP WEIGHT_SETUP
sar r2d, 1 sar r2d, 1
lea r3, [r1*2] lea r3, [r1*2]
@ -120,10 +120,10 @@ cglobal h264_weight_%1_%3, 6, 6, %2
REP_RET REP_RET
%endmacro %endmacro
INIT_MMX INIT_MMX mmxext
WEIGHT_FUNC_HALF_MM 4, 0, mmxext WEIGHT_FUNC_HALF_MM 4, 0
INIT_XMM INIT_XMM sse2
WEIGHT_FUNC_HALF_MM 8, 8, sse2 WEIGHT_FUNC_HALF_MM 8, 8
%macro BIWEIGHT_SETUP 0 %macro BIWEIGHT_SETUP 0
%if ARCH_X86_64 %if ARCH_X86_64
@ -135,12 +135,32 @@ WEIGHT_FUNC_HALF_MM 8, 8, sse2
add off_regd, 1 add off_regd, 1
or off_regd, 1 or off_regd, 1
add r4, 1 add r4, 1
cmp r5, 128
jne .normal
sar r5, 1
sar r6, 1
sar off_regd, 1
sub r4, 1
.normal
%if cpuflag(ssse3)
movd m4, r5d
movd m0, r6d
%else
movd m3, r5d movd m3, r5d
movd m4, r6d movd m4, r6d
%endif
movd m5, off_regd movd m5, off_regd
movd m6, r4d movd m6, r4d
pslld m5, m6 pslld m5, m6
psrld m5, 1 psrld m5, 1
%if cpuflag(ssse3)
punpcklbw m4, m0
pshuflw m4, m4, 0
pshuflw m5, m5, 0
punpcklqdq m4, m4
punpcklqdq m5, m5
%else
%if mmsize == 16 %if mmsize == 16
pshuflw m3, m3, 0 pshuflw m3, m3, 0
pshuflw m4, m4, 0 pshuflw m4, m4, 0
@ -154,6 +174,7 @@ WEIGHT_FUNC_HALF_MM 8, 8, sse2
pshufw m5, m5, 0 pshufw m5, m5, 0
%endif %endif
pxor m7, m7 pxor m7, m7
%endif
%endmacro %endmacro
%macro BIWEIGHT_STEPA 3 %macro BIWEIGHT_STEPA 3
@ -174,8 +195,8 @@ WEIGHT_FUNC_HALF_MM 8, 8, sse2
packuswb m0, m1 packuswb m0, m1
%endmacro %endmacro
INIT_MMX INIT_MMX mmxext
cglobal h264_biweight_16_mmxext, 7, 8, 0 cglobal h264_biweight_16, 7, 8, 0
BIWEIGHT_SETUP BIWEIGHT_SETUP
movifnidn r3d, r3m movifnidn r3d, r3m
.nextrow: .nextrow:
@ -193,8 +214,8 @@ cglobal h264_biweight_16_mmxext, 7, 8, 0
jnz .nextrow jnz .nextrow
REP_RET REP_RET
%macro BIWEIGHT_FUNC_MM 3 %macro BIWEIGHT_FUNC_MM 2
cglobal h264_biweight_%1_%3, 7, 8, %2 cglobal h264_biweight_%1, 7, 8, %2
BIWEIGHT_SETUP BIWEIGHT_SETUP
movifnidn r3d, r3m movifnidn r3d, r3m
.nextrow: .nextrow:
@ -209,13 +230,13 @@ cglobal h264_biweight_%1_%3, 7, 8, %2
REP_RET REP_RET
%endmacro %endmacro
INIT_MMX INIT_MMX mmxext
BIWEIGHT_FUNC_MM 8, 0, mmxext BIWEIGHT_FUNC_MM 8, 0
INIT_XMM INIT_XMM sse2
BIWEIGHT_FUNC_MM 16, 8, sse2 BIWEIGHT_FUNC_MM 16, 8
%macro BIWEIGHT_FUNC_HALF_MM 3 %macro BIWEIGHT_FUNC_HALF_MM 2
cglobal h264_biweight_%1_%3, 7, 8, %2 cglobal h264_biweight_%1, 7, 8, %2
BIWEIGHT_SETUP BIWEIGHT_SETUP
movifnidn r3d, r3m movifnidn r3d, r3m
sar r3, 1 sar r3, 1
@ -238,40 +259,10 @@ cglobal h264_biweight_%1_%3, 7, 8, %2
REP_RET REP_RET
%endmacro %endmacro
INIT_MMX INIT_MMX mmxext
BIWEIGHT_FUNC_HALF_MM 4, 0, mmxext BIWEIGHT_FUNC_HALF_MM 4, 0
INIT_XMM INIT_XMM sse2
BIWEIGHT_FUNC_HALF_MM 8, 8, sse2 BIWEIGHT_FUNC_HALF_MM 8, 8
%macro BIWEIGHT_SSSE3_SETUP 0
%if ARCH_X86_64
%define off_regd r7d
%else
%define off_regd r3d
%endif
mov off_regd, r7m
add off_regd, 1
or off_regd, 1
add r4, 1
cmp r5, 128
jne .normal
sar r5, 1
sar r6, 1
sar off_regd, 1
sub r4, 1
.normal
movd m4, r5d
movd m0, r6d
movd m5, off_regd
movd m6, r4d
pslld m5, m6
psrld m5, 1
punpcklbw m4, m0
pshuflw m4, m4, 0
pshuflw m5, m5, 0
punpcklqdq m4, m4
punpcklqdq m5, m5
%endmacro
%macro BIWEIGHT_SSSE3_OP 0 %macro BIWEIGHT_SSSE3_OP 0
pmaddubsw m0, m4 pmaddubsw m0, m4
@ -283,9 +274,9 @@ BIWEIGHT_FUNC_HALF_MM 8, 8, sse2
packuswb m0, m2 packuswb m0, m2
%endmacro %endmacro
INIT_XMM INIT_XMM ssse3
cglobal h264_biweight_16_ssse3, 7, 8, 8 cglobal h264_biweight_16, 7, 8, 8
BIWEIGHT_SSSE3_SETUP BIWEIGHT_SETUP
movifnidn r3d, r3m movifnidn r3d, r3m
.nextrow: .nextrow:
@ -302,9 +293,9 @@ cglobal h264_biweight_16_ssse3, 7, 8, 8
jnz .nextrow jnz .nextrow
REP_RET REP_RET
INIT_XMM INIT_XMM ssse3
cglobal h264_biweight_8_ssse3, 7, 8, 8 cglobal h264_biweight_8, 7, 8, 8
BIWEIGHT_SSSE3_SETUP BIWEIGHT_SETUP
movifnidn r3d, r3m movifnidn r3d, r3m
sar r3, 1 sar r3, 1
lea r4, [r2*2] lea r4, [r2*2]

3
libavresample/audio_convert.c
Unescape View File

@ -284,9 +284,10 @@ AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr,
return ac; return ac;
} }
int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in, int len) int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in)
{ {
int use_generic = 1; int use_generic = 1;
int len = in->nb_samples;
/* determine whether to use the optimized function based on pointer and /* determine whether to use the optimized function based on pointer and
samples alignment in both the input and output */ samples alignment in both the input and output */

7
libavresample/audio_convert.h
Unescape View File

@ -72,13 +72,16 @@ AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr,
* examined to determine whether to use the generic or optimized conversion * examined to determine whether to use the generic or optimized conversion
* function (when available). * function (when available).
* *
* The number of samples to convert is determined by in->nb_samples. The output
* buffer must be large enough to handle this many samples. out->nb_samples is
* set by this function before a successful return.
*
* @param ac AudioConvert context * @param ac AudioConvert context
* @param out output audio data * @param out output audio data
* @param in input audio data * @param in input audio data
* @param len number of samples to convert
* @return 0 on success, negative AVERROR code on failure * @return 0 on success, negative AVERROR code on failure
*/ */
int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in, int len); int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in);
/* arch-specific initialization functions */ /* arch-specific initialization functions */

9
libavresample/resample.c
Unescape View File

@ -394,10 +394,9 @@ static int resample(ResampleContext *c, void *dst, const void *src,
return dst_index; return dst_index;
} }
int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src, int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src)
int *consumed)
{ {
int ch, in_samples, in_leftover, out_samples = 0; int ch, in_samples, in_leftover, consumed = 0, out_samples = 0;
int ret = AVERROR(EINVAL); int ret = AVERROR(EINVAL);
in_samples = src ? src->nb_samples : 0; in_samples = src ? src->nb_samples : 0;
@ -430,7 +429,7 @@ int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src,
/* resample each channel plane */ /* resample each channel plane */
for (ch = 0; ch < c->buffer->channels; ch++) { for (ch = 0; ch < c->buffer->channels; ch++) {
out_samples = resample(c, (void *)dst->data[ch], out_samples = resample(c, (void *)dst->data[ch],
(const void *)c->buffer->data[ch], consumed, (const void *)c->buffer->data[ch], &consumed,
c->buffer->nb_samples, dst->allocated_samples, c->buffer->nb_samples, dst->allocated_samples,
ch + 1 == c->buffer->channels); ch + 1 == c->buffer->channels);
} }
@ -440,7 +439,7 @@ int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src,
} }
/* drain consumed samples from the internal buffer */ /* drain consumed samples from the internal buffer */
ff_audio_data_drain(c->buffer, *consumed); ff_audio_data_drain(c->buffer, consumed);
av_dlog(c->avr, "resampled %d in + %d leftover to %d out + %d leftover\n", av_dlog(c->avr, "resampled %d in + %d leftover to %d out + %d leftover\n",
in_samples, in_leftover, out_samples, c->buffer->nb_samples); in_samples, in_leftover, out_samples, c->buffer->nb_samples);

6
libavresample/resample.h
Unescape View File

@ -61,10 +61,8 @@ void ff_audio_resample_free(ResampleContext **c);
* @param c ResampleContext * @param c ResampleContext
* @param dst destination audio data * @param dst destination audio data
* @param src source audio data * @param src source audio data
* @param consumed number of samples consumed from the source * @return 0 on success, negative AVERROR code on failure
* @return number of samples written to the destination
*/ */
int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src, int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src);
int *consumed);
#endif /* AVRESAMPLE_RESAMPLE_H */ #endif /* AVRESAMPLE_RESAMPLE_H */

12
libavresample/utils.c
Unescape View File

@ -313,8 +313,8 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
if (ret < 0) if (ret < 0)
return ret; return ret;
av_dlog(avr, "[convert] %s to in_buffer\n", current_buffer->name); av_dlog(avr, "[convert] %s to in_buffer\n", current_buffer->name);
ret = ff_audio_convert(avr->ac_in, avr->in_buffer, current_buffer, ret = ff_audio_convert(avr->ac_in, avr->in_buffer,
current_buffer->nb_samples); current_buffer);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else { } else {
@ -342,7 +342,6 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
if (avr->resample_needed) { if (avr->resample_needed) {
AudioData *resample_out; AudioData *resample_out;
int consumed = 0;
if (!avr->out_convert_needed && direct_output && out_samples > 0) if (!avr->out_convert_needed && direct_output && out_samples > 0)
resample_out = &output_buffer; resample_out = &output_buffer;
@ -351,7 +350,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
av_dlog(avr, "[resample] %s to %s\n", current_buffer->name, av_dlog(avr, "[resample] %s to %s\n", current_buffer->name,
resample_out->name); resample_out->name);
ret = ff_audio_resample(avr->resample, resample_out, ret = ff_audio_resample(avr->resample, resample_out,
current_buffer, &consumed); current_buffer);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -381,8 +380,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
if (direct_output && out_samples >= current_buffer->nb_samples) { if (direct_output && out_samples >= current_buffer->nb_samples) {
/* convert directly to output */ /* convert directly to output */
av_dlog(avr, "[convert] %s to output\n", current_buffer->name); av_dlog(avr, "[convert] %s to output\n", current_buffer->name);
ret = ff_audio_convert(avr->ac_out, &output_buffer, current_buffer, ret = ff_audio_convert(avr->ac_out, &output_buffer, current_buffer);
current_buffer->nb_samples);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -395,7 +393,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
return ret; return ret;
av_dlog(avr, "[convert] %s to out_buffer\n", current_buffer->name); av_dlog(avr, "[convert] %s to out_buffer\n", current_buffer->name);
ret = ff_audio_convert(avr->ac_out, avr->out_buffer, ret = ff_audio_convert(avr->ac_out, avr->out_buffer,
current_buffer, current_buffer->nb_samples); current_buffer);
if (ret < 0) if (ret < 0)
return ret; return ret;
current_buffer = avr->out_buffer; current_buffer = avr->out_buffer;

Write Preview
Loading…
Cancel
Save