system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 05:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

winegstreamer: Rename get_preferred_format to get_current_format.

Browse source
This commit is contained in:
Rémi Bernon 2024-05-10 17:19:43 +02:00 committed by Alexandre Julliard
parent 60b2f08485
commit 08730dae2e
7 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/winegstreamer/gst_private.h
View file

@ -61,7 +61,7 @@ void wg_parser_push_data(wg_parser_t parser, const void *data, uint32_t size);
uint32_t wg_parser_get_stream_count(wg_parser_t parser);
wg_parser_stream_t wg_parser_get_stream(wg_parser_t parser, uint32_t index);
void wg_parser_stream_get_preferred_format(wg_parser_stream_t stream, struct wg_format *format);
void wg_parser_stream_get_current_format(wg_parser_stream_t stream, struct wg_format *format);
void wg_parser_stream_get_codec_format(wg_parser_stream_t stream, struct wg_format *format);
void wg_parser_stream_enable(wg_parser_stream_t stream, const struct wg_format *format);
void wg_parser_stream_disable(wg_parser_stream_t stream);

6
dlls/winegstreamer/main.c
View file

@ -176,9 +176,9 @@ wg_parser_stream_t wg_parser_get_stream(wg_parser_t parser, uint32_t index)
return params.stream;
}
void wg_parser_stream_get_preferred_format(wg_parser_stream_t stream, struct wg_format *format)
void wg_parser_stream_get_current_format(wg_parser_stream_t stream, struct wg_format *format)
{
struct wg_parser_stream_get_preferred_format_params params =
struct wg_parser_stream_get_current_format_params params =
{
.stream = stream,
.format = format,
@ -186,7 +186,7 @@ void wg_parser_stream_get_preferred_format(wg_parser_stream_t stream, struct wg_
TRACE("stream %#I64x, format %p.\n", stream, format);
WINE_UNIX_CALL(unix_wg_parser_stream_get_preferred_format, &params);
WINE_UNIX_CALL(unix_wg_parser_stream_get_current_format, &params);
}
void wg_parser_stream_get_codec_format(wg_parser_stream_t stream, struct wg_format *format)

2
dlls/winegstreamer/media_source.c
View file

@ -1673,7 +1673,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
struct media_stream *stream;
struct wg_format format;
wg_parser_stream_get_preferred_format(wg_stream, &format);
wg_parser_stream_get_current_format(wg_stream, &format);
if (FAILED(hr = stream_descriptor_create(i, &format, &descriptor)))
goto fail;
if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, wg_stream, &stream)))

16
dlls/winegstreamer/quartz_parser.c
View file

@ -1626,7 +1626,7 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin,
WG_VIDEO_FORMAT_RGB15,
};
wg_parser_stream_get_preferred_format(pin->wg_stream, &format);
wg_parser_stream_get_current_format(pin->wg_stream, &format);
memset(mt, 0, sizeof(AM_MEDIA_TYPE));
@ -2233,7 +2233,7 @@ static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const
AM_MEDIA_TYPE pad_mt;
HRESULT hr;
wg_parser_stream_get_preferred_format(pin->wg_stream, &format);
wg_parser_stream_get_current_format(pin->wg_stream, &format);
if (!amt_from_wg_format(&pad_mt, &format, false))
return E_OUTOFMEMORY;
hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE;
@ -2248,7 +2248,7 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin,
if (index > 0)
return VFW_S_NO_MORE_ITEMS;
wg_parser_stream_get_preferred_format(pin->wg_stream, &format);
wg_parser_stream_get_current_format(pin->wg_stream, &format);
if (!amt_from_wg_format(mt, &format, false))
return E_OUTOFMEMORY;
return S_OK;
@ -2311,7 +2311,7 @@ static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const
AM_MEDIA_TYPE pad_mt;
HRESULT hr;
wg_parser_stream_get_preferred_format(pin->wg_stream, &format);
wg_parser_stream_get_current_format(pin->wg_stream, &format);
if (!amt_from_wg_format(&pad_mt, &format, false))
return E_OUTOFMEMORY;
hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE;
@ -2326,7 +2326,7 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin,
if (index > 0)
return VFW_S_NO_MORE_ITEMS;
wg_parser_stream_get_preferred_format(pin->wg_stream, &format);
wg_parser_stream_get_current_format(pin->wg_stream, &format);
if (!amt_from_wg_format(mt, &format, false))
return E_OUTOFMEMORY;
return S_OK;
@ -2423,7 +2423,7 @@ static BOOL mpeg_splitter_filter_init_gst(struct parser *filter)
for (i = 0; i < stream_count; ++i)
{
stream = wg_parser_get_stream(parser, i);
wg_parser_stream_get_preferred_format(stream, &fmt);
wg_parser_stream_get_current_format(stream, &fmt);
if (fmt.major_type == WG_MAJOR_TYPE_VIDEO_MPEG1)
{
if (!create_pin(filter, wg_parser_get_stream(parser, i), L"Video"))
@ -2450,7 +2450,7 @@ static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, cons
AM_MEDIA_TYPE pad_mt;
HRESULT hr;
wg_parser_stream_get_preferred_format(pin->wg_stream, &format);
wg_parser_stream_get_current_format(pin->wg_stream, &format);
if (!amt_from_wg_format(&pad_mt, &format, false))
return E_OUTOFMEMORY;
hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE;
@ -2465,7 +2465,7 @@ static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin,
if (index > 0)
return VFW_S_NO_MORE_ITEMS;
wg_parser_stream_get_preferred_format(pin->wg_stream, &format);
wg_parser_stream_get_current_format(pin->wg_stream, &format);
if (!amt_from_wg_format(mt, &format, false))
return E_OUTOFMEMORY;
return S_OK;

4
dlls/winegstreamer/unixlib.h
View file

@ -226,7 +226,7 @@ struct wg_parser_get_stream_params
wg_parser_stream_t stream;
};
struct wg_parser_stream_get_preferred_format_params
struct wg_parser_stream_get_current_format_params
{
wg_parser_stream_t stream;
struct wg_format *format;
@ -394,7 +394,7 @@ enum unix_funcs
unix_wg_parser_get_stream_count,
unix_wg_parser_get_stream,
unix_wg_parser_stream_get_preferred_format,
unix_wg_parser_stream_get_current_format,
unix_wg_parser_stream_get_codec_format,
unix_wg_parser_stream_enable,
unix_wg_parser_stream_disable,

14
dlls/winegstreamer/wg_parser.c
View file

@ -220,9 +220,9 @@ static NTSTATUS wg_parser_push_data(void *args)
return S_OK;
}
static NTSTATUS wg_parser_stream_get_preferred_format(void *args)
static NTSTATUS wg_parser_stream_get_current_format(void *args)
{
const struct wg_parser_stream_get_preferred_format_params *params = args;
const struct wg_parser_stream_get_current_format_params *params = args;
struct wg_parser_stream *stream = get_stream(params->stream);
if (stream->current_caps)
@ -1875,7 +1875,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
X(wg_parser_get_stream_count),
X(wg_parser_get_stream),
X(wg_parser_stream_get_preferred_format),
X(wg_parser_stream_get_current_format),
X(wg_parser_stream_get_codec_format),
X(wg_parser_stream_enable),
X(wg_parser_stream_disable),
@ -1950,20 +1950,20 @@ static NTSTATUS wow64_wg_parser_push_data(void *args) {
return wg_parser_push_data(&params);
}
static NTSTATUS wow64_wg_parser_stream_get_preferred_format(void *args)
static NTSTATUS wow64_wg_parser_stream_get_current_format(void *args)
{
struct
{
wg_parser_stream_t stream;
PTR32 format;
} *params32 = args;
struct wg_parser_stream_get_preferred_format_params params =
struct wg_parser_stream_get_current_format_params params =
{
.stream = params32->stream,
.format = ULongToPtr(params32->format),
};
return wg_parser_stream_get_preferred_format(&params);
return wg_parser_stream_get_current_format(&params);
}
static NTSTATUS wow64_wg_parser_stream_get_codec_format(void *args)
@ -2226,7 +2226,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
X(wg_parser_get_stream_count),
X(wg_parser_get_stream),
X64(wg_parser_stream_get_preferred_format),
X64(wg_parser_stream_get_current_format),
X64(wg_parser_stream_get_codec_format),
X64(wg_parser_stream_enable),
X(wg_parser_stream_disable),

12
dlls/winegstreamer/wm_reader.c
View file

@ -1487,7 +1487,7 @@ static HRESULT init_stream(struct wm_reader *reader)
stream->reader = reader;
stream->index = i;
stream->selection = WMT_ON;
wg_parser_stream_get_preferred_format(stream->wg_stream, &stream->format);
wg_parser_stream_get_current_format(stream->wg_stream, &stream->format);
if (stream->format.major_type == WG_MAJOR_TYPE_AUDIO)
{
/* R.U.S.E enumerates available audio types, picks the first one it
@ -1585,7 +1585,7 @@ static HRESULT reinit_stream(struct wm_reader *reader, bool read_compressed)
stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i);
stream->reader = reader;
wg_parser_stream_get_preferred_format(stream->wg_stream, &format);
wg_parser_stream_get_current_format(stream->wg_stream, &format);
if (stream->selection == WMT_ON)
wg_parser_stream_enable(stream->wg_stream, read_compressed ? &format : &stream->format);
}
@ -2000,7 +2000,7 @@ static HRESULT WINAPI reader_GetOutputFormat(IWMSyncReader2 *iface,
return E_INVALIDARG;
}
wg_parser_stream_get_preferred_format(stream->wg_stream, &format);
wg_parser_stream_get_current_format(stream->wg_stream, &format);
switch (format.major_type)
{
@ -2061,7 +2061,7 @@ static HRESULT WINAPI reader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD o
return E_INVALIDARG;
}
wg_parser_stream_get_preferred_format(stream->wg_stream, &format);
wg_parser_stream_get_current_format(stream->wg_stream, &format);
switch (format.major_type)
{
case WG_MAJOR_TYPE_VIDEO:
@ -2312,7 +2312,7 @@ static HRESULT WINAPI reader_SetOutputProps(IWMSyncReader2 *iface, DWORD output,
return E_INVALIDARG;
}
wg_parser_stream_get_preferred_format(stream->wg_stream, &pref_format);
wg_parser_stream_get_current_format(stream->wg_stream, &pref_format);
if (pref_format.major_type != format.major_type)
{
/* R.U.S.E sets the type of the wrong stream, apparently by accident. */
@ -2498,7 +2498,7 @@ static HRESULT WINAPI reader_SetStreamsSelected(IWMSyncReader2 *iface,
if (stream->read_compressed)
{
struct wg_format format;
wg_parser_stream_get_preferred_format(stream->wg_stream, &format);
wg_parser_stream_get_current_format(stream->wg_stream, &format);
wg_parser_stream_enable(stream->wg_stream, &format);
}
else