From 00b2b599d6c4035b5c6e018986b05976bd57f337 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Thu, 4 Jul 2019 19:42:48 +0900 Subject: [PATCH] mpegtsmux: Remove white space --- gst/mpegtsmux/gstbasetsmux.c | 12 ++++++------ gst/mpegtsmux/gstbasetsmux.h | 12 ++++++------ gst/mpegtsmux/gstbasetsmuxaac.c | 12 ++++++------ gst/mpegtsmux/gstbasetsmuxaac.h | 18 +++++++++--------- gst/mpegtsmux/gstbasetsmuxjpeg2000.c | 2 +- gst/mpegtsmux/gstbasetsmuxjpeg2000.h | 2 +- gst/mpegtsmux/gstbasetsmuxopus.c | 12 ++++++------ gst/mpegtsmux/gstbasetsmuxopus.h | 18 +++++++++--------- gst/mpegtsmux/gstbasetsmuxttxt.c | 12 ++++++------ gst/mpegtsmux/gstbasetsmuxttxt.h | 18 +++++++++--------- gst/mpegtsmux/gstmpegtsmux.c | 12 ++++++------ gst/mpegtsmux/gstmpegtsmux.h | 12 ++++++------ gst/mpegtsmux/tsmux/tsmux.c | 24 ++++++++++++------------ gst/mpegtsmux/tsmux/tsmux.h | 12 ++++++------ gst/mpegtsmux/tsmux/tsmuxcommon.h | 12 ++++++------ gst/mpegtsmux/tsmux/tsmuxstream.c | 20 ++++++++++---------- gst/mpegtsmux/tsmux/tsmuxstream.h | 16 ++++++++-------- 17 files changed, 113 insertions(+), 113 deletions(-) diff --git a/gst/mpegtsmux/gstbasetsmux.c b/gst/mpegtsmux/gstbasetsmux.c index b171446..9ee7e53 100644 --- a/gst/mpegtsmux/gstbasetsmux.c +++ b/gst/mpegtsmux/gstbasetsmux.c @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -12,7 +12,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -61,17 +61,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/gstbasetsmux.h b/gst/mpegtsmux/gstbasetsmux.h index 7b89225..d5f9612 100644 --- a/gst/mpegtsmux/gstbasetsmux.h +++ b/gst/mpegtsmux/gstbasetsmux.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/gstbasetsmuxaac.c b/gst/mpegtsmux/gstbasetsmuxaac.c index 04dcd00..455cd2f 100644 --- a/gst/mpegtsmux/gstbasetsmuxaac.c +++ b/gst/mpegtsmux/gstbasetsmuxaac.c @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/gstbasetsmuxaac.h b/gst/mpegtsmux/gstbasetsmuxaac.h index 9e60a56..58eb46c 100644 --- a/gst/mpegtsmux/gstbasetsmuxaac.h +++ b/gst/mpegtsmux/gstbasetsmuxaac.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -79,13 +79,13 @@ * SOFTWARE. * */ - + #ifndef __BASETSMUX_AAC_H__ #define __BASETSMUX_AAC_H__ - + #include "gstbasetsmux.h" GstBuffer * gst_base_ts_mux_prepare_aac (GstBuffer * buf, GstBaseTsMuxPad * pad, GstBaseTsMux * mux); - + #endif /* __BASETSMUX_AAC_H__ */ diff --git a/gst/mpegtsmux/gstbasetsmuxjpeg2000.c b/gst/mpegtsmux/gstbasetsmuxjpeg2000.c index 996b76a..d901285 100644 --- a/gst/mpegtsmux/gstbasetsmuxjpeg2000.c +++ b/gst/mpegtsmux/gstbasetsmuxjpeg2000.c @@ -1,5 +1,5 @@ /* GStreamer JPEG 2000 Parser - * + * * Copyright (C) <2016> Milos Seleceni * @author Milos Seleceni * diff --git a/gst/mpegtsmux/gstbasetsmuxjpeg2000.h b/gst/mpegtsmux/gstbasetsmuxjpeg2000.h index 284f530..75c3939 100644 --- a/gst/mpegtsmux/gstbasetsmuxjpeg2000.h +++ b/gst/mpegtsmux/gstbasetsmuxjpeg2000.h @@ -1,5 +1,5 @@ /* GStreamer JPEG 2000 Parser - * + * * Copyright (C) <2016> Milos Seleceni * @author Milos Seleceni * diff --git a/gst/mpegtsmux/gstbasetsmuxopus.c b/gst/mpegtsmux/gstbasetsmuxopus.c index 41a8b20..75945bd 100644 --- a/gst/mpegtsmux/gstbasetsmuxopus.c +++ b/gst/mpegtsmux/gstbasetsmuxopus.c @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/gstbasetsmuxopus.h b/gst/mpegtsmux/gstbasetsmuxopus.h index 375de52..f8d9dcf 100644 --- a/gst/mpegtsmux/gstbasetsmuxopus.h +++ b/gst/mpegtsmux/gstbasetsmuxopus.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -79,13 +79,13 @@ * SOFTWARE. * */ - + #ifndef __BASETSMUX_OPUS_H__ #define __BASETSMUX_OPUS_H__ - + #include "gstbasetsmux.h" GstBuffer * gst_base_ts_mux_prepare_opus (GstBuffer * buf, GstBaseTsMuxPad * pad, GstBaseTsMux * mux); - + #endif /* __BASETSMUX_OPUS_H__ */ diff --git a/gst/mpegtsmux/gstbasetsmuxttxt.c b/gst/mpegtsmux/gstbasetsmuxttxt.c index f9a16e4..03b6801 100644 --- a/gst/mpegtsmux/gstbasetsmuxttxt.c +++ b/gst/mpegtsmux/gstbasetsmuxttxt.c @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/gstbasetsmuxttxt.h b/gst/mpegtsmux/gstbasetsmuxttxt.h index bb2082f..3b9f351 100644 --- a/gst/mpegtsmux/gstbasetsmuxttxt.h +++ b/gst/mpegtsmux/gstbasetsmuxttxt.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -79,13 +79,13 @@ * SOFTWARE. * */ - + #ifndef __BASETSMUX_TTXT_H__ #define __BASETSMUX_TTXT_H__ - + #include "gstbasetsmux.h" GstBuffer * gst_base_ts_mux_prepare_teletext (GstBuffer * buf, GstBaseTsMuxPad * pad, GstBaseTsMux * mux); - + #endif /* __BASETSMUX_TTXT_H__ */ diff --git a/gst/mpegtsmux/gstmpegtsmux.c b/gst/mpegtsmux/gstmpegtsmux.c index c016953..29f70bf 100644 --- a/gst/mpegtsmux/gstmpegtsmux.c +++ b/gst/mpegtsmux/gstmpegtsmux.c @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -12,7 +12,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -61,17 +61,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/gstmpegtsmux.h b/gst/mpegtsmux/gstmpegtsmux.h index afc8dc0..bb796b4 100644 --- a/gst/mpegtsmux/gstmpegtsmux.h +++ b/gst/mpegtsmux/gstmpegtsmux.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. +/* + * Copyright 2006, 2007, 2008, 2009, 2010 Fluendo S.A. * Authors: Jan Schmidt * Kapil Agrawal * Julien Moutte @@ -10,7 +10,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -59,17 +59,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c index ea5f512..dfc1120 100644 --- a/gst/mpegtsmux/tsmux/tsmux.c +++ b/gst/mpegtsmux/tsmux/tsmux.c @@ -1,5 +1,5 @@ -/* - * Copyright 2006 BBC and Fluendo S.A. +/* + * Copyright 2006 BBC and Fluendo S.A. * * This library is licensed under 4 different licenses and you * can choose to use it under the terms of any one of them. The @@ -7,7 +7,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -56,17 +56,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -90,8 +90,8 @@ #define GST_CAT_DEFAULT gst_base_ts_mux_debug -/* Maximum total data length for a PAT section is 1024 bytes, minus an - * 8 byte header, then the length of each program entry is 32 bits, +/* Maximum total data length for a PAT section is 1024 bytes, minus an + * 8 byte header, then the length of each program entry is 32 bits, * then finally a 32 bit CRC. Thus the maximum number of programs in this mux * is (1024 - 8 - 4) / 4 = 253 because it only supports single section PATs */ #define TSMUX_MAX_PROGRAMS 253 @@ -101,7 +101,7 @@ #define TSMUX_DEFAULT_NETWORK_ID 0x0001 #define TSMUX_DEFAULT_TS_ID 0x0001 -/* HACK: We use a fixed buffering offset for the PCR at the moment - +/* HACK: We use a fixed buffering offset for the PCR at the moment - * this is the amount 'in advance' of the stream that the PCR sits. * 1/8 second atm */ #define TSMUX_PCR_OFFSET (TSMUX_CLOCK_FREQ / 8) @@ -738,7 +738,7 @@ tsmux_write_adaptation_field (guint8 * buf, g_assert (min_length <= TSMUX_PAYLOAD_LENGTH); - /* Write out all the fields from the packet info only if the + /* Write out all the fields from the packet info only if the * user set the flag to request the adaptation field - if the flag * isn't set, we're just supposed to write stuffing bytes */ if (pi->flags & TSMUX_PACKET_FLAG_ADAPTATION) { @@ -837,7 +837,7 @@ tsmux_write_ts_header (TsMux * mux, guint8 * buf, TsMuxPacketInfo * pi, TS_DEBUG ("PID 0x%04x, counter = 0x%01x, %u bytes avail", pi->pid, mux->pid_packet_counts[pi->pid] & 0x0f, stream_avail); - /* 3 bits: + /* 3 bits: * transport_error_indicator * payload_unit_start_indicator * transport_priority: (00) @@ -898,7 +898,7 @@ tsmux_write_ts_header (TsMux * mux, guint8 * buf, TsMuxPacketInfo * pi, adaptation_flag |= mux->pid_packet_counts[pi->pid] & 0x0f; - /* Write the byte of transport_scrambling_control, adaptation_field_control + /* Write the byte of transport_scrambling_control, adaptation_field_control * + continuity counter out */ buf[3] = adaptation_flag; diff --git a/gst/mpegtsmux/tsmux/tsmux.h b/gst/mpegtsmux/tsmux/tsmux.h index ba6db63..59d69fe 100644 --- a/gst/mpegtsmux/tsmux/tsmux.h +++ b/gst/mpegtsmux/tsmux/tsmux.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006 BBC and Fluendo S.A. +/* + * Copyright 2006 BBC and Fluendo S.A. * * This library is licensed under 4 different licenses and you * can choose to use it under the terms of any one of them. The @@ -7,7 +7,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -56,17 +56,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/tsmux/tsmuxcommon.h b/gst/mpegtsmux/tsmux/tsmuxcommon.h index 9f10499..32203e6 100644 --- a/gst/mpegtsmux/tsmux/tsmuxcommon.h +++ b/gst/mpegtsmux/tsmux/tsmuxcommon.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006 BBC and Fluendo S.A. +/* + * Copyright 2006 BBC and Fluendo S.A. * * This library is licensed under 4 different licenses and you * can choose to use it under the terms of any one of them. The @@ -7,7 +7,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -56,17 +56,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.c b/gst/mpegtsmux/tsmux/tsmuxstream.c index c1ba626..845b8b3 100644 --- a/gst/mpegtsmux/tsmux/tsmuxstream.c +++ b/gst/mpegtsmux/tsmux/tsmuxstream.c @@ -1,5 +1,5 @@ -/* - * Copyright 2006 BBC and Fluendo S.A. +/* + * Copyright 2006 BBC and Fluendo S.A. * * This library is licensed under 4 different licenses and you * can choose to use it under the terms of any one of them. The @@ -7,7 +7,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -56,17 +56,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -349,7 +349,7 @@ tsmux_stream_consume (TsMuxStream * stream, guint len) g_slice_free (TsMuxStreamBuffer, stream->cur_buffer); stream->cur_buffer = NULL; /* FIXME: As a hack, for unbounded streams, start a new PES packet for each - * incoming packet we receive. This assumes that incoming data is + * incoming packet we receive. This assumes that incoming data is * packetised sensibly - ie, every video frame */ if (stream->cur_pes_payload_size == 0) { stream->state = TSMUX_STREAM_STATE_HEADER; @@ -576,7 +576,7 @@ tsmux_stream_pes_header_length (TsMuxStream * stream) packet_len = 6; if (stream->pi.flags & TSMUX_PACKET_FLAG_PES_FULL_HEADER) { - /* For a PES 'full header' we have at least 3 more bytes, + /* For a PES 'full header' we have at least 3 more bytes, * and then more based on flags */ packet_len += 3; if (stream->pi.flags & TSMUX_PACKET_FLAG_PES_WRITE_PTS_DTS) { @@ -585,7 +585,7 @@ tsmux_stream_pes_header_length (TsMuxStream * stream) packet_len += 5; } if (stream->pi.flags & TSMUX_PACKET_FLAG_PES_EXT_STREAMID) { - /* Need basic extension flags (1 byte), plus 2 more bytes for the + /* Need basic extension flags (1 byte), plus 2 more bytes for the * length + extended stream id */ packet_len += 3; } @@ -677,7 +677,7 @@ tsmux_stream_write_pes_header (TsMuxStream * stream, guint8 * data) flags |= 0x01; /* Enable PES_extension_flag */ *data++ = flags; - /* Header length is the total pes length, + /* Header length is the total pes length, * minus the 9 bytes of start codes, flags + hdr_len */ g_return_if_fail (hdr_len >= 9); *data++ = (hdr_len - 9); diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.h b/gst/mpegtsmux/tsmux/tsmuxstream.h index 4b60d1f..ce8c512 100644 --- a/gst/mpegtsmux/tsmux/tsmuxstream.h +++ b/gst/mpegtsmux/tsmux/tsmuxstream.h @@ -1,5 +1,5 @@ -/* - * Copyright 2006 BBC and Fluendo S.A. +/* + * Copyright 2006 BBC and Fluendo S.A. * * This library is licensed under 4 different licenses and you * can choose to use it under the terms of any one of them. The @@ -7,7 +7,7 @@ * license. * * MPL: - * + * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at @@ -56,17 +56,17 @@ * Unless otherwise indicated, Source Code is licensed under MIT license. * See further explanation attached in License Statement (distributed in the file * LICENSE). - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies * of the Software, and to permit persons to whom the Software is furnished to do * so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -242,7 +242,7 @@ void tsmux_stream_free (TsMuxStream *stream); guint16 tsmux_stream_get_pid (TsMuxStream *stream); -void tsmux_stream_set_buffer_release_func (TsMuxStream *stream, +void tsmux_stream_set_buffer_release_func (TsMuxStream *stream, TsMuxStreamBufferReleaseFunc func); void tsmux_stream_set_get_es_descriptors_func (TsMuxStream *stream, @@ -251,7 +251,7 @@ void tsmux_stream_set_get_es_descriptors_func (TsMuxStream *stream, /* Add a new buffer to the pool of available bytes. If pts or dts are not -1, they * indicate the PTS or DTS of the first access unit within this packet */ -void tsmux_stream_add_data (TsMuxStream *stream, guint8 *data, guint len, +void tsmux_stream_add_data (TsMuxStream *stream, guint8 *data, guint len, void *user_data, gint64 pts, gint64 dts, gboolean random_access); -- 2.7.4