diff mbox

[FFmpeg-devel,v2] avcodec/cbs_av1: rename enable_intraintra_compound flag

Message ID 20191211015454.10334-1-fei.w.wang@intel.com
State New
Headers show

Commit Message

Wangfei Dec. 11, 2019, 1:54 a.m. UTC
rename enable_intraintra_compound to enable_interintra_compound,
which keep same as AV1 sepc(v1.0.0-errata1).

Signed-off-by: Fei Wang <fei.w.wang@intel.com>
---
 libavcodec/cbs_av1.h                 | 2 +-
 libavcodec/cbs_av1_syntax_template.c | 4 ++--
 libavformat/av1.c                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Comments

Wangfei Dec. 11, 2019, 2:02 a.m. UTC | #1
> -----Original Message-----

> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Fei

> Wang

> Sent: Wednesday, December 11, 2019 9:55 AM

> To: ffmpeg-devel@ffmpeg.org

> Cc: Wang, Fei W <fei.w.wang@intel.com>

> Subject: [FFmpeg-devel] [PATCH v2] avcodec/cbs_av1: rename

> enable_intraintra_compound flag

> 

> rename enable_intraintra_compound to enable_interintra_compound, which

> keep same as AV1 sepc(v1.0.0-errata1).

> 

> Signed-off-by: Fei Wang <fei.w.wang@intel.com>

V2: fixed signed off by using full name.

> ---

>  libavcodec/cbs_av1.h                 | 2 +-

>  libavcodec/cbs_av1_syntax_template.c | 4 ++--

>  libavformat/av1.c                    | 2 +-

>  3 files changed, 4 insertions(+), 4 deletions(-)

> 

> diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index

> 9eaf5c4de6..50a05d2168 100644

> --- a/libavcodec/cbs_av1.h

> +++ b/libavcodec/cbs_av1.h

> @@ -105,7 +105,7 @@ typedef struct AV1RawSequenceHeader {

>      uint8_t use_128x128_superblock;

>      uint8_t enable_filter_intra;

>      uint8_t enable_intra_edge_filter;

> -    uint8_t enable_intraintra_compound;

> +    uint8_t enable_interintra_compound;

>      uint8_t enable_masked_compound;

>      uint8_t enable_warped_motion;

>      uint8_t enable_dual_filter;

> diff --git a/libavcodec/cbs_av1_syntax_template.c

> b/libavcodec/cbs_av1_syntax_template.c

> index 6c4816f964..f53955c52e 100644

> --- a/libavcodec/cbs_av1_syntax_template.c

> +++ b/libavcodec/cbs_av1_syntax_template.c

> @@ -268,7 +268,7 @@ static int

> FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,

>      flag(enable_intra_edge_filter);

> 

>      if (current->reduced_still_picture_header) {

> -        infer(enable_intraintra_compound, 0);

> +        infer(enable_interintra_compound, 0);

>          infer(enable_masked_compound,     0);

>          infer(enable_warped_motion,       0);

>          infer(enable_dual_filter,         0);

> @@ -281,7 +281,7 @@ static int

> FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,

>          infer(seq_force_integer_mv,

>                AV1_SELECT_INTEGER_MV);

>      } else {

> -        flag(enable_intraintra_compound);

> +        flag(enable_interintra_compound);

>          flag(enable_masked_compound);

>          flag(enable_warped_motion);

>          flag(enable_dual_filter);

> diff --git a/libavformat/av1.c b/libavformat/av1.c index

> 132f4e987b..5ad9222900 100644

> --- a/libavformat/av1.c

> +++ b/libavformat/av1.c

> @@ -257,7 +257,7 @@ static int

> parse_sequence_header(AV1SequenceParameters *seq_params, const

> uint8_

>      if (!reduced_still_picture_header) {

>          int enable_order_hint, seq_force_screen_content_tools;

> 

> -        skip_bits(&gb, 4); // enable_intraintra_compound (1),

> enable_masked_compound (1)

> +        skip_bits(&gb, 4); // enable_interintra_compound (1),

> + enable_masked_compound (1)

>                             // enable_warped_motion (1), enable_dual_filter (1)

> 

>          enable_order_hint = get_bits1(&gb);

> --

> 2.17.1

> 

> _______________________________________________

> ffmpeg-devel mailing list

> ffmpeg-devel@ffmpeg.org

> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

> 

> To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org

> with subject "unsubscribe".
James Almer Dec. 11, 2019, 7:28 p.m. UTC | #2
On 12/10/2019 10:54 PM, Fei Wang wrote:
> rename enable_intraintra_compound to enable_interintra_compound,
> which keep same as AV1 sepc(v1.0.0-errata1).
> 
> Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> ---
>  libavcodec/cbs_av1.h                 | 2 +-
>  libavcodec/cbs_av1_syntax_template.c | 4 ++--
>  libavformat/av1.c                    | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h
> index 9eaf5c4de6..50a05d2168 100644
> --- a/libavcodec/cbs_av1.h
> +++ b/libavcodec/cbs_av1.h
> @@ -105,7 +105,7 @@ typedef struct AV1RawSequenceHeader {
>      uint8_t use_128x128_superblock;
>      uint8_t enable_filter_intra;
>      uint8_t enable_intra_edge_filter;
> -    uint8_t enable_intraintra_compound;
> +    uint8_t enable_interintra_compound;
>      uint8_t enable_masked_compound;
>      uint8_t enable_warped_motion;
>      uint8_t enable_dual_filter;
> diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
> index 6c4816f964..f53955c52e 100644
> --- a/libavcodec/cbs_av1_syntax_template.c
> +++ b/libavcodec/cbs_av1_syntax_template.c
> @@ -268,7 +268,7 @@ static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
>      flag(enable_intra_edge_filter);
>  
>      if (current->reduced_still_picture_header) {
> -        infer(enable_intraintra_compound, 0);
> +        infer(enable_interintra_compound, 0);
>          infer(enable_masked_compound,     0);
>          infer(enable_warped_motion,       0);
>          infer(enable_dual_filter,         0);
> @@ -281,7 +281,7 @@ static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
>          infer(seq_force_integer_mv,
>                AV1_SELECT_INTEGER_MV);
>      } else {
> -        flag(enable_intraintra_compound);
> +        flag(enable_interintra_compound);
>          flag(enable_masked_compound);
>          flag(enable_warped_motion);
>          flag(enable_dual_filter);
> diff --git a/libavformat/av1.c b/libavformat/av1.c
> index 132f4e987b..5ad9222900 100644
> --- a/libavformat/av1.c
> +++ b/libavformat/av1.c
> @@ -257,7 +257,7 @@ static int parse_sequence_header(AV1SequenceParameters *seq_params, const uint8_
>      if (!reduced_still_picture_header) {
>          int enable_order_hint, seq_force_screen_content_tools;
>  
> -        skip_bits(&gb, 4); // enable_intraintra_compound (1), enable_masked_compound (1)
> +        skip_bits(&gb, 4); // enable_interintra_compound (1), enable_masked_compound (1)
>                             // enable_warped_motion (1), enable_dual_filter (1)
>  
>          enable_order_hint = get_bits1(&gb);

Applied, thanks.
diff mbox

Patch

diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h
index 9eaf5c4de6..50a05d2168 100644
--- a/libavcodec/cbs_av1.h
+++ b/libavcodec/cbs_av1.h
@@ -105,7 +105,7 @@  typedef struct AV1RawSequenceHeader {
     uint8_t use_128x128_superblock;
     uint8_t enable_filter_intra;
     uint8_t enable_intra_edge_filter;
-    uint8_t enable_intraintra_compound;
+    uint8_t enable_interintra_compound;
     uint8_t enable_masked_compound;
     uint8_t enable_warped_motion;
     uint8_t enable_dual_filter;
diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
index 6c4816f964..f53955c52e 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -268,7 +268,7 @@  static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
     flag(enable_intra_edge_filter);
 
     if (current->reduced_still_picture_header) {
-        infer(enable_intraintra_compound, 0);
+        infer(enable_interintra_compound, 0);
         infer(enable_masked_compound,     0);
         infer(enable_warped_motion,       0);
         infer(enable_dual_filter,         0);
@@ -281,7 +281,7 @@  static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
         infer(seq_force_integer_mv,
               AV1_SELECT_INTEGER_MV);
     } else {
-        flag(enable_intraintra_compound);
+        flag(enable_interintra_compound);
         flag(enable_masked_compound);
         flag(enable_warped_motion);
         flag(enable_dual_filter);
diff --git a/libavformat/av1.c b/libavformat/av1.c
index 132f4e987b..5ad9222900 100644
--- a/libavformat/av1.c
+++ b/libavformat/av1.c
@@ -257,7 +257,7 @@  static int parse_sequence_header(AV1SequenceParameters *seq_params, const uint8_
     if (!reduced_still_picture_header) {
         int enable_order_hint, seq_force_screen_content_tools;
 
-        skip_bits(&gb, 4); // enable_intraintra_compound (1), enable_masked_compound (1)
+        skip_bits(&gb, 4); // enable_interintra_compound (1), enable_masked_compound (1)
                            // enable_warped_motion (1), enable_dual_filter (1)
 
         enable_order_hint = get_bits1(&gb);