Menu
▾
▴
[gst-cvs] slomo gst-plugins-ugly: gst-plugins-ugly/ gst-plugins-ugly/gst/mpegaudioparse/
|
From: <sl...@ke...> - 2008-02-22 07:11:25
|
CVS Root: /cvs/gstreamer
Module: gst-plugins-ugly
Changes by: slomo
Date: Fri Feb 22 2008 07:11:32 UTC
Log message:
Patch by: Thiago Sousa Santos <thiagoss at lcc dot ufcg dot edu dot br>
* gst/mpegaudioparse/gstmpegaudioparse.c:
(gst_mp3_channel_mode_get_type),
(mp3_type_frame_length_from_header), (gst_mp3parse_class_init),
(gst_mp3parse_reset), (gst_mp3parse_emit_frame),
(gst_mp3parse_chain):
* gst/mpegaudioparse/gstmpegaudioparse.h:
Post channel mode and CRC as tags. Fixes bug #504493.
Modified files:
. : ChangeLog
gst/mpegaudioparse: gstmpegaudioparse.c gstmpegaudioparse.h
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ChangeLog.diff?r1=1.2336&r2=1.2337
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.c.diff?r1=1.89&r2=1.90
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.h.diff?r1=1.22&r2=1.23
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-ugly/ChangeLog,v
retrieving revision 1.2336
retrieving revision 1.2337
diff -u -d -r1.2336 -r1.2337
--- ChangeLog 22 Feb 2008 06:27:10 -0000 1.2336
+++ ChangeLog 22 Feb 2008 07:11:16 -0000 1.2337
@@ -1,5 +1,17 @@
2008-02-22 Sebastian Dröge <sl...@ci...>
+ Patch by: Thiago Sousa Santos <thiagoss at lcc dot ufcg dot edu dot br>
+
+ * gst/mpegaudioparse/gstmpegaudioparse.c:
+ (gst_mp3_channel_mode_get_type),
+ (mp3_type_frame_length_from_header), (gst_mp3parse_class_init),
+ (gst_mp3parse_reset), (gst_mp3parse_emit_frame),
+ (gst_mp3parse_chain):
+ * gst/mpegaudioparse/gstmpegaudioparse.h:
+ Post channel mode and CRC as tags. Fixes bug #504493.
+2008-02-22 Sebastian Dröge <sl...@ci...>
* ext/dvdnav/dvdnavsrc.c: (gst_dvd_nav_src_finalize):
Correctly chain up to the parent's finalize function.
Index: gstmpegaudioparse.c
RCS file: /cvs/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- gstmpegaudioparse.c 22 Feb 2008 06:25:28 -0000 1.89
+++ gstmpegaudioparse.c 22 Feb 2008 07:11:17 -0000 1.90
@@ -29,6 +29,16 @@
GST_DEBUG_CATEGORY_STATIC (mp3parse_debug);
#define GST_CAT_DEFAULT mp3parse_debug
+#define MP3_CHANNEL_MODE_UNKNOWN -1
+#define MP3_CHANNEL_MODE_STEREO 0
+#define MP3_CHANNEL_MODE_JOINT_STEREO 1
+#define MP3_CHANNEL_MODE_DUAL_CHANNEL 2
+#define MP3_CHANNEL_MODE_MONO 3
+#define CRC_UNKNOWN -1
+#define CRC_PROTECTED 0
+#define CRC_NOT_PROTECTED 1
#define GST_READ_UINT24_BE(p) (p[2] | (p[1] << 8) | (p[0] << 16))
/* elementfactory information */
@@ -100,10 +110,31 @@
static gboolean
mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total);
-/*static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */
+/* static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */
GST_BOILERPLATE (GstMPEGAudioParse, gst_mp3parse, GstElement, GST_TYPE_ELEMENT);
+#define GST_TYPE_MP3_CHANNEL_MODE (gst_mp3_channel_mode_get_type())
+G_GNUC_UNUSED static GType
+gst_mp3_channel_mode_get_type (void)
+{
+ static GType mp3_channel_mode_type = 0;
+ static GEnumValue mp3_channel_mode[] = {
+ {MP3_CHANNEL_MODE_UNKNOWN, "Unknown", "unknown"},
+ {MP3_CHANNEL_MODE_MONO, "Mono", "mono"},
+ {MP3_CHANNEL_MODE_DUAL_CHANNEL, "Dual Channel", "dual-channel"},
+ {MP3_CHANNEL_MODE_JOINT_STEREO, "Joint Stereo", "joint-stereo"},
+ {MP3_CHANNEL_MODE_STEREO, "Stereo", "stereo"},
+ {0, NULL, NULL},
+ };
+ if (!mp3_channel_mode_type) {
+ mp3_channel_mode_type =
+ g_enum_register_static ("GstMp3ChannelMode", mp3_channel_mode);
+ }
+ return mp3_channel_mode_type;
+}
static const guint mp3types_bitrates[2][3][16] = {
{
{0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,},
@@ -125,11 +156,13 @@
static inline guint
mp3_type_frame_length_from_header (GstMPEGAudioParse * mp3parse, guint32 header,
guint * put_version, guint * put_layer, guint * put_channels,
- guint * put_bitrate, guint * put_samplerate)
+ guint * put_bitrate, guint * put_samplerate, guint * put_mode,
+ guint * put_crc)
{
guint length;
- gulong mode, samplerate, bitrate, layer, channels, padding;
+ gulong mode, samplerate, bitrate, layer, channels, padding, crc;
gint lsf, mpg25;
+ GEnumValue *mode_enum;
if (header & (1 << 20)) {
lsf = (header & (1 << 19)) ? 0 : 1;
@@ -141,6 +174,8 @@
layer = 4 - ((header >> 17) & 0x3);
+ crc = (header >> 16) & 0x1;
bitrate = (header >> 12) & 0xF;
bitrate = mp3types_bitrates[lsf][layer - 1][bitrate] * 1000;
if (bitrate == 0)
@@ -167,10 +202,14 @@
break;
}
+ mode_enum =
+ g_enum_get_value (g_type_class_ref (GST_TYPE_MP3_CHANNEL_MODE), mode);
GST_DEBUG_OBJECT (mp3parse, "Calculated mp3 frame length of %u bytes",
length);
GST_DEBUG_OBJECT (mp3parse, "samplerate = %lu, bitrate = %lu, layer = %lu, "
- "channels = %lu", samplerate, bitrate, layer, channels);
+ "channels = %lu, mode = %s", samplerate, bitrate, layer, channels,
+ mode_enum->value_nick);
if (put_version)
*put_version = lsf ? 2 : 1;
@@ -182,6 +221,10 @@
*put_bitrate = bitrate;
if (put_samplerate)
*put_samplerate = samplerate;
+ if (put_mode)
+ *put_mode = mode;
+ if (put_crc)
+ *put_crc = crc;
return length;
}
@@ -242,6 +285,15 @@
G_MININT, G_MAXINT, 0, G_PARAM_READABLE));
gstelement_class->change_state = gst_mp3parse_change_state;
+/* register tags */
+#define GST_TAG_CRC "has-crc"
+#define GST_TAG_MODE "channel-mode"
+ gst_tag_register (GST_TAG_CRC, GST_TAG_FLAG_META, G_TYPE_BOOLEAN,
+ "has crc", "Using CRC", NULL);
+ gst_tag_register (GST_TAG_MODE, GST_TAG_FLAG_ENCODED, G_TYPE_STRING,
+ "channel mode", "MPEG audio channel mode", NULL);
static void
@@ -268,6 +320,9 @@
mp3parse->frame_count = 0;
mp3parse->sent_codec_tag = FALSE;
+ mp3parse->last_posted_crc = CRC_UNKNOWN;
+ mp3parse->last_posted_channel_mode = MP3_CHANNEL_MODE_UNKNOWN;
mp3parse->xing_flags = 0;
mp3parse->xing_bitrate = 0;
mp3parse->xing_frames = 0;
@@ -503,12 +558,14 @@
/* Prepare a buffer of the indicated size, timestamp it and output */
static GstFlowReturn
-gst_mp3parse_emit_frame (GstMPEGAudioParse * mp3parse, guint size)
+gst_mp3parse_emit_frame (GstMPEGAudioParse * mp3parse, guint size,
+ guint mode, guint crc)
GstBuffer *outbuf;
guint bitrate;
GstFlowReturn ret = GST_FLOW_OK;
GstClockTime push_start;
+ GstTagList *taglist;
outbuf = gst_adapter_take_buffer (mp3parse->adapter, size);
@@ -600,12 +657,49 @@
else
bitrate = mp3parse->avg_bitrate;
+ /* we will create a taglist (if any of the parameters has changed)
+ * to add the tags that changed */
+ taglist = NULL;
if ((mp3parse->last_posted_bitrate / 10000) != (bitrate / 10000)) {
- GstTagList *taglist = gst_tag_list_new ();
-
+ taglist = gst_tag_list_new ();
mp3parse->last_posted_bitrate = bitrate;
gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_BITRATE,
mp3parse->last_posted_bitrate, NULL);
+ if (mp3parse->last_posted_crc != crc) {
+ gboolean using_crc;
+ if (!taglist) {
+ taglist = gst_tag_list_new ();
+ }
+ mp3parse->last_posted_crc = crc;
+ if (mp3parse->last_posted_crc == CRC_PROTECTED) {
+ using_crc = TRUE;
+ } else {
+ using_crc = FALSE;
+ gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_CRC,
+ using_crc, NULL);
+ if (mp3parse->last_posted_channel_mode != mode) {
+ GEnumValue *mode_enum;
+ mp3parse->last_posted_channel_mode = mode;
+ mode_enum = g_enum_get_value (g_type_class_ref (GST_TYPE_MP3_CHANNEL_MODE),
+ mp3parse->last_posted_channel_mode);
+ gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_MODE,
+ mode_enum->value_nick, NULL);
+ /* if the taglist exists, we need to send it */
+ if (taglist) {
gst_element_found_tags_for_pad (GST_ELEMENT (mp3parse),
mp3parse->srcpad, taglist);
@@ -1070,10 +1164,11 @@
header = GST_READ_UINT32_BE (data);
/* if it's a valid header, go ahead and send off the frame */
if (head_check (mp3parse, header)) {
- guint bitrate = 0, layer = 0, rate = 0, channels = 0, version = 0;
+ guint bitrate = 0, layer = 0, rate = 0, channels = 0, version = 0, mode =
+ 0, crc = 0;
if (!(bpf = mp3_type_frame_length_from_header (mp3parse, header,
- &version, &layer, &channels, &bitrate, &rate)))
+ &version, &layer, &channels, &bitrate, &rate, &mode, &crc)))
goto header_error;
/*************************************************************************
@@ -1179,7 +1274,7 @@
if (!mp3parse->skip) {
mp3parse->resyncing = FALSE;
- flow = gst_mp3parse_emit_frame (mp3parse, bpf);
+ flow = gst_mp3parse_emit_frame (mp3parse, bpf, mode, crc);
} else {
GST_DEBUG_OBJECT (mp3parse, "skipping buffer of %d bytes", bpf);
gst_adapter_flush (mp3parse->adapter, bpf);
Index: gstmpegaudioparse.h
RCS file: /cvs/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gstmpegaudioparse.h 14 Jan 2008 15:02:13 -0000 1.22
+++ gstmpegaudioparse.h 22 Feb 2008 07:11:17 -0000 1.23
@@ -90,6 +90,8 @@
guint64 bitrate_sum;
guint frame_count;
guint last_posted_bitrate;
+ gint last_posted_crc;
+ guint last_posted_channel_mode;
/* Xing info */
guint32 xing_flags;
|