RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

various: fix typos

Browse Source
This commit is contained in:
Kacper Michajłow 2025-01-03 23:43:40 +01:00 committed by Jan Ekström
parent efcee92d0e
commit 59d1dc43b9
41 changed files with 87 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/2_bug_report_linux.yml vendored
View File

@ -26,7 +26,7 @@ body:
attributes:
label: "Other Information"
description: >
Provide follwing information if applicable.
Provide following information if applicable.
- Linux Version: `cat /etc/os-release | grep "NAME"`
- Kernel Version: `uname -a`
- GPU Model: `lspci -nn | grep VGA` or `lshw -C display -numeric`

2
.github/ISSUE_TEMPLATE/2_bug_report_windows.yml vendored
View File

@ -93,7 +93,7 @@ body:
save the terminal output to a file, and attach it to the issue.
In the case of a crash, please provide a backtrace, attach the approriate `.dmp` file
In the case of a crash, please provide a backtrace, attach the appropriate `.dmp` file
from `%LOCALAPPDATA%\CrashDumps`.

2
DOCS/client-api-changes.rst
View File

@ -57,7 +57,7 @@ API changes
TRACK_SWITCHED, METADATA_UPDATE, CHAPTER_CHANGE events
--- mpv 0.33.0 ---
1.109 - add MPV_RENDER_API_TYPE_SW and related (software rendering API)
- inactivate the opengl_cb API (always fails to initialize now)
- deactivate the opengl_cb API (always fails to initialize now)
The opengl_cb API was deprecated over 2 years ago. Use the render API
instead.
1.108 - Deprecate MPV_EVENT_IDLE

8
DOCS/interface-changes.rst
View File

@ -314,12 +314,12 @@ Interface changes
- `--save-position-on-quit` and its associated commands now store state files in
the XDG_STATE_HOME directory by default. This only has an effect on linux/bsd
systems.
- mpv now implictly saves cache files in XDG_CACHE_HOME by default. This only has
- mpv now implicitly saves cache files in XDG_CACHE_HOME by default. This only has
an effect if the user enables options that would lead to cache being stored and
only makes a difference on linux/bsd systems.
- `--cache-on-disk` no longer requires explictly setting the `--cache-dir` option
- `--cache-on-disk` no longer requires explicitly setting the `--cache-dir` option
- add `--icc-cache` and `--gpu-shader-cache` options to control whether or not to
save cache files for these features; explictly setting `--icc-cache-dir` and
save cache files for these features; explicitly setting `--icc-cache-dir` and
`--gpu-shader-cache` is no longer required
- remove the `--tone-mapping-crosstalk` option
- add `--gamut-mapping-mode=perceptual|relative|saturation|absolute|linear`
@ -461,7 +461,7 @@ Interface changes
- deprecate --input-file (there are no plans to remove this short-term,
but it will probably eventually go away <- that was a lie)
- deprecate --video-sync=display-adrop (might be removed if it's in the way;
undeprecated or readded if it's not too much of a problem)
undeprecated or re-added if it's not too much of a problem)
- deprecate all input section commands (these will be changed/removed, as
soon as mpv internals do not require them anymore)
- remove deprecated --playlist-pos alias (use --playlist-start)

22
DOCS/man/options.rst
View File

@ -573,8 +573,8 @@ Playback Control
Known problems:
- It's fragile. If anything doesn't work, random non-useful behavior may
occur. In simple cases, the player will just play nonsense and artifacts.
- It's fragile. If anything doesn't work, random behavior may occur.
In simple cases, the player will just play nonsense and artifacts.
In other cases, it may get stuck or heat the CPU. (Exceeding memory usage
significantly beyond the user-set limits would be a bug, though.)
@ -988,7 +988,7 @@ Program Behavior
Add thumbnails as video tracks (default: none).
Thumbnails get downloaded when they are added as tracks, so 'all' can
have a noticable impact on how long it takes to open the video when
have a noticeable impact on how long it takes to open the video when
there are a lot of thumbnails.
``use_manifests=<yes|no>``
@ -2315,7 +2315,7 @@ Audio
directories.
``--audio-exts=ext1,ext2,...``
Audio file extentions to try to match when using ``--audio-file-auto``,
Audio file extensions to try to match when using ``--audio-file-auto``,
``--autocreate-playlist`` or ``--directory-filter-types``.
This is a string list option. See `List Options`_ for details.
@ -2714,7 +2714,7 @@ Subtitles
(default: no). Normally, the subtitle canvas is fit into the video canvas
(e.g. letterboxed). Setting this option uses the video size as subtitle
canvas size. Can be useful to test broken subtitles, which often happen
when the video was trancoded, while attempting to keep the old subtitles.
when the video was transcoded, while attempting to keep the old subtitles.
``--sub-ass=<yes|no>``
Render ASS subtitles natively (default: yes).
@ -2748,7 +2748,7 @@ Subtitles
:all: Load all subs in the current and ``--sub-file-paths`` directories.
``--sub-auto-exts=ext1,ext2,...``
Subtitle extentions to try and match when using ``--sub-auto``. Note that
Subtitle extensions to try and match when using ``--sub-auto``. Note that
modifying this list will also affect what mpv recognizes as subtitles when
using drag and drop.
@ -3355,7 +3355,7 @@ Window
``--ontop-level=<window|system|desktop|level>``
(macOS only)
Sets the level of an ontop window (default: window).
Sets the level of an on-top window (default: window).
:window: On top of all other windows.
:system: On top of system elements like Taskbar, Menubar and Dock.
@ -7710,7 +7710,7 @@ Miscellaneous
used to disable cover art that is part of the file).
``--image-exts=ext1,ext2,...``
Image file extentions to try to match when using ``--cover-art-auto``,
Image file extensions to try to match when using ``--cover-art-auto``,
``--autocreate-playlist`` or ``--directory-filter-types``.
This is a string list option. See `List Options`_ for details.
@ -7726,21 +7726,21 @@ Miscellaneous
This is a string list option. See `List Options`_ for details.
``--video-exts=ext1,ext2,...``
Video file extentions to try to match when using ``--autocreate-playlist`` or
Video file extensions to try to match when using ``--autocreate-playlist`` or
``--directory-filter-types``.
This is a string list option. See `List Options`_ for details.
Use ``--help=video-exts`` to see default extensions.
``--archive-exts=ext1,ext2,...``
Archive file extentions to try to match when using ``--autocreate-playlist``
Archive file extensions to try to match when using ``--autocreate-playlist``
or ``--directory-filter-types``.
This is a string list option. See `List Options`_ for details. Use
``--help=archive-exts`` to see the default extensions.
``--playlist-exts=ext1,ext2,...``
Playlist file extentions to try to match when using
Playlist file extensions to try to match when using
``--autocreate-playlist`` or ``--directory-filter-types``.
This is a string list option. See `List Options`_ for details. Use

2
DOCS/release-policy.md
View File

@ -43,7 +43,7 @@ While on master:
- Create a new GitHub release using the content of `RELEASE_NOTES` related to
the new version.
- Readd -UNKNOWN suffix to version in `MPV_VERSION` file.
- Re-add -UNKNOWN suffix to version in `MPV_VERSION` file.
If necessary (to e.g. exclude commits already on master), the release can
be done on a branch with different commit history. The release branch **must**

2
TOOLS/dylib_unhell.py
View File

@ -258,7 +258,7 @@ def process_vulkan_loader(binary, loader_name, loader_relative_folder, library_n
print(">>> could not find loader library " + library_system_path)
return
print(">>> modifiying and writing loader json " + loader_name)
print(">>> modifying and writing loader json " + loader_name)
loader_bundle_file = open(loader_bundle_path, "w")
loader_library_name = os.path.basename(library_system_path)
library_path = os.path.join(library_relative_folder, loader_library_name)

2
TOOLS/lua/autoload.lua
View File

@ -332,7 +332,7 @@ local function find_and_add_entries()
extensions = EXTENSIONS
end
if not extensions then
msg.debug("stopping: no matched extentions list")
msg.debug("stopping: no matched extensions list")
return
end

2
audio/decode/ad_lavc.c
View File

@ -200,7 +200,7 @@ static int receive_frame(struct mp_filter *da, struct mp_frame *out)
if (ret == AVERROR_EOF) {
// If flushing was initialized earlier and has ended now, make it start
// over in case we get new packets at some point in the future.
// (Dont' reset the filter itself, we want to keep other state.)
// (Don't reset the filter itself, we want to keep other state.)
avcodec_flush_buffers(priv->avctx);
return ret;
} else if (ret < 0 && ret != AVERROR(EAGAIN)) {

2
audio/out/ao_coreaudio_exclusive.c
View File

@ -232,7 +232,7 @@ static int select_stream(struct ao *ao)
talloc_free(streams);
if (p->stream_idx < 0) {
MP_ERR(ao, "No useable substream found.\n");
MP_ERR(ao, "No usable substream found.\n");
goto coreaudio_error;
}

2
ci/build-freebsd.sh
View File

@ -7,7 +7,7 @@ export CFLAGS="$CFLAGS -isystem/usr/local/include -march=native"
export CXXFLAGS="$CXXFLAGS -isystem/usr/local/include"
export LDFLAGS="$LDFLAGS -L/usr/local/lib"
# TODO: readd -Ddvbin=enabled
# TODO: re-add -Ddvbin=enabled
meson setup build $common_args \
-Db_sanitize=address,undefined \

2
common/playlist.c
View File

@ -61,7 +61,7 @@ static void playlist_update_indexes(struct playlist *pl, int start, int end)
}
// Inserts the entry so that it takes "at"'s place, shifting "at" and all
// further entires to the right (or append to end, if at==NULL).
// further entries to the right (or append to end, if at==NULL).
void playlist_insert_at(struct playlist *pl, struct playlist_entry *add,
struct playlist_entry *at)
{

2
demux/demux.c
View File

@ -272,7 +272,7 @@ struct demux_internal {
// -- Access from demuxer thread only
bool enable_recording;
struct mp_recorder *recorder;
int64_t slave_unbuffered_read_bytes; // value repoted from demuxer impl.
int64_t slave_unbuffered_read_bytes; // value reported from demuxer impl.
int64_t hack_unbuffered_read_bytes; // for demux_get_bytes_read_hack()
int64_t cache_unbuffered_read_bytes; // for demux_reader_state.bytes_per_second
int64_t byte_level_seeks; // for demux_reader_state.byte_level_seeks

2
demux/demux_mkv.c
View File

@ -584,7 +584,7 @@ static void parse_trackcolour(struct demuxer *demuxer, struct mkv_track *track,
{
// Note: As per matroska spec, the order is consistent with ISO/IEC
// 23001-8:2013/DCOR1, which is the same order used by libavutil/pixfmt.h,
// so we can just re-use our avcol_ conversion functions.
// so we can just reuse our avcol_ conversion functions.
if (colour->n_matrix_coefficients) {
track->repr.sys = pl_system_from_av(colour->matrix_coefficients);
MP_DBG(demuxer, "| + Matrix: %s\n",

2
demux/stheader.h
View File

@ -119,7 +119,7 @@ struct mp_codec_params {
int rotate; // intended display rotation, in degrees, [0, 359]
int stereo_mode; // mp_stereo3d_mode (0 if none/unknown)
struct pl_color_space color; // colorspace info where available
struct pl_color_repr repr; // color representaion info where available
struct pl_color_repr repr; // color representation info where available
struct mp_rect crop; // crop to be applied
bool dovi;

2
filters/f_autoconvert.h
View File

@ -77,7 +77,7 @@ void mp_autoconvert_add_srate(struct mp_autoconvert *c, int rate);
// Reset set of allowed formats back to initial state. (This does not flush
// any frames or remove currently active filters, although to get reasonable
// behavior, you need to readd all previously allowed formats, or reset the
// behavior, you need to re-add all previously allowed formats, or reset the
// filter.)
void mp_autoconvert_clear(struct mp_autoconvert *c);

2
fuzzers/fuzzer_loadfile_direct.c
View File

@ -29,7 +29,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
if (size <= 1 || data[size - 1] != '\0')
return 0;
// Exlude data with null bytes inside
// Exclude data with null bytes inside
if (strlen(data) != size - 1)
return 0;

6
input/input.c
View File

@ -777,7 +777,7 @@ static void feed_key(struct input_ctx *ictx, int code, double scale,
return;
}
double now = mp_time_sec();
// ignore system doubleclick if we generate these events ourselves
// ignore system double-click if we generate these events ourselves
if (!force_mouse && opts->doubleclick_time && MP_KEY_IS_MOUSE_BTN_DBL(unmod))
return;
int units = 1;
@ -796,7 +796,7 @@ static void feed_key(struct input_ctx *ictx, int code, double scale,
} else if (code == MP_MBTN_LEFT && ictx->opts->allow_win_drag &&
!test_mouse(ictx, ictx->mouse_vo_x, ictx->mouse_vo_y, MP_INPUT_ALLOW_VO_DRAGGING))
{
// This is a mouse left button down event which isn't part of a doubleclick,
// This is a mouse left button down event which isn't part of a double-click,
// and the mouse is on an input section which allows VO dragging.
// Mark the dragging mouse button down in this case.
ictx->dragging_button_down = true;
@ -810,7 +810,7 @@ static void feed_key(struct input_ctx *ictx, int code, double scale,
if (code & MP_KEY_STATE_UP) {
code &= ~MP_KEY_STATE_UP;
if (code == MP_MBTN_LEFT) {
// This is a mouse left botton up event. Mark the dragging mouse button up.
// This is a mouse left button up event. Mark the dragging mouse button up.
ictx->dragging_button_down = false;
}
}

2
osdep/mac/app_hub.swift
View File

@ -100,7 +100,7 @@ class AppHub: NSObject {
@objc func stopRemote() {
#if HAVE_MACOS_MEDIA_PLAYER
log.verbose("Stoping RemoteCommandCenter")
log.verbose("Stopping RemoteCommandCenter")
remote?.stop()
#endif
}

4
osdep/timer.h
View File

@ -27,7 +27,7 @@ void mp_time_init(void);
// Return time in nanoseconds. Never wraps. Never returns negative values.
int64_t mp_time_ns(void);
// Return time in nanoseconds. Coverts raw time in nanoseconds to mp time, subtracts init offset.
// Return time in nanoseconds. Converts raw time in nanoseconds to mp time, subtracts init offset.
int64_t mp_time_ns_from_raw_time(uint64_t raw_time);
// Return time in seconds. Can have down to 1 nanosecond resolution, but will
@ -43,7 +43,7 @@ uint64_t mp_raw_time_ns(void);
void mp_sleep_ns(int64_t ns);
#if HAVE_DARWIN
// Coverts mach time to raw time in nanoseconds and returns it.
// Converts mach time to raw time in nanoseconds and returns it.
uint64_t mp_raw_time_ns_from_mach(uint64_t mach_time);
#endif

8
player/command.c
View File

@ -4555,18 +4555,18 @@ int mp_property_do(const char *name, int action, void *val,
int r = m_property_do(ctx->log, cmd->properties, name, action, val, ctx);
if (mp_msg_test(ctx->log, MSGL_V) && is_property_set(action, val)) {
struct m_option ot = {0};
struct m_option option_type = {0};
void *data = val;
switch (action) {
case M_PROPERTY_SET_NODE:
ot.type = &m_option_type_node;
option_type.type = &m_option_type_node;
break;
case M_PROPERTY_SET_STRING:
ot.type = &m_option_type_string;
option_type.type = &m_option_type_string;
data = &val;
break;
}
char *t = ot.type ? m_option_print(&ot, data) : NULL;
char *t = option_type.type ? m_option_print(&option_type, data) : NULL;
MP_VERBOSE(ctx, "Set property: %s%s%s -> %d\n",
name, t ? "=" : "", t ? t : "", r);
talloc_free(t);

2
player/lua/auto_profiles.lua
View File

@ -13,7 +13,7 @@ local pending_hooks = {} -- as set (keys only, meaningless values)
-- profile the condition is evaluated for.
local current_profile = nil
-- Cached set of all top-level mpv properities. Only used for extra validation.
-- Cached set of all top-level mpv properties. Only used for extra validation.
local property_set = {}
for _, property in pairs(mp.get_property_native("property-list")) do
property_set[property] = true

2
player/lua/console.lua
View File

@ -1838,7 +1838,7 @@ mp.register_script_message('get-input', function (script_name, args)
end)
mp.register_script_message('log', function (message)
-- input.get's edited handler is invoked after submit, so avoid modifying
-- input.get edited handler is invoked after submit, so avoid modifying
-- the default log.
if input_caller == nil then
return

6
player/lua/fzy.lua
View File

@ -150,7 +150,7 @@ end
-- Compute a matching score.
--
-- Args:
-- needle (string): must be a subequence of `haystack`, or the result is
-- needle (string): must be a subsequence of `haystack`, or the result is
-- undefined.
-- haystack (string)
-- case_sensitive (bool, optional): defaults to false
@ -180,7 +180,7 @@ end
-- in the optimal match.
--
-- Args:
-- needle (string): must be a subequence of `haystack`, or the result is
-- needle (string): must be a subsequence of `haystack`, or the result is
-- undefined.
-- haystack (string)
-- case_sensitive (bool, optional): defaults to false
@ -289,7 +289,7 @@ function fzy.get_score_ceiling()
return MATCH_MAX_LENGTH * SCORE_MATCH_CONSECUTIVE
end
-- The name of the currently-running implmenetation, "lua" or "native".
-- The name of the currently-running implementation, "lua" or "native".
function fzy.get_implementation_name()
return "lua"
end

10
player/lua/ytdl_hook.lua
View File

@ -35,14 +35,6 @@ local function Set (t)
return set
end
-- ?: surrogate (keep in mind that there is no lazy evaluation)
local function iif(cond, if_true, if_false)
if cond then
return if_true
end
return if_false
end
-- youtube-dl JSON name to mpv tag name
local tag_list = {
["artist"] = "artist",
@ -611,7 +603,7 @@ local function formats_to_edl(json, formats, use_all_formats)
end
hdr[#hdr + 1] = "!track_meta,title=" ..
edl_escape(title) .. ",byterate=" .. byterate ..
iif(#flags > 0, ",flags=" .. table.concat(flags, "+"), "")
(#flags > 0 and ",flags=" .. table.concat(flags, "+") or "")
end
if duration > 0 then

12
player/playloop.c
View File

@ -541,7 +541,7 @@ double get_current_pos_ratio(struct MPContext *mpctx, bool use_range)
struct demuxer *demuxer = mpctx->demuxer;
if (!demuxer)
return -1;
double ans = -1;
double ret = -1;
double start = 0;
double len = get_time_length(mpctx);
if (use_range) {
@ -556,18 +556,18 @@ double get_current_pos_ratio(struct MPContext *mpctx, bool use_range)
}
double pos = get_current_time(mpctx);
if (len > 0)
ans = MPCLAMP((pos - start) / len, 0, 1);
if (ans < 0) {
ret = MPCLAMP((pos - start) / len, 0, 1);
if (ret < 0) {
int64_t size = demuxer->filesize;
if (size > 0 && demuxer->filepos >= 0)
ans = MPCLAMP(demuxer->filepos / (double)size, 0, 1);
ret = MPCLAMP(demuxer->filepos / (double)size, 0, 1);
}
if (use_range) {
if (mpctx->opts->play_frames > 0)
ans = MPMAX(ans, 1.0 -
ret = MPMAX(ret, 1.0 -
mpctx->max_frames / (double) mpctx->opts->play_frames);
}
return ans;
return ret;
}
// -2 is no chapters, -1 is before first chapter

2
ta/README
View File

@ -12,7 +12,7 @@ It also provides a bunch of convenience macros and debugging facilities.
The TA functions are documented in the implementation files (ta.c, ta_utils.c).
TA is intended to be useable as library independent from mpv. It doesn't
TA is intended to be usable as library independent from mpv. It doesn't
depend on anything mpv specific.
Note:

2
test/codepoint_width.c
View File

@ -46,7 +46,7 @@ int main(void) {
assert_int_equal(W("\U0001F1F5\U0001F1F1"), 2);
assert_int_equal(W("\n"), 0); // Newline (should not take up any visual space)
assert_int_equal(W("\t"), 8); // Tab (tabstop assumend to be 8)
assert_int_equal(W("\t"), 8); // Tab (tabstop assumed to be 8)
assert_int_equal(W("\0"), 0); // Null character (non-visible)
assert_int_equal(W("A\u3042"), 3); // ASCII 'A' + full-width Japanese Hiragana 'あ' (U+3042)

2
video/filter/vf_d3d11vpp.c
View File

@ -34,7 +34,7 @@
#include "video/mp_image.h"
#include "video/mp_image_pool.h"
// For video procesor extensions identifiers reference see:
// For video processor extensions identifiers reference see:
// https://chromium.googlesource.com/chromium/src/+/5f354f38/ui/gl/swap_chain_presenter.cc
#ifndef NVIDIA_PPE_INTERFACE_GUID

8
video/out/gpu/ra.h
View File

@ -90,7 +90,7 @@ enum ra_ctype {
RA_CTYPE_FLOAT, // float formats (signed, any bit size)
};
// All formats must be useable as texture formats. All formats must be byte
// All formats must be usable as texture formats. All formats must be byte
// aligned (all pixels start and end on a byte boundary), at least as far CPU
// transfers are concerned.
struct ra_format {
@ -131,8 +131,8 @@ struct ra_tex_params {
// Size of the texture. 1D textures require h=d=1, 2D textures require d=1.
int w, h, d;
const struct ra_format *format;
bool render_src; // must be useable as source texture in a shader
bool render_dst; // must be useable as target texture in a shader
bool render_src; // must be usable as source texture in a shader
bool render_dst; // must be usable as target texture in a shader
bool storage_dst; // must be usable as a storage image (RA_VARTYPE_IMG_W)
bool blit_src; // must be usable as a blit source
bool blit_dst; // must be usable as a blit destination
@ -493,7 +493,7 @@ struct ra_fns {
// Start recording a timer. Note that valid usage requires you to pair
// every start with a stop. Trying to start a timer twice, or trying to
// stop a timer before having started it, consistutes invalid usage.
// stop a timer before having started it, constitutes invalid usage.
void (*timer_start)(struct ra *ra, ra_timer *timer);
// Stop recording a timer. This also returns any results that have been

2
video/out/gpu/video.c
View File

@ -1604,7 +1604,7 @@ found:
bool is_overwrite = strcmp(store_name, name) == 0;
// If user shader is set to align HOOKED with reference and fix its
// offset, it requires HOOKED to be resizable and overwrited.
// offset, it requires HOOKED to be resizable and overwritten.
if (is_overwrite && hook->align_offset) {
if (!trans) {
MP_ERR(p, "Hook tried to align unresizable texture %s!\n",

6
video/out/hwdec/hwdec_vaapi.c
View File

@ -166,7 +166,7 @@ static bool try_format_upload(void *priv, enum mp_imgfmt src_fmt, enum mp_imgfmt
static int init(struct ra_hwdec *hw)
{
struct priv_owner *p = hw->priv;
VAStatus vas;
VAStatus status;
for (int i = 0; interop_inits[i]; i++) {
if (interop_inits[i](hw, &p->dmabuf_interop)) {
@ -206,9 +206,9 @@ static int init(struct ra_hwdec *hw)
VAConfigID config_id;
AVVAAPIHWConfig *hwconfig = NULL;
vas = vaCreateConfig(p->display, VAProfileNone, VAEntrypointVideoProc, NULL,
status = vaCreateConfig(p->display, VAProfileNone, VAEntrypointVideoProc, NULL,
0, &config_id);
if (vas == VA_STATUS_SUCCESS) {
if (status == VA_STATUS_SUCCESS) {
hwconfig = av_hwdevice_hwconfig_alloc(p->ctx->av_device_ref);
hwconfig->config_id = config_id;
}

2
video/out/mac/common.swift
View File

@ -240,7 +240,7 @@ class Common: NSObject {
}
func lmuToLux(_ lmu: Double) -> Double {
// the polinomial approximation for apple lmu value -> lux was empirically
// the polynomial approximation for apple lmu value -> lux was empirically
// derived by firefox developers (Apple provides no documentation).
// https://bugzilla.mozilla.org/show_bug.cgi?id=793728
let power_c4: Double = 1 / pow(10, 27)

2
video/out/opengl/context.c
View File

@ -272,7 +272,7 @@ static void check_pattern(struct priv *p, int item)
p->matches++;
} else {
p->mismatches++;
MP_WARN(p, "wrong pattern, expected %d got %d (hit: %d, mis: %d)\n",
MP_WARN(p, "wrong pattern, expected %d got %d (hit: %d, miss: %d)\n",
expected, item, p->matches, p->mismatches);
}
}

2
video/out/opengl/utils.c
View File

@ -221,7 +221,7 @@ static void gl_vao_unbind(struct gl_vao *vao)
}
// Draw the vertex data (as described by the gl_vao_entry entries) in ptr
// to the screen. num is the number of vertexes. prim is usually GL_TRIANGLES.
// to the screen. num is the number of vertices. prim is usually GL_TRIANGLES.
// If ptr is NULL, then skip the upload, and use the data uploaded with the
// previous call.
void gl_vao_draw_data(struct gl_vao *vao, GLenum prim, void *ptr, size_t num)

2
video/out/vo_direct3d.c
View File

@ -473,7 +473,7 @@ static bool init_d3d(d3d_priv *priv)
return false;
}
/* Store relevant information reguarding caps of device */
/* Store relevant information regarding caps of device */
texture_caps = disp_caps.TextureCaps;
dev_caps = disp_caps.DevCaps;
priv->device_caps_power2_only = (texture_caps & D3DPTEXTURECAPS_POW2) &&

2
video/out/vo_gpu_next.c
View File

@ -886,7 +886,7 @@ static void update_tm_viz(struct pl_color_map_params *params,
if (!params->visualize_lut)
return;
// Use right half of sceen for TM visualization, constrain to 1:1 AR
// Use right half of screen for TM visualization, constrain to 1:1 AR
const float out_w = fabsf(pl_rect_w(target->crop));
const float out_h = fabsf(pl_rect_h(target->crop));
const float size = MPMIN(out_w / 2.0f, out_h);

20
video/out/vo_xv.c
View File

@ -73,7 +73,7 @@ struct xvctx {
int cfg_xv_adaptor;
int cfg_buffers;
XvAdaptorInfo *ai;
XvImageFormatValues *fo;
XvImageFormatValues *image_formats;
unsigned int formats, adaptors, xv_format;
int current_buf;
int current_ip_buf;
@ -483,10 +483,10 @@ static int reconfig(struct vo *vo, struct mp_image_params *params)
ctx->xv_format = 0;
for (i = 0; i < ctx->formats; i++) {
MP_VERBOSE(vo, "Xvideo image format: 0x%x (%4.4s) %s\n",
ctx->fo[i].id, (char *) &ctx->fo[i].id,
(ctx->fo[i].format == XvPacked) ? "packed" : "planar");
if (ctx->fo[i].id == find_xv_format(ctx->image_format))
ctx->xv_format = ctx->fo[i].id;
ctx->image_formats[i].id, (char *) &ctx->image_formats[i].id,
(ctx->image_formats[i].format == XvPacked) ? "packed" : "planar");
if (ctx->image_formats[i].id == find_xv_format(ctx->image_format))
ctx->xv_format = ctx->image_formats[i].id;
}
if (!ctx->xv_format)
return -1;
@ -741,7 +741,7 @@ static int query_format(struct vo *vo, int format)
int fourcc = find_xv_format(format);
if (fourcc) {
for (i = 0; i < ctx->formats; i++) {
if (ctx->fo[i].id == fourcc)
if (ctx->image_formats[i].id == fourcc)
return 1;
}
}
@ -756,9 +756,9 @@ static void uninit(struct vo *vo)
if (ctx->ai)
XvFreeAdaptorInfo(ctx->ai);
ctx->ai = NULL;
if (ctx->fo) {
XFree(ctx->fo);
ctx->fo = NULL;
if (ctx->image_formats) {
XFree(ctx->image_formats);
ctx->image_formats = NULL;
}
for (i = 0; i < ctx->num_buffers; i++)
deallocate_xvimage(vo, i);
@ -860,7 +860,7 @@ static int preinit(struct vo *vo)
xv_enable_vsync(vo);
xv_get_max_img_dim(vo, &ctx->max_width, &ctx->max_height);
ctx->fo = XvListImageFormats(x11->display, ctx->xv_port,
ctx->image_formats = XvListImageFormats(x11->display, ctx->xv_port,
(int *) &ctx->formats);
MP_WARN(vo, "Warning: this legacy VO has bad quality and performance, "

2
video/out/w32_common.c
View File

@ -538,7 +538,7 @@ static void begin_dragging(struct vo_w32_state *w32)
// Unfortunately, the w32->current_fs value is stale because the
// input is handled in a different thread, and we cannot wait for
// an up-to-date value before entering the model loop if dragging
// needs to be kept resonsive.
// needs to be kept responsive.
// Workaround this by intercepting the loop in the WM_MOVING message,
// where the up-to-date value is available.
SystemParametersInfoW(SPI_GETWINARRANGING, 0, &w32->win_arranging, 0);

14
video/out/wayland_common.c
View File

@ -1463,8 +1463,8 @@ static const struct zxdg_toplevel_decoration_v1_listener decoration_listener = {
configure_decorations,
};
static void pres_set_clockid(void *data, struct wp_presentation *pres,
uint32_t clockid)
static void presentation_set_clockid(void *data, struct wp_presentation *presentation,
uint32_t clockid)
{
struct vo_wayland_state *wl = data;
@ -1472,8 +1472,8 @@ static void pres_set_clockid(void *data, struct wp_presentation *pres,
wl->present_clock = true;
}
static const struct wp_presentation_listener pres_listener = {
pres_set_clockid,
static const struct wp_presentation_listener presentation_listener = {
presentation_set_clockid,
};
static void feedback_sync_output(void *data, struct wp_presentation_feedback *fback,
@ -1775,7 +1775,7 @@ static void registry_handle_add(void *data, struct wl_registry *reg, uint32_t id
if (!strcmp(interface, wp_presentation_interface.name) && found++) {
ver = MPMIN(ver, 2);
wl->presentation = wl_registry_bind(reg, id, &wp_presentation_interface, ver);
wp_presentation_add_listener(wl->presentation, &pres_listener, wl);
wp_presentation_add_listener(wl->presentation, &presentation_listener, wl);
}
if (!strcmp(interface, xdg_wm_base_interface.name) && found++) {
@ -1840,7 +1840,7 @@ static void apply_keepaspect(struct vo_wayland_state *wl, int *width, int *heigh
int phys_height = handle_round(wl->scaling, *height);
// Ensure that the size actually changes before we start trying to actually
// calculate anything so the wrong constraint for the rezie isn't choosen.
// calculate anything so the wrong constraint for the rezie isn't chosen.
if (wl->resizing && !wl->resizing_constraint &&
phys_width == mp_rect_w(wl->geometry) && phys_height == mp_rect_h(wl->geometry))
return;
@ -3261,7 +3261,7 @@ bool vo_wayland_init(struct vo *vo)
if (wl->color_manager && wl->supports_parametric && !strcmp(wl->vo->driver->name, "dmabuf-wayland")) {
wl->color_surface = xx_color_manager_v4_get_surface(wl->color_manager, wl->callback_surface);
} else {
MP_VERBOSE(wl, "Compositor does not support parametic image descriptions!\n");
MP_VERBOSE(wl, "Compositor does not support parametric image descriptions!\n");
}
return true;

2
video/repack.h
View File

@ -57,7 +57,7 @@ void repack_line(struct mp_repack *rp, int dst_x, int dst_y,
// not respected - the caller needs to make sure dst is always writable.
// The images can have different sizes (as repack_line() lets you use different
// target coordinates for dst/src).
// This also allocaters potentially required temporary buffers.
// This also allocates potentially required temporary buffers.
// dst_flags: REPACK_BUF_* flags for dst
// dst: where repack_line() writes to
// src_flags: REPACK_BUF_* flags for src