mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtp: whitespace fixes

Browse source
This commit is contained in:
Wim Taymans 2009-08-27 12:36:37 +02:00
parent 8ab76351d8
commit 6a53d0a2c9
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/rtp/gstrtpamrdepay.c
View file

@ -270,6 +270,7 @@ static gint nb_frame_size[16] = {
12, 13, 15, 17, 19, 20, 26, 31, 12, 13, 15, 17, 19, 20, 26, 31,
5, -1, -1, -1, -1, -1, -1, 0 5, -1, -1, -1, -1, -1, -1, 0
}; };
static gint wb_frame_size[16] = { static gint wb_frame_size[16] = {
17, 23, 32, 36, 40, 46, 50, 58, 17, 23, 32, 36, 40, 46, 50, 58,
60, -1, -1, -1, -1, -1, -1, 0 60, -1, -1, -1, -1, -1, -1, 0
@ -291,7 +292,7 @@ gst_rtp_amr_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
else else
frame_size = wb_frame_size; frame_size = wb_frame_size;
/* when we get here, 1 channel, 8000/16000 Hz, octet aligned, no CRC, /* when we get here, 1 channel, 8000/16000 Hz, octet aligned, no CRC,
* no robust sorting, no interleaving data is to be depayloaded */ * no robust sorting, no interleaving data is to be depayloaded */
{ {
guint8 *payload, *p, *dp; guint8 *payload, *p, *dp;
@ -311,7 +312,7 @@ gst_rtp_amr_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
/* depay CMR. The CMR is used by the sender to request /* depay CMR. The CMR is used by the sender to request
* a new encoding mode. * a new encoding mode.
* *
* 0 1 2 3 4 5 6 7 * 0 1 2 3 4 5 6 7
* +-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+
* | CMR |R|R|R|R| * | CMR |R|R|R|R|
* +-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+
@ -335,8 +336,8 @@ gst_rtp_amr_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
goto wrong_interleaving; goto wrong_interleaving;
} }
/* /*
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6
* +-+-+-+-+-+-+-+-+.. * +-+-+-+-+-+-+-+-+..
* |F| FT |Q|P|P| more FT.. * |F| FT |Q|P|P| more FT..
* +-+-+-+-+-+-+-+-+.. * +-+-+-+-+-+-+-+-+..

17
gst/rtp/gstrtpamrpay.c
View file

@ -32,10 +32,10 @@ GST_DEBUG_CATEGORY_STATIC (rtpamrpay_debug);
/* references: /* references:
* *
* RFC 3267 - Real-Time Transport Protocol (RTP) Payload Format and File * RFC 3267 - Real-Time Transport Protocol (RTP) Payload Format and File
* Storage Format for the Adaptive Multi-Rate (AMR) and Adaptive * Storage Format for the Adaptive Multi-Rate (AMR) and Adaptive
* Multi-Rate Wideband (AMR-WB) Audio Codecs. * Multi-Rate Wideband (AMR-WB) Audio Codecs.
* *
* ETSI TS 126 201 V6.0.0 (2004-12) - Digital cellular telecommunications system (Phase 2+); * ETSI TS 126 201 V6.0.0 (2004-12) - Digital cellular telecommunications system (Phase 2+);
* Universal Mobile Telecommunications System (UMTS); * Universal Mobile Telecommunications System (UMTS);
* AMR speech codec, wideband; * AMR speech codec, wideband;
@ -164,11 +164,11 @@ gst_rtp_amr_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
gst_basertppayload_set_outcaps (basepayload, gst_basertppayload_set_outcaps (basepayload,
"encoding-params", G_TYPE_STRING, "1", "octet-align", G_TYPE_STRING, "1", "encoding-params", G_TYPE_STRING, "1", "octet-align", G_TYPE_STRING, "1",
/* don't set the defaults /* don't set the defaults
* *
* "crc", G_TYPE_STRING, "0", * "crc", G_TYPE_STRING, "0",
* "robust-sorting", G_TYPE_STRING, "0", * "robust-sorting", G_TYPE_STRING, "0",
* "interleaving", G_TYPE_STRING, "0", * "interleaving", G_TYPE_STRING, "0",
*/ */
NULL); NULL);
@ -188,6 +188,7 @@ static gint nb_frame_size[16] = {
12, 13, 15, 17, 19, 20, 26, 31, 12, 13, 15, 17, 19, 20, 26, 31,
5, -1, -1, -1, -1, -1, -1, 0 5, -1, -1, -1, -1, -1, -1, 0
}; };
static gint wb_frame_size[16] = { static gint wb_frame_size[16] = {
17, 23, 32, 36, 40, 46, 50, 58, 17, 23, 32, 36, 40, 46, 50, 58,
60, -1, -1, -1, -1, -1, -1, 0 60, -1, -1, -1, -1, -1, -1, 0
@ -224,7 +225,7 @@ gst_rtp_amr_pay_handle_buffer (GstBaseRTPPayload * basepayload,
GST_DEBUG_OBJECT (basepayload, "got %d bytes", size); GST_DEBUG_OBJECT (basepayload, "got %d bytes", size);
/* FIXME, only /* FIXME, only
* octet aligned, no interleaving, single channel, no CRC, * octet aligned, no interleaving, single channel, no CRC,
* no robust-sorting. To fix this you need to implement the downstream * no robust-sorting. To fix this you need to implement the downstream
* negotiation function. */ * negotiation function. */
@ -282,7 +283,7 @@ gst_rtp_amr_pay_handle_buffer (GstBaseRTPPayload * basepayload,
/* get payload, this is now writable */ /* get payload, this is now writable */
payload = gst_rtp_buffer_get_payload (outbuf); payload = gst_rtp_buffer_get_payload (outbuf);
/* 0 1 2 3 4 5 6 7 /* 0 1 2 3 4 5 6 7
* +-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+
* | CMR |R|R|R|R| * | CMR |R|R|R|R|
* +-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+