@@ -471,8 +471,8 @@ end_of_layout_definition:
FFSWAP(struct elem_to_channel, e2c_vec[6], e2c_vec[4]); // FLc & FRc fifth (final), SiL & SiR seventh
FFSWAP(struct elem_to_channel, e2c_vec[7], e2c_vec[6]); // LFE2 seventh (final), SiL & SiR eight (final)
FFSWAP(struct elem_to_channel, e2c_vec[9], e2c_vec[8]); // TpFL & TpFR ninth (final), TFC tenth (final)
- FFSWAP(struct elem_to_channel, e2c_vec[11], e2c_vec[10]); // TC eleventh (final), TpSiL & TpSiR twelth
- FFSWAP(struct elem_to_channel, e2c_vec[12], e2c_vec[11]); // TpBL & TpBR twelth (final), TpSiL & TpSiR thirteenth (final)
+ FFSWAP(struct elem_to_channel, e2c_vec[11], e2c_vec[10]); // TC eleventh (final), TpSiL & TpSiR twelfth
+ FFSWAP(struct elem_to_channel, e2c_vec[12], e2c_vec[11]); // TpBL & TpBR twelfth (final), TpSiL & TpSiR thirteenth (final)
} else {
// For everything else, utilize the AV channel position define as a
// stable sort.
@@ -2188,7 +2188,7 @@ static int decode_ics(AACContext *ac, SingleChannelElement *sce,
}
}
// I see no textual basis in the spec for this occurring after SSR gain
- // control, but this is what both reference and real implmentations do
+ // control, but this is what both reference and real implementations do
if (tns->present && er_syntax) {
ret = decode_tns(ac, tns, gb, ics);
if (ret < 0)
@@ -167,7 +167,7 @@ typedef struct AacPsyContext{
* LAME psy model preset struct
*/
typedef struct PsyLamePreset {
- int quality; ///< Quality to map the rest of the vaules to.
+ int quality; ///< Quality to map the rest of the values to.
/* This is overloaded to be both kbps per channel in ABR mode, and
* requested quality in constant quality mode.
*/
@@ -221,7 +221,7 @@ typedef struct ALSDecContext {
int32_t *quant_cof_buffer; ///< contains all quantized parcor coefficients
int32_t **lpc_cof; ///< coefficients of the direct form prediction filter for a channel
int32_t *lpc_cof_buffer; ///< contains all coefficients of the direct form prediction filter
- int32_t *lpc_cof_reversed_buffer; ///< temporary buffer to set up a reversed versio of lpc_cof_buffer
+ int32_t *lpc_cof_reversed_buffer; ///< temporary buffer to set up a reversed version of lpc_cof_buffer
ALSChannelData **chan_data; ///< channel data for multi-channel correlation
ALSChannelData *chan_data_buffer; ///< contains channel data for all channels
int *reverted_channels; ///< stores a flag for each reverted channel
@@ -1546,7 +1546,7 @@ static int read_diff_float_data(ALSDecContext *ctx, unsigned int ra_frame) {
if (highest_byte) {
for (i = 0; i < frame_length; ++i) {
if (ctx->raw_samples[c][i] != 0) {
- //The following logic is taken from Tabel 14.45 and 14.46 from the ISO spec
+ //The following logic is taken from Table 14.45 and 14.46 from the ISO spec
if (av_cmp_sf_ieee754(acf[c], FLOAT_1)) {
nbits[i] = 23 - av_log2(abs(ctx->raw_samples[c][i]));
} else {
@@ -77,7 +77,7 @@ static const AVOption options[] = {
{ "rc", "Rate Control Method", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR, VE, "rc" },
{ "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, "rc" },
{ "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, "rc" },
- { "vbr_peak", "Peak Contrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, "rc" },
+ { "vbr_peak", "Peak Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, "rc" },
{ "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, "rc" },
/// Enforce HRD, Filler Data, VBAQ, Frame Skipping
@@ -62,7 +62,7 @@ static const AVOption options[] = {
{ "rc", "Set the rate control mode", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR, VE, "rc" },
{ "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, "rc" },
{ "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, "rc" },
- { "vbr_peak", "Peak Contrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, "rc" },
+ { "vbr_peak", "Peak Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, "rc" },
{ "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, "rc" },
{ "header_insertion_mode", "Set header insertion mode", OFFSET(header_insertion_mode), AV_OPT_TYPE_INT,{ .i64 = AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE_NONE }, AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE_NONE, AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE_IDR_ALIGNED, VE, "hdrmode" },
@@ -110,7 +110,7 @@ typedef const struct {
extern ConstTables ff_aptx_quant_tables[2][NB_SUBBANDS];
-/* Rounded right shift with optionnal clipping */
+/* Rounded right shift with optional clipping */
#define RSHIFT_SIZE(size) \
av_always_inline \
static int##size##_t rshift##size(int##size##_t value, int shift) \
@@ -783,7 +783,7 @@ endfunc
transpose8_4x4 d29, d3, d21, d23
store16 d22, d23, d20, d21, d2, d3, d28, d29, r8
- @ reload multiplication coefficiens to q1
+ @ reload multiplication coefficients to q1
vld1.s16 {q1}, [r9, :128]
.endm
@@ -896,7 +896,7 @@ function func_tr_32x4_\name
add r3, r11, #(56 + 3 * 64)
store16 d22, d23, d20, d21, d2, d3, d28, d29, r8
- @ reload multiplication coefficiens to q1
+ @ reload multiplication coefficients to q1
vld1.s16 {q1}, [r9, :128]
bl tr_block2
@@ -100,7 +100,7 @@ function ff_hevc_sao_edge_filter_neon_8, export=1
mov r12, r4 // r12 = height
mov r6, r0 // r6 = r0 = dst
mov r7, r1 // r7 = r1 = src
- vld1.8 {d0}, [r11] // edge_idx tabel load in d0 5x8bit
+ vld1.8 {d0}, [r11] // edge_idx table load in d0 5x8bit
vld1.16 {q1}, [r10] // sao_offset_val table load in q1, 5x16bit
vmov.u8 d1, #2
vmov.u16 q2, #1
@@ -1,5 +1,5 @@
/*
- * SSA/ASS spliting functions
+ * SSA/ASS splitting functions
* Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org>
*
* This file is part of FFmpeg.
@@ -1,5 +1,5 @@
/*
- * SSA/ASS spliting functions
+ * SSA/ASS splitting functions
* Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org>
*
* This file is part of FFmpeg.
@@ -194,7 +194,7 @@ static uint8_t get_shear_params_valid(AV1DecContext *s, int idx)
}
/**
-* update gm type/params, since cbs already implemented part of this funcation,
+* update gm type/params, since cbs already implemented part of this function,
* so we don't need to full implement spec.
*/
static void global_motion_params(AV1DecContext *s)
@@ -560,7 +560,7 @@ static int get_pixel_format(AVCodecContext *avctx)
* implemented in the future, need remove this check.
*/
if (!avctx->hwaccel) {
- av_log(avctx, AV_LOG_ERROR, "Your platform doesn't suppport"
+ av_log(avctx, AV_LOG_ERROR, "Your platform doesn't support"
" hardware accelerated AV1 decoding.\n");
return AVERROR(ENOSYS);
}
@@ -1,6 +1,6 @@
BFIN optimizations have been removed in
commit 880e2aa23645ed9871c66ee1cbd00f93c72d2d73
-The last revission with the optimizations is fa4e17c14035ebf43130fb369e1728cdd98d0b72
+The last revision with the optimizations is fa4e17c14035ebf43130fb369e1728cdd98d0b72
If you want to maintain these (or other) BFIN optimizations in ffmpeg, then please
contact ffmpeg-devel@ffmpeg.org
@@ -98,7 +98,7 @@ enum {
// Pass this element through unchanged.
BSF_ELEMENT_PASS,
// Insert this element, replacing any existing instances of it.
- // Associated values may be provided explicitly (as addtional options)
+ // Associated values may be provided explicitly (as additional options)
// or implicitly (either as side data or deduced from other parts of
// the stream).
BSF_ELEMENT_INSERT,
@@ -664,7 +664,7 @@ static void chs_filter_band_data(DCAXllDecoder *s, DCAXllChSet *c, int band)
}
}
- // Inverse pairwise channel decorrellation
+ // Inverse pairwise channel decorrelation
if (b->decor_enabled) {
int32_t *tmp[DCA_XLL_CHANNELS_MAX];
@@ -782,7 +782,7 @@ static int init_quantization_noise(DCAEncContext *c, int noise, int forbid_zero)
if (c->lfe_channel)
c->consumed_bits += 72;
- /* attempt to guess the bit distribution based on the prevoius frame */
+ /* attempt to guess the bit distribution based on the previous frame */
for (ch = 0; ch < c->fullband_channels; ch++) {
for (band = 0; band < 32; band++) {
int snr_cb = c->peak_cb[ch][band] - c->band_masking_cb[band] - noise;
@@ -182,7 +182,7 @@ static evrc_packet_rate buf_size2bitrate(const int buf_size)
*
* @param avctx the AV codec context
* @param buf_size length of the buffer
- * @param buf the bufffer
+ * @param buf the buffer
*
* @return the bitrate on success,
* RATE_ERRS if the bitrate cannot be satisfactorily determined
@@ -555,7 +555,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}
- if (s->ac == 1) // Compatbility with common command line usage
+ if (s->ac == 1) // Compatibility with common command line usage
s->ac = AC_RANGE_CUSTOM_TAB;
else if (s->ac == AC_RANGE_DEFAULT_TAB_FORCE)
s->ac = AC_RANGE_DEFAULT_TAB;
@@ -212,7 +212,7 @@ static int16_t long_term_filter(AudioDSPContext *adsp, int pitch_delay_int,
where k is in [0;6] range.
Entire delay is qual to best_delay+(k+1)/8
This is archieved by applying an interpolation filter of
- legth 33 to source signal. */
+ length 33 to source signal. */
for (k = 0; k < ANALYZED_FRAC_DELAYS; k++) {
ff_acelp_interpolate(&delayed_signal[k][0],
&sig_scaled[RES_PREV_DATA_SIZE - best_delay_int],
@@ -302,7 +302,7 @@ static av_cold int hap_init(AVCodecContext *avctx)
}
break;
default:
- av_log(avctx, AV_LOG_ERROR, "Invalid compresor %02X\n", ctx->opt_compressor);
+ av_log(avctx, AV_LOG_ERROR, "Invalid compressor %02X\n", ctx->opt_compressor);
return AVERROR_INVALIDDATA;
}
if (corrected_chunk_count != ctx->opt_chunk_count) {
@@ -3863,7 +3863,7 @@ static void hevc_decode_flush(AVCodecContext *avctx)
static const AVOption options[] = {
{ "apply_defdispwin", "Apply default display window from VUI", OFFSET(apply_defdispwin),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },
- { "strict-displaywin", "stricly apply default display window size", OFFSET(apply_defdispwin),
+ { "strict-displaywin", "strictly apply default display window size", OFFSET(apply_defdispwin),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },
{ NULL },
};
@@ -1800,7 +1800,7 @@ static int j2kenc_destroy(AVCodecContext *avctx)
return 0;
}
-// taken from the libopenjpeg wraper so it matches
+// taken from the libopenjpeg wrapper so it matches
#define OFFSET(x) offsetof(Jpeg2000EncoderContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
@@ -208,7 +208,7 @@ static int xavs2_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ret = cae->api->encoder_encode(cae->encoder, &pic, &cae->packet);
if (ret) {
- av_log(avctx, AV_LOG_ERROR, "Encoding error occured.\n");
+ av_log(avctx, AV_LOG_ERROR, "Encoding error occurred.\n");
return AVERROR_EXTERNAL;
}
@@ -49,7 +49,7 @@ typedef struct HuffEntry {
typedef struct PTable {
int value; ///< input value
- int64_t prob; ///< number of occurences of this value in input
+ int64_t prob; ///< number of occurrences of this value in input
} PTable;
typedef struct MagicYUVContext {
@@ -2091,7 +2091,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_WARNING, "Invalid number of markers coded in APP2\n");
goto out;
} else if (s->iccnum != 0 && nummarkers != s->iccnum) {
- av_log(s->avctx, AV_LOG_WARNING, "Mistmatch in coded number of ICC markers between markers\n");
+ av_log(s->avctx, AV_LOG_WARNING, "Mismatch in coded number of ICC markers between markers\n");
goto out;
} else if (seqno > nummarkers) {
av_log(s->avctx, AV_LOG_WARNING, "Mismatching sequence number and coded number of ICC markers\n");
@@ -50,7 +50,7 @@ void ff_mjpeg_encode_huffman_close(MJpegEncHuffmanContext *s,
*/
typedef struct PTable {
int value; ///< input value
- int prob; ///< number of occurences of this value in input
+ int prob; ///< number of occurrences of this value in input
} PTable;
/**
@@ -42,7 +42,7 @@ typedef struct MLZDict {
int match_len;
} MLZDict;
-/** MLZ data strucure
+/** MLZ data structure
*/
typedef struct MLZ {
int dic_code_bit;
@@ -258,7 +258,7 @@ static int encode_sample_description(AVCodecContext *avctx)
// Build font table
// We can't build a complete font table since that would require
// scanning all dialogs first. But we can at least fill in what
- // is avaiable in the ASS header
+ // is available in the ASS header
if (style && ass->styles_count) {
// Find unique font names
if (style->font_name) {
@@ -3319,7 +3319,7 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb,
// If we have not switched to studio profile than we also did not switch bps
// that means something else (like a previous instance) outside set bps which
- // would be inconsistant with the currect state, thus reset it
+ // would be inconsistant with the current state, thus reset it
if (!s->studio_profile && s->avctx->bits_per_raw_sample != 8)
s->avctx->bits_per_raw_sample = 0;
@@ -1768,7 +1768,7 @@ static av_cold int decode_init_mp3on4(AVCodecContext * avctx)
else
s->syncword = 0xfff00000;
- /* Init the first mp3 decoder in standard way, so that all tables get builded
+ /* Init the first mp3 decoder in standard way, so that all tables get built
* We replace avctx->priv_data with the context of the first decoder so that
* decode_init() does not have to be changed.
* Other decoders will be initialized here copying data from the first context
@@ -146,7 +146,7 @@ enum AVPacketSideDataType {
AV_PKT_DATA_CPB_PROPERTIES,
/**
- * Recommmends skipping the specified number of samples
+ * Recommends skipping the specified number of samples
* @code
* u32le number of samples to skip from start of this packet
* u32le number of samples to skip from end of this packet
@@ -447,7 +447,7 @@ static int parse_presentation_segment(AVCodecContext *avctx,
PGSSubObjectRef *const object = &ctx->presentation.objects[i];
if (buf_end - buf < 8) {
- av_log(avctx, AV_LOG_ERROR, "Insufficent space for object\n");
+ av_log(avctx, AV_LOG_ERROR, "Insufficient space for object\n");
ctx->presentation.object_count = i;
return AVERROR_INVALIDDATA;
}
@@ -46,7 +46,7 @@ void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t li
register ptrdiff_t line_size_4 = line_size << 2;
// hand-unrolling the loop by 4 gains about 15%
-// mininum execution time goes from 74 to 60 cycles
+// minimum execution time goes from 74 to 60 cycles
// it's faster than -funroll-loops, but using
// -funroll-loops w/ this is bad - 74 cycles again.
// all this is on a 7450, tuning for the 7450
@@ -311,7 +311,7 @@ static void put_vp8_pixels16_altivec(uint8_t *dst, ptrdiff_t dstride, uint8_t *s
perm = vec_lvsl(0, src);
#endif
// hand-unrolling the loop by 4 gains about 15%
-// mininum execution time goes from 74 to 60 cycles
+// minimum execution time goes from 74 to 60 cycles
// it's faster than -funroll-loops, but using
// -funroll-loops w/ this is bad - 74 cycles again.
// all this is on a 7450, tuning for the 7450
@@ -172,10 +172,10 @@ static int decode_header(PSDContext * s)
}
bytestream2_skip(&s->gb, len_section);
- /* image ressources */
+ /* image resources */
len_section = bytestream2_get_be32(&s->gb);
if (len_section < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "Negative size for image ressources section.\n");
+ av_log(s->avctx, AV_LOG_ERROR, "Negative size for image resources section.\n");
return AVERROR_INVALIDDATA;
}
@@ -786,7 +786,7 @@ static int qsv_process_data(AVCodecContext *avctx, QSVContext *q,
// sw_pix_fmt, coded_width/height should be set for ff_get_format(),
// assume sw_pix_fmt is NV12 and coded_width/height to be 1280x720,
- // the assumption may be not corret but will be updated after header decoded if not true.
+ // the assumption may be not correct but will be updated after header decoded if not true.
if (q->orig_pix_fmt != AV_PIX_FMT_NONE)
pix_fmt = q->orig_pix_fmt;
if (!avctx->coded_width)
@@ -1581,7 +1581,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame,
}
} else {
/* make a copy if the input is not padded as libmfx requires */
- /* and to make allocation continious for data[0]/data[1] */
+ /* and to make allocation continuous for data[0]/data[1] */
if ((frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) ||
(frame->data[1] - frame->data[0] != frame->linesize[0] * FFALIGN(qf->frame->height, q->height_align))) {
qf->frame->height = FFALIGN(frame->height, q->height_align);
@@ -436,7 +436,7 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame)
layer->planes[1].offset = layer->planes[0].pitch * mpp_frame_get_ver_stride(mppframe);
layer->planes[1].pitch = layer->planes[0].pitch;
- // we also allocate a struct in buf[0] that will allow to hold additionnal information
+ // we also allocate a struct in buf[0] that will allow to hold additional information
// for releasing properly MPP frames and decoder
framecontextref = av_buffer_allocz(sizeof(*framecontext));
if (!framecontextref) {
@@ -1,6 +1,6 @@
SH4 optimizations have been removed in
commit d6096a67422534918405abb46dafbbac4608cbc3
-The last revission with the optimizations is cbfc9046e1c7e295b74f252902ae6f255eef4e78
+The last revision with the optimizations is cbfc9046e1c7e295b74f252902ae6f255eef4e78
If you want to maintain these (or other) SH4 optimizations in ffmpeg, then please
contact ffmpeg-devel@ffmpeg.org
@@ -622,7 +622,7 @@ static int get_block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index, uin
int y1= FFMIN(block_h*2, h-sy);
int i,x,y;
- av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumtions below chckinhg only block_w
+ av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumptions below checking only block_w
ff_snow_pred_block(s, cur, tmp, ref_stride, sx, sy, block_w*2, block_h*2, &s->block[mb_x + mb_y*b_stride], plane_index, w, h);
@@ -717,7 +717,7 @@ static int get_4block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index){
int rate= 0;
const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
- av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumtions below
+ av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumptions below
for(i=0; i<9; i++){
int mb_x2= mb_x + (i%3) - 1;
@@ -1891,7 +1891,7 @@ static const AVOption options[] = {
{ "iter", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ITER }, 0, 0, VE, "motion_est" },
{ "memc_only", "Only do ME/MC (I frames -> ref, P frame -> ME+MC).", OFFSET(memc_only), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ "no_bitstream", "Skip final bitstream writeout.", OFFSET(no_bitstream), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
- { "intra_penalty", "Penalty for intra blocks in block decission", OFFSET(intra_penalty), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+ { "intra_penalty", "Penalty for intra blocks in block decision", OFFSET(intra_penalty), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
{ "iterative_dia_size", "Dia size for the iterative ME", OFFSET(iterative_dia_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
{ "sc_threshold", "Scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, VE },
{ "pred", "Spatial decomposition type", OFFSET(pred), AV_OPT_TYPE_INT, { .i64 = 0 }, DWT_97, DWT_53, VE, "pred" },
@@ -1,6 +1,6 @@
SPARC optimizations have been removed in
commit b4dd424d96f09f9bafb88e47f37df65dc4529143
-The last revission with the optimizations is fb1b70c1ed50951c5fc1a309c3c446b2eaaf564b
+The last revision with the optimizations is fb1b70c1ed50951c5fc1a309c3c446b2eaaf564b
If you want to maintain these (or other) SPARC optimizations in ffmpeg, then please
contact ffmpeg-devel@ffmpeg.org
@@ -1294,7 +1294,7 @@ static int sb_decode(AVCodecContext *avctx, void *ptr_st,
lsp_interpolate(st->old_qlsp, qlsp, interp_qlsp, st->lpc_size, sub, st->nb_subframes, 0.05f);
lsp_to_lpc(interp_qlsp, ak, st->lpc_size);
- /* Calculate reponse ratio between the low and high filter in the middle
+ /* Calculate response ratio between the low and high filter in the middle
of the band (4000 Hz) */
st->pi_gain[sub] = 1.f;
rh = 1.f;
@@ -86,7 +86,7 @@ int main(void)
/* test av_packet_alloc */
avpkt = av_packet_alloc();
if(!avpkt) {
- av_log(NULL, AV_LOG_ERROR, "av_packet_alloc failed to allcoate AVPacket\n");
+ av_log(NULL, AV_LOG_ERROR, "av_packet_alloc failed to allocate AVPacket\n");
return 1;
}
@@ -53,7 +53,7 @@ static int test_dwt(int *array, int *ref, int border[2][2], int decomp_levels, i
}
for (j = 0; j<MAX_W * MAX_W; j++) {
if (FFABS(array[j] - ref[j]) > max_diff) {
- fprintf(stderr, "missmatch at %d (%d != %d) decomp:%d border %d %d %d %d\n",
+ fprintf(stderr, "mismatch at %d (%d != %d) decomp:%d border %d %d %d %d\n",
j, array[j], ref[j],decomp_levels, border[0][0], border[0][1], border[1][0], border[1][1]);
return 2;
}
@@ -92,7 +92,7 @@ static int test_dwtf(float *array, float *ref, int border[2][2], int decomp_leve
}
for (j = 0; j<MAX_W * MAX_W; j++) {
if (FFABS(array[j] - ref[j]) > max_diff) {
- fprintf(stderr, "missmatch at %d (%f != %f) decomp:%d border %d %d %d %d\n",
+ fprintf(stderr, "mismatch at %d (%f != %f) decomp:%d border %d %d %d %d\n",
j, array[j], ref[j],decomp_levels, border[0][0], border[0][1], border[1][0], border[1][1]);
return 2;
}
@@ -124,7 +124,7 @@ int ff_v4l2_context_get_format(V4L2Context* ctx, int probe);
* Releases a V4L2Context.
*
* @param[in] ctx A pointer to a V4L2Context.
- * The caller is reponsible for freeing it.
+ * The caller is responsible for freeing it.
* It must not be used after calling this function.
*/
void ff_v4l2_context_release(V4L2Context* ctx);
@@ -187,7 +187,7 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s)
return ret;
/**
- * settingss
+ * settings
*/
if (avctx->framerate.num || avctx->framerate.den)
v4l2_set_timeperframe(s, avctx->framerate.den, avctx->framerate.num);
@@ -141,7 +141,7 @@ static int vbn_decode_frame(AVCodecContext *avctx,
return image_len;
if (image_len < linesize * avctx->coded_height) {
- av_log(avctx, AV_LOG_ERROR, "Insufficent data\n");
+ av_log(avctx, AV_LOG_ERROR, "Insufficient data\n");
ret = AVERROR_INVALIDDATA;
goto out;
}
@@ -936,7 +936,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
if (v->interlace)
v->uvsamp = get_bits1(gb);
if(!ff_vc1_bfraction_vlc.table)
- return 0; //parsing only, vlc tables havnt been allocated
+ return 0; //parsing only, vlc tables haven't been allocated
if (v->field_mode) {
if (!v->refdist_flag)
v->refdist = 0;
@@ -366,13 +366,13 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
ff_dlog(NULL, " We expect %d numbers for building the codevectors. \n",
codebook_lookup_values);
- ff_dlog(NULL, " delta %f minmum %f \n",
+ ff_dlog(NULL, " delta %f minimum %f \n",
codebook_delta_value, codebook_minimum_value);
for (i = 0; i < codebook_lookup_values; ++i) {
codebook_multiplicands[i] = get_bits(gb, codebook_value_bits);
- ff_dlog(NULL, " multiplicands*delta+minmum : %e \n",
+ ff_dlog(NULL, " multiplicands*delta+minimum : %e \n",
(float)codebook_multiplicands[i] * codebook_delta_value + codebook_minimum_value);
ff_dlog(NULL, " multiplicand %u\n", codebook_multiplicands[i]);
}
@@ -2728,7 +2728,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, AVFrame *frame,
mb_height_mul = get_bits(&gb, 5);
mb_height_div = get_bits(&gb, 3);
if (mb_width_mul != 1 || mb_width_div != 1 || mb_height_mul != 1 || mb_height_div != 1)
- avpriv_request_sample(s->avctx, "unexpected macroblock dimension multipler/divider");
+ avpriv_request_sample(s->avctx, "unexpected macroblock dimension multiplier/divider");
if (get_bits(&gb, 2))
avpriv_request_sample(s->avctx, "unknown bits");
@@ -718,7 +718,7 @@ static int vp8_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_si
int height = s->avctx->height;
if (buf_size < 3) {
- av_log(s->avctx, AV_LOG_ERROR, "Insufficent data (%d) for header\n", buf_size);
+ av_log(s->avctx, AV_LOG_ERROR, "Insufficient data (%d) for header\n", buf_size);
return AVERROR_INVALIDDATA;
}
@@ -105,7 +105,7 @@ align 16
addps m5, m7 ; m5 = Sxy_new = X[i] + Sxy_norm
%if USE_APPROXIMATION == 1
- andps m5, m0 ; if(X[i] == 0) Sxy_new = 0; Prevent aproximation error from setting pulses in array padding.
+ andps m5, m0 ; if(X[i] == 0) Sxy_new = 0; Prevent approximation error from setting pulses in array padding.
%endif
%else
@@ -25,7 +25,7 @@
; These functions are not individually interchangeable with the C versions.
; While C takes arrays of FFTComplex, SSE/3DNow leave intermediate results
-; in blocks as conventient to the vector size.
+; in blocks as convenient to the vector size.
; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively)
%include "libavutil/x86/x86util.asm"
@@ -532,7 +532,7 @@ cglobal hevc_idct_8x8_%1, 1, 1, 8, coeffs
; %1, %2 - transform constants
; %3, %4 - regs with interleaved coeffs
; %5 - 1/0 SWAP or add
-; %6, %7 - registers for intermidiate sums
+; %6, %7 - registers for intermediate sums
; %8 - accumulator register
%macro ADD_ROWS 8
pmaddwd %6, %3, %1
From d0228938b40dd43d6fdcb901d582c9ba359bc011 Mon Sep 17 00:00:00 2001 From: luz paz <luzpaz@pm.me> Date: Tue, 12 Apr 2022 19:04:54 -0400 Subject: [PATCH] avcodec: fix typos in libavcodec/ Fixes source comments and some doxygen/documentation related typos. --- libavcodec/aacdec_template.c | 6 +++--- libavcodec/aacpsy.c | 2 +- libavcodec/alsdec.c | 4 ++-- libavcodec/amfenc_h264.c | 2 +- libavcodec/amfenc_hevc.c | 2 +- libavcodec/aptx.h | 2 +- libavcodec/arm/hevcdsp_idct_neon.S | 4 ++-- libavcodec/arm/hevcdsp_sao_neon.S | 2 +- libavcodec/ass_split.c | 2 +- libavcodec/ass_split.h | 2 +- libavcodec/av1dec.c | 4 ++-- libavcodec/bfin/README | 2 +- libavcodec/cbs_bsf.h | 2 +- libavcodec/dca_xll.c | 2 +- libavcodec/dcaenc.c | 2 +- libavcodec/evrcdec.c | 2 +- libavcodec/ffv1enc.c | 2 +- libavcodec/g729postfilter.c | 2 +- libavcodec/hapenc.c | 2 +- libavcodec/hevcdec.c | 2 +- libavcodec/j2kenc.c | 2 +- libavcodec/libxavs2.c | 2 +- libavcodec/magicyuvenc.c | 2 +- libavcodec/mjpegdec.c | 2 +- libavcodec/mjpegenc_huffman.h | 2 +- libavcodec/mlz.h | 2 +- libavcodec/movtextenc.c | 2 +- libavcodec/mpeg4videodec.c | 2 +- libavcodec/mpegaudiodec_template.c | 2 +- libavcodec/packet.h | 2 +- libavcodec/pgssubdec.c | 2 +- libavcodec/ppc/hpeldsp_altivec.c | 2 +- libavcodec/ppc/vp8dsp_altivec.c | 2 +- libavcodec/psd.c | 4 ++-- libavcodec/qsvdec.c | 2 +- libavcodec/qsvenc.c | 2 +- libavcodec/rkmppdec.c | 2 +- libavcodec/sh4/README | 2 +- libavcodec/snowenc.c | 6 +++--- libavcodec/sparc/README | 2 +- libavcodec/speexdec.c | 2 +- libavcodec/tests/avpacket.c | 2 +- libavcodec/tests/jpeg2000dwt.c | 4 ++-- libavcodec/v4l2_context.h | 2 +- libavcodec/v4l2_m2m_enc.c | 2 +- libavcodec/vbndec.c | 2 +- libavcodec/vc1.c | 2 +- libavcodec/vorbisdec.c | 4 ++-- libavcodec/vp3.c | 2 +- libavcodec/vp8.c | 2 +- libavcodec/x86/celt_pvq_search.asm | 2 +- libavcodec/x86/fft.asm | 2 +- libavcodec/x86/hevc_idct.asm | 2 +- 53 files changed, 63 insertions(+), 63 deletions(-) -- 2.35.1