system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 21:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

winegstreamer: Rename WG_MAJOR_TYPE_MPEG1_AUDIO to WG_MAJOR_TYPE_AUDIO_MPEG1.

Browse source
This commit is contained in:
Rémi Bernon 2022-09-26 12:36:49 +02:00 committed by Alexandre Julliard
parent b5916adfb6
commit fdf29b814c
7 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/winegstreamer/mfplat.c
View file

@ -487,9 +487,9 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
{
switch (format->major_type)
{
case WG_MAJOR_TYPE_AUDIO_MPEG1:
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_VIDEO_CINEPAK:
FIXME("Format %u not implemented!\n", format->major_type);
/* fallthrough */

40
dlls/winegstreamer/quartz_parser.c
View file

@ -208,12 +208,12 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format *
return false;
}
static bool amt_from_wg_format_mpeg1_audio(AM_MEDIA_TYPE *mt, const struct wg_format *format)
static bool amt_from_wg_format_audio_mpeg1(AM_MEDIA_TYPE *mt, const struct wg_format *format)
{
mt->majortype = MEDIATYPE_Audio;
mt->formattype = FORMAT_WaveFormatEx;
switch (format->u.mpeg1_audio.layer)
switch (format->u.audio_mpeg1.layer)
{
case 1:
case 2:
@ -228,10 +228,10 @@ static bool amt_from_wg_format_mpeg1_audio(AM_MEDIA_TYPE *mt, const struct wg_fo
mt->cbFormat = sizeof(*wave_format);
mt->pbFormat = (BYTE *)wave_format;
wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEG;
wave_format->wfx.nChannels = format->u.mpeg1_audio.channels;
wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate;
wave_format->wfx.nChannels = format->u.audio_mpeg1.channels;
wave_format->wfx.nSamplesPerSec = format->u.audio_mpeg1.rate;
wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
wave_format->fwHeadLayer = format->u.mpeg1_audio.layer;
wave_format->fwHeadLayer = format->u.audio_mpeg1.layer;
return true;
}
@ -247,8 +247,8 @@ static bool amt_from_wg_format_mpeg1_audio(AM_MEDIA_TYPE *mt, const struct wg_fo
mt->cbFormat = sizeof(*wave_format);
mt->pbFormat = (BYTE *)wave_format;
wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3;
wave_format->wfx.nChannels = format->u.mpeg1_audio.channels;
wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate;
wave_format->wfx.nChannels = format->u.audio_mpeg1.channels;
wave_format->wfx.nSamplesPerSec = format->u.audio_mpeg1.rate;
wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
/* FIXME: We can't get most of the MPEG data from the caps. We may have
* to manually parse the header. */
@ -345,8 +345,8 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
break;
}
case WG_MAJOR_TYPE_MPEG1_AUDIO:
switch (format->u.mpeg1_audio.layer)
case WG_MAJOR_TYPE_AUDIO_MPEG1:
switch (format->u.audio_mpeg1.layer)
{
case 1:
return 56000;
@ -535,12 +535,12 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool
case WG_MAJOR_TYPE_UNKNOWN:
return false;
case WG_MAJOR_TYPE_MPEG1_AUDIO:
return amt_from_wg_format_mpeg1_audio(mt, format);
case WG_MAJOR_TYPE_AUDIO:
return amt_from_wg_format_audio(mt, format);
case WG_MAJOR_TYPE_AUDIO_MPEG1:
return amt_from_wg_format_audio_mpeg1(mt, format);
case WG_MAJOR_TYPE_VIDEO:
return amt_from_wg_format_video(mt, format, wm);
@ -636,10 +636,10 @@ static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_form
return false;
}
format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
format->u.mpeg1_audio.channels = audio_format->wfx.nChannels;
format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec;
format->u.mpeg1_audio.layer = audio_format->fwHeadLayer;
format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1;
format->u.audio_mpeg1.channels = audio_format->wfx.nChannels;
format->u.audio_mpeg1.rate = audio_format->wfx.nSamplesPerSec;
format->u.audio_mpeg1.layer = audio_format->fwHeadLayer;
return true;
}
@ -658,10 +658,10 @@ static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct
return false;
}
format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
format->u.mpeg1_audio.channels = audio_format->wfx.nChannels;
format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec;
format->u.mpeg1_audio.layer = 3;
format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1;
format->u.audio_mpeg1.channels = audio_format->wfx.nChannels;
format->u.audio_mpeg1.rate = audio_format->wfx.nSamplesPerSec;
format->u.audio_mpeg1.layer = 3;
return true;
}

4
dlls/winegstreamer/quartz_transform.c
View file

@ -700,8 +700,8 @@ HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out)
};
static const struct wg_format input_format =
{
.major_type = WG_MAJOR_TYPE_MPEG1_AUDIO,
.u.mpeg1_audio =
.major_type = WG_MAJOR_TYPE_AUDIO_MPEG1,
.u.audio_mpeg1 =
{
.layer = 2,
.channels = 1,

4
dlls/winegstreamer/unixlib.h
View file

@ -38,7 +38,7 @@ struct wg_format
WG_MAJOR_TYPE_VIDEO,
WG_MAJOR_TYPE_VIDEO_CINEPAK,
WG_MAJOR_TYPE_AUDIO,
WG_MAJOR_TYPE_MPEG1_AUDIO,
WG_MAJOR_TYPE_AUDIO_MPEG1,
WG_MAJOR_TYPE_WMA,
WG_MAJOR_TYPE_H264,
} major_type;
@ -92,7 +92,7 @@ struct wg_format
uint32_t layer;
uint32_t rate;
uint32_t channels;
} mpeg1_audio;
} audio_mpeg1;
struct
{
uint32_t version;

22
dlls/winegstreamer/wg_format.c
View file

@ -198,10 +198,10 @@ static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstC
return;
}
format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
format->u.mpeg1_audio.layer = layer;
format->u.mpeg1_audio.channels = channels;
format->u.mpeg1_audio.rate = rate;
format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1;
format->u.audio_mpeg1.layer = layer;
format->u.audio_mpeg1.channels = channels;
format->u.audio_mpeg1.rate = rate;
}
static void wg_format_from_caps_video_cinepak(struct wg_format *format, const GstCaps *caps)
@ -330,7 +330,7 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t
}
}
static GstCaps *wg_format_to_caps_mpeg1_audio(const struct wg_format *format)
static GstCaps *wg_format_to_caps_audio_mpeg1(const struct wg_format *format)
{
GstCaps *caps;
@ -338,9 +338,9 @@ static GstCaps *wg_format_to_caps_mpeg1_audio(const struct wg_format *format)
return NULL;
gst_caps_set_simple(caps, "mpegversion", G_TYPE_INT, 1, NULL);
gst_caps_set_simple(caps, "layer", G_TYPE_INT, format->u.mpeg1_audio.layer, NULL);
gst_caps_set_simple(caps, "rate", G_TYPE_INT, format->u.mpeg1_audio.rate, NULL);
gst_caps_set_simple(caps, "channels", G_TYPE_INT, format->u.mpeg1_audio.channels, NULL);
gst_caps_set_simple(caps, "layer", G_TYPE_INT, format->u.audio_mpeg1.layer, NULL);
gst_caps_set_simple(caps, "rate", G_TYPE_INT, format->u.audio_mpeg1.rate, NULL);
gst_caps_set_simple(caps, "channels", G_TYPE_INT, format->u.audio_mpeg1.channels, NULL);
gst_caps_set_simple(caps, "parsed", G_TYPE_BOOLEAN, TRUE, NULL);
return caps;
@ -529,14 +529,14 @@ GstCaps *wg_format_to_caps(const struct wg_format *format)
{
case WG_MAJOR_TYPE_UNKNOWN:
return gst_caps_new_any();
case WG_MAJOR_TYPE_MPEG1_AUDIO:
return wg_format_to_caps_mpeg1_audio(format);
case WG_MAJOR_TYPE_WMA:
return wg_format_to_caps_wma(format);
case WG_MAJOR_TYPE_H264:
return wg_format_to_caps_h264(format);
case WG_MAJOR_TYPE_AUDIO:
return wg_format_to_caps_audio(format);
case WG_MAJOR_TYPE_AUDIO_MPEG1:
return wg_format_to_caps_audio_mpeg1(format);
case WG_MAJOR_TYPE_VIDEO:
return wg_format_to_caps_video(format);
case WG_MAJOR_TYPE_VIDEO_CINEPAK:
@ -553,7 +553,7 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b)
switch (a->major_type)
{
case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_AUDIO_MPEG1:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
GST_FIXME("Format %u not implemented!", a->major_type);

4
dlls/winegstreamer/wg_transform.c
View file

@ -423,7 +423,7 @@ NTSTATUS wg_transform_create(void *args)
|| !transform_append_element(transform, element, &first, &last))
goto out;
/* fallthrough */
case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_AUDIO_MPEG1:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_VIDEO_CINEPAK:
if (!(element = transform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps))
@ -473,7 +473,7 @@ NTSTATUS wg_transform_create(void *args)
gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0");
break;
case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_AUDIO_MPEG1:
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_VIDEO_CINEPAK:

8
dlls/winegstreamer/wm_reader.c
View file

@ -1509,14 +1509,14 @@ static const char *get_major_type_string(enum wg_major_type type)
{
case WG_MAJOR_TYPE_AUDIO:
return "audio";
case WG_MAJOR_TYPE_AUDIO_MPEG1:
return "mpeg1-audio";
case WG_MAJOR_TYPE_VIDEO:
return "video";
case WG_MAJOR_TYPE_VIDEO_CINEPAK:
return "cinepak";
case WG_MAJOR_TYPE_UNKNOWN:
return "unknown";
case WG_MAJOR_TYPE_MPEG1_AUDIO:
return "mpeg1-audio";
case WG_MAJOR_TYPE_WMA:
return "wma";
case WG_MAJOR_TYPE_H264:
@ -1968,7 +1968,7 @@ static HRESULT WINAPI reader_GetOutputFormat(IWMSyncReader2 *iface,
format.u.audio.format = WG_AUDIO_FORMAT_S16LE;
break;
case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_AUDIO_MPEG1:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_VIDEO_CINEPAK:
@ -2007,7 +2007,7 @@ static HRESULT WINAPI reader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD o
*count = ARRAY_SIZE(video_formats);
break;
case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_AUDIO_MPEG1:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_VIDEO_CINEPAK: