commit 5737825b176f33fe2564fa011f74399c25e8c648
author Debargha Mukherjee <debargha@google.com> Fri Sep 21 18:29:37 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Mon Sep 24 22:41:42 2018 +0000
tree 2965de2fe6a08e95d31f1bc62153baac895ed390
parent ef9b9047bb9a0eb04911b337bceba8fde304cea2

Set intraonly / s- / er- frame flags from encoder

BUG=aomedia:2085

Change-Id: Ib41a3f54ea8ee54df4c52c155863c6e781d288bd

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index cd44731..487efd2 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5260,6 +5260,13 @@
   if (cpi->oxcf.pass == 2) update_twopass_gf_group_index(cpi);
 }
 
+static void set_additional_frame_flags(AV1_COMMON *const cm,
+                                       unsigned int *frame_flags) {
+  if (frame_is_intra_only(cm)) *frame_flags |= FRAMEFLAGS_INTRAONLY;
+  if (frame_is_sframe(cm)) *frame_flags |= FRAMEFLAGS_SWITCH;
+  if (cm->error_resilient_mode) *frame_flags |= FRAMEFLAGS_ERROR_RESILIENT;
+}
+
 static int Pass0Encode(AV1_COMP *cpi, size_t *size, uint8_t *dest,
                        int skip_adapt, unsigned int *frame_flags) {
   if (cpi->oxcf.rc_mode == AOM_CBR) {
@@ -5271,6 +5278,8 @@
       AOM_CODEC_OK) {
     return AOM_CODEC_ERROR;
   }
+  set_additional_frame_flags(&cpi->common, frame_flags);
+
   update_rc_counts(cpi);
   check_show_existing_frame(cpi);
   return AOM_CODEC_OK;
@@ -5291,6 +5300,7 @@
       AOM_CODEC_OK) {
     return AOM_CODEC_ERROR;
   }
+  set_additional_frame_flags(&cpi->common, frame_flags);
 
 #if TXCOEFF_COST_TIMER
   cm->cum_txcoeff_cost_timer += cm->txcoeff_cost_timer;