From eda6d89b8c1a7320e13ce6034087c5a5b754e264 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 21 May 2008 14:35:41 +0000 Subject: [PATCH] gst-libs/gst/riff/riff-media.c: Fix wrong method name in docs. Fix calculation of strf fields for broken mulaw/alaw. Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: Fix wrong method name in docs. Fix calculation of strf fields for broken mulaw/alaw. * gst-libs/gst/riff/riff-read.c: Whitespace fix and removing double ';'. --- ChangeLog | 9 +++++++++ common | 2 +- gst-libs/gst/riff/riff-media.c | 18 +++++++++--------- gst-libs/gst/riff/riff-read.c | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index e73246b5e7..5c958d2359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-05-21 Stefan Kost + + * gst-libs/gst/riff/riff-media.c: + Fix wrong method name in docs. Fix calculation of strf fields for + broken mulaw/alaw. + + * gst-libs/gst/riff/riff-read.c: + Whitespace fix and removing double ';'. + 2008-05-21 Wim Taymans * docs/design/part-playbin2.txt: diff --git a/common b/common index e365978c48..d0749502b0 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e365978c480a8fffa4bdb61568fb2cd989d1b197 +Subproject commit d0749502b0e891038593866f619a75305367b409 diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 9476d3537c..ca218c1c06 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_EXTERN (riff_debug); #define GST_CAT_DEFAULT riff_debug /** - * gst_riff_create_video_caps_with_data: + * gst_riff_create_video_caps: * @codec_fcc: fourCC codec for this codec. * @strh: pointer to the strh stream header structure. * @strf: pointer to the strf stream header structure, including any @@ -961,14 +961,14 @@ gst_riff_create_audio_caps (guint16 codec_id, GST_WARNING ("invalid depth (%d) of alaw audio, overwriting.", strf->size); strf->size = 8; - strf->av_bps = 8; - strf->blockalign = strf->av_bps * strf->channels; + strf->blockalign = (strf->size * 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->av_bps = strf->size; - strf->blockalign = strf->av_bps * strf->channels; + strf->blockalign = (strf->size * strf->channels) / 8; + strf->av_bps = strf->blockalign * strf->rate; } } rate_max = 48000; @@ -999,14 +999,14 @@ gst_riff_create_audio_caps (guint16 codec_id, GST_WARNING ("invalid depth (%d) of mulaw audio, overwriting.", strf->size); strf->size = 8; - strf->av_bps = 8; - strf->blockalign = strf->av_bps * strf->channels; + strf->blockalign = (strf->size * 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->av_bps = strf->size; - strf->blockalign = strf->av_bps * strf->channels; + strf->blockalign = (strf->size * strf->channels) / 8; + strf->av_bps = strf->blockalign * strf->rate; } } rate_max = 48000; diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 358c971010..83d9417d15 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -656,7 +656,7 @@ gst_riff_parse_info (GstElement * element, type = GST_TAG_GENRE; break; case GST_RIFF_INFO_IKEY: - type = NULL; /*"Keywords"; */ ; + type = NULL; /*"Keywords"; */ break; case GST_RIFF_INFO_ILGT: type = NULL; /*"Lightness"; */