From edbd1784bf896b6f1df3690aae9dc5bab13fd371 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Mon, 9 Jul 2012 12:27:22 +0200 Subject: [PATCH] riff: rename field in gst_riff_strf_auds ... which is supposed to align with WAVEFORMATEX, but has confusing names compared to the last 2 fields in the latter (and still misses 1 field compared to the latter). --- gst-libs/gst/riff/riff-ids.h | 6 ++-- gst-libs/gst/riff/riff-media.c | 64 +++++++++++++++++++++--------------------- gst-libs/gst/riff/riff-read.c | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h index 9442018..c1ed2cf 100644 --- a/gst-libs/gst/riff/riff-ids.h +++ b/gst-libs/gst/riff/riff-ids.h @@ -449,11 +449,11 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */ guint32 rate; guint32 av_bps; guint16 blockalign; -#if 0 - /* missing field: */ guint16 bits_per_sample; +#if 0 + /* missing field */ + guint16 extra_size; #endif - guint16 size; } gst_riff_strf_auds; typedef struct _gst_riff_strf_iavs { diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 638ed20..9465c5e 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -1179,22 +1179,22 @@ gst_riff_create_audio_caps (guint16 codec_id, GstAudioFormat format; /* If we have an empty blockalign, we take the width contained in - * strf->size */ + * strf->bits_per_sample */ if (ba != 0) wd = ba * 8 / ch; else - wd = strf->size; + wd = strf->bits_per_sample; - if (strf->size > 32) { + if (strf->bits_per_sample > 32) { GST_WARNING ("invalid depth (%d) of pcm audio, overwriting.", - strf->size); - strf->size = 8 * ((wd + 7) / 8); + strf->bits_per_sample); + strf->bits_per_sample = 8 * ((wd + 7) / 8); } /* in riff, the depth is stored in the size field but it just means that * the _least_ significant bits are cleared. We can therefore just play * the sample as if it had a depth == width */ - /* For reference, the actual depth is in strf->size */ + /* For reference, the actual depth is in strf->bits_per_sample */ ws = wd; format = @@ -1222,7 +1222,7 @@ gst_riff_create_audio_caps (guint16 codec_id, } if (codec_name && strf) *codec_name = g_strdup_printf ("Uncompressed %d-bit PCM audio", - strf->size); + strf->bits_per_sample); break; case GST_RIFF_WAVE_FORMAT_ADPCM: @@ -1264,7 +1264,7 @@ gst_riff_create_audio_caps (guint16 codec_id, } if (codec_name && strf) *codec_name = g_strdup_printf ("Uncompressed %d-bit IEEE float audio", - strf->size); + strf->bits_per_sample); break; case GST_RIFF_WAVE_FORMAT_IBM_CVSD: @@ -1272,17 +1272,17 @@ gst_riff_create_audio_caps (guint16 codec_id, case GST_RIFF_WAVE_FORMAT_ALAW: if (strf != NULL) { - if (strf->size != 8) { + if (strf->bits_per_sample != 8) { GST_WARNING ("invalid depth (%d) of alaw audio, overwriting.", - strf->size); - strf->size = 8; - strf->blockalign = (strf->size * strf->channels) / 8; + strf->bits_per_sample); + strf->bits_per_sample = 8; + strf->blockalign = (strf->bits_per_sample * strf->channels) / 8; strf->av_bps = strf->blockalign * strf->rate; } if (strf->av_bps == 0 || strf->blockalign == 0) { GST_WARNING ("fixing av_bps (%d) and blockalign (%d) of alaw audio", strf->av_bps, strf->blockalign); - strf->blockalign = (strf->size * strf->channels) / 8; + strf->blockalign = (strf->bits_per_sample * strf->channels) / 8; strf->av_bps = strf->blockalign * strf->rate; } } @@ -1297,8 +1297,8 @@ gst_riff_create_audio_caps (guint16 codec_id, if (strf != NULL) { gst_caps_set_simple (caps, "bitrate", G_TYPE_INT, strf->av_bps * 8, - "width", G_TYPE_INT, strf->size, - "depth", G_TYPE_INT, strf->size, NULL); + "width", G_TYPE_INT, strf->bits_per_sample, + "depth", G_TYPE_INT, strf->bits_per_sample, NULL); } else { gst_caps_set_simple (caps, "bitrate", GST_TYPE_INT_RANGE, 0, G_MAXINT, NULL); @@ -1310,17 +1310,17 @@ gst_riff_create_audio_caps (guint16 codec_id, case GST_RIFF_WAVE_FORMAT_MULAW: if (strf != NULL) { - if (strf->size != 8) { + if (strf->bits_per_sample != 8) { GST_WARNING ("invalid depth (%d) of mulaw audio, overwriting.", - strf->size); - strf->size = 8; - strf->blockalign = (strf->size * strf->channels) / 8; + strf->bits_per_sample); + strf->bits_per_sample = 8; + strf->blockalign = (strf->bits_per_sample * strf->channels) / 8; strf->av_bps = strf->blockalign * strf->rate; } if (strf->av_bps == 0 || strf->blockalign == 0) { GST_WARNING ("fixing av_bps (%d) and blockalign (%d) of mulaw audio", strf->av_bps, strf->blockalign); - strf->blockalign = (strf->size * strf->channels) / 8; + strf->blockalign = (strf->bits_per_sample * strf->channels) / 8; strf->av_bps = strf->blockalign * strf->rate; } } @@ -1454,7 +1454,7 @@ gst_riff_create_audio_caps (guint16 codec_id, if (strf != NULL) { gst_caps_set_simple (caps, "bitrate", G_TYPE_INT, strf->av_bps * 8, - "depth", G_TYPE_INT, strf->size, NULL); + "depth", G_TYPE_INT, strf->bits_per_sample, NULL); } else { gst_caps_set_simple (caps, "bitrate", GST_TYPE_INT_RANGE, 0, G_MAXINT, NULL); @@ -1553,7 +1553,7 @@ gst_riff_create_audio_caps (guint16 codec_id, ws = wd; /* For reference, use this to get the actual depth: - * ws = strf->size; + * ws = strf->bits_per_sample; * if (valid_bits_per_sample != 0) * ws = valid_bits_per_sample; */ @@ -1585,7 +1585,7 @@ gst_riff_create_audio_caps (guint16 codec_id, if (codec_name) { *codec_name = g_strdup_printf ("Uncompressed %d-bit PCM audio", - strf->size); + strf->bits_per_sample); } } } else if (subformat_guid[0] == 0x00000003) { @@ -1619,16 +1619,16 @@ gst_riff_create_audio_caps (guint16 codec_id, if (codec_name) { *codec_name = g_strdup_printf ("Uncompressed %d-bit IEEE float audio", - strf->size); + strf->bits_per_sample); } } } else if (subformat_guid[0] == 00000006) { GST_DEBUG ("ALAW"); if (strf != NULL) { - if (strf->size != 8) { + if (strf->bits_per_sample != 8) { GST_WARNING ("invalid depth (%d) of alaw audio, overwriting.", - strf->size); - strf->size = 8; + strf->bits_per_sample); + strf->bits_per_sample = 8; strf->av_bps = 8; strf->blockalign = strf->av_bps * strf->channels; } @@ -1636,7 +1636,7 @@ gst_riff_create_audio_caps (guint16 codec_id, GST_WARNING ("fixing av_bps (%d) and blockalign (%d) of alaw audio", strf->av_bps, strf->blockalign); - strf->av_bps = strf->size; + strf->av_bps = strf->bits_per_sample; strf->blockalign = strf->av_bps * strf->channels; } } @@ -1648,10 +1648,10 @@ gst_riff_create_audio_caps (guint16 codec_id, } else if (subformat_guid[0] == 0x00000007) { GST_DEBUG ("MULAW"); if (strf != NULL) { - if (strf->size != 8) { + if (strf->bits_per_sample != 8) { GST_WARNING ("invalid depth (%d) of mulaw audio, overwriting.", - strf->size); - strf->size = 8; + strf->bits_per_sample); + strf->bits_per_sample = 8; strf->av_bps = 8; strf->blockalign = strf->av_bps * strf->channels; } @@ -1659,7 +1659,7 @@ gst_riff_create_audio_caps (guint16 codec_id, GST_WARNING ("fixing av_bps (%d) and blockalign (%d) of mulaw audio", strf->av_bps, strf->blockalign); - strf->av_bps = strf->size; + strf->av_bps = strf->bits_per_sample; strf->blockalign = strf->av_bps * strf->channels; } } diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 41cc413..25ed388 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -517,7 +517,7 @@ gst_riff_parse_strf_auds (GstElement * element, GST_INFO_OBJECT (element, " rate %d", strf->rate); GST_INFO_OBJECT (element, " av_bps %d", strf->av_bps); GST_INFO_OBJECT (element, " blockalign %d", strf->blockalign); - GST_INFO_OBJECT (element, " size %d", strf->size); + GST_INFO_OBJECT (element, " bits/sample %d", strf->bits_per_sample); if (*data) GST_INFO_OBJECT (element, " %" G_GSIZE_FORMAT " bytes extradata", gst_buffer_get_size (*data)); -- 2.7.4