diff mbox series

[FFmpeg-devel,v2,4/4] lavf/mpegtsenc: misc style fixes

Message ID 1590512230-26007-4-git-send-email-mypopydev@gmail.com
State Accepted
Commit ab42db9bed019c1247fb20c9d7be77ff9ccb006a
Headers show
Series [FFmpeg-devel,v2,1/4] lavc/aac_ac3_parser: improve the raw AAC file bit rate calculation | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Jun Zhao May 26, 2020, 4:57 p.m. UTC 
From: Jun Zhao <barryjzhao@tencent.com>

commit 32aeba12755 missed coding style fix.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 libavformat/mpegtsenc.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Marton Balint May 27, 2020, 6:58 a.m. UTC | #1 
On Wed, 27 May 2020, Jun Zhao wrote:

> From: Jun Zhao <barryjzhao@tencent.com>
>
> commit 32aeba12755 missed coding style fix.
>
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
> libavformat/mpegtsenc.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> index bf1a7ee..de9819b 100644
> --- a/libavformat/mpegtsenc.c
> +++ b/libavformat/mpegtsenc.c
> @@ -1432,10 +1432,10 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
>             if (ts->m2ts_mode &&
>                 st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
>                 st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> -                        /* set PES_extension_flag */
> -                        pes_extension = 1;
> -                        flags |= 0x01;
> -                        header_len += 3;
> +                /* set PES_extension_flag */
> +                pes_extension = 1;
> +                flags |= 0x01;
> +                header_len += 3;
>             }
>             if (is_dvb_teletext) {
>                 pes_header_stuffing_bytes = 0x24 - header_len;
> @@ -1478,14 +1478,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
>                 *q++ = 0x00 | 0x60;
>             }
>             /* For Blu-ray AC3 Audio Setting extended flags */
> -          if (ts->m2ts_mode &&
> -              pes_extension &&
> -              st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> -                      flags = 0x01; /* set PES_extension_flag_2 */
> -                      *q++ = flags;
> -                      *q++ = 0x80 | 0x01; /* marker bit + extension length */
> -                      *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
> -              }
> +            if (ts->m2ts_mode &&
> +                pes_extension &&
> +                st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> +                flags = 0x01; /* set PES_extension_flag_2 */
> +                *q++ = flags;
> +                *q++ = 0x80 | 0x01; /* marker bit + extension length */
> +                *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
> +            }
>

LGTM, thanks.

Marton
mypopy@gmail.com May 28, 2020, 9:47 a.m. UTC | #2 
On Wed, May 27, 2020 at 2:58 PM Marton Balint <cus@passwd.hu> wrote:
>
>
>
> On Wed, 27 May 2020, Jun Zhao wrote:
>
> > From: Jun Zhao <barryjzhao@tencent.com>
> >
> > commit 32aeba12755 missed coding style fix.
> >
> > Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> > ---
> > libavformat/mpegtsenc.c | 24 ++++++++++++------------
> > 1 file changed, 12 insertions(+), 12 deletions(-)
> >
> > diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> > index bf1a7ee..de9819b 100644
> > --- a/libavformat/mpegtsenc.c
> > +++ b/libavformat/mpegtsenc.c
> > @@ -1432,10 +1432,10 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
> >             if (ts->m2ts_mode &&
> >                 st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
> >                 st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> > -                        /* set PES_extension_flag */
> > -                        pes_extension = 1;
> > -                        flags |= 0x01;
> > -                        header_len += 3;
> > +                /* set PES_extension_flag */
> > +                pes_extension = 1;
> > +                flags |= 0x01;
> > +                header_len += 3;
> >             }
> >             if (is_dvb_teletext) {
> >                 pes_header_stuffing_bytes = 0x24 - header_len;
> > @@ -1478,14 +1478,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
> >                 *q++ = 0x00 | 0x60;
> >             }
> >             /* For Blu-ray AC3 Audio Setting extended flags */
> > -          if (ts->m2ts_mode &&
> > -              pes_extension &&
> > -              st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> > -                      flags = 0x01; /* set PES_extension_flag_2 */
> > -                      *q++ = flags;
> > -                      *q++ = 0x80 | 0x01; /* marker bit + extension length */
> > -                      *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
> > -              }
> > +            if (ts->m2ts_mode &&
> > +                pes_extension &&
> > +                st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> > +                flags = 0x01; /* set PES_extension_flag_2 */
> > +                *q++ = flags;
> > +                *q++ = 0x80 | 0x01; /* marker bit + extension length */
> > +                *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
> > +            }
> >
>
> LGTM, thanks.
>
Pushed patch 3-4
diff mbox series

Patch

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index bf1a7ee..de9819b 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1432,10 +1432,10 @@  static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
             if (ts->m2ts_mode &&
                 st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
                 st->codecpar->codec_id == AV_CODEC_ID_AC3) {
-                        /* set PES_extension_flag */
-                        pes_extension = 1;
-                        flags |= 0x01;
-                        header_len += 3;
+                /* set PES_extension_flag */
+                pes_extension = 1;
+                flags |= 0x01;
+                header_len += 3;
             }
             if (is_dvb_teletext) {
                 pes_header_stuffing_bytes = 0x24 - header_len;
@@ -1478,14 +1478,14 @@  static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
                 *q++ = 0x00 | 0x60;
             }
             /* For Blu-ray AC3 Audio Setting extended flags */
-          if (ts->m2ts_mode &&
-              pes_extension &&
-              st->codecpar->codec_id == AV_CODEC_ID_AC3) {
-                      flags = 0x01; /* set PES_extension_flag_2 */
-                      *q++ = flags;
-                      *q++ = 0x80 | 0x01; /* marker bit + extension length */
-                      *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
-              }
+            if (ts->m2ts_mode &&
+                pes_extension &&
+                st->codecpar->codec_id == AV_CODEC_ID_AC3) {
+                flags = 0x01; /* set PES_extension_flag_2 */
+                *q++ = flags;
+                *q++ = 0x80 | 0x01; /* marker bit + extension length */
+                *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
+            }
 
 
             if (is_dvb_subtitle) {