commit bbba9318532af969f5b140bc1503f74925a78221
author Jingning Han <jingning@google.com> Fri Jul 01 15:03:24 2022 -0700
committer Jingning Han <jingning@google.com> Mon Jul 04 21:59:51 2022 +0000
tree a4c93fa6178440db313591225b9f557cc304be9e
parent 34ec50a813e5b70b59f9fda024fe584299e94b33

Capture display order through ducky_encode

BUG=b/237802449

Change-Id: I35bf166a57dbf946a4ded4f07056dd20eeea336c

av1/ducky_encode.cc

diff --git a/av1/ducky_encode.cc b/av1/ducky_encode.cc
index f4d23df..3fe72a8 100644
--- a/av1/ducky_encode.cc
+++ b/av1/ducky_encode.cc
@@ -320,6 +320,7 @@
 static void DuckyEncodeInfoGetEncodeFrameResult(
     const DuckyEncodeInfo *ducky_encode_info, EncodeFrameResult *result) {
   const DuckyEncodeFrameResult &frame_result = ducky_encode_info->frame_result;
+  result->global_order_idx = frame_result.global_order_idx;
   result->q_index = frame_result.q_index;
   result->rdmult = frame_result.rdmult;
   result->rate = frame_result.rate;
@@ -519,6 +520,10 @@
     // decrement frames_left counter
     ppi->frames_left = AOMMAX(0, ppi->frames_left - 1);
   }
+
+  fprintf(stderr, "frame %d, size %d, PSNR %f\n",
+          encode_frame_result.global_order_idx, encode_frame_result.rate,
+          encode_frame_result.psnr);
   return encode_frame_result;
 }
 

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 59bc8f2..e528458 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3067,6 +3067,7 @@
     PSNR_STATS psnr;
     aom_calc_psnr(cpi->source, &cpi->common.cur_frame->buf, &psnr);
     DuckyEncodeFrameResult *frame_result = &cpi->ducky_encode_info.frame_result;
+    frame_result->global_order_idx = cm->cur_frame->order_hint;
     frame_result->q_index = cm->quant_params.base_qindex;
     frame_result->rdmult = cpi->rd.RDMULT;
     frame_result->rate = (int)(*size) * 8;
@@ -3441,6 +3442,7 @@
       aom_calc_psnr(cpi->source, &cpi->common.cur_frame->buf, &psnr);
       DuckyEncodeFrameResult *frame_result =
           &cpi->ducky_encode_info.frame_result;
+      frame_result->global_order_idx = cm->cur_frame->order_hint;
       frame_result->q_index = cm->quant_params.base_qindex;
       frame_result->rdmult = cpi->rd.RDMULT;
       frame_result->rate = (int)(*size) * 8;

av1/encoder/encoder.h

diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index b12bb5d..888b0f6 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -2337,6 +2337,7 @@
 } DuckyEncodeFrameInfo;
 
 typedef struct DuckyEncodeFrameResult {
+  int global_order_idx;
   int q_index;
   int rdmult;
   int rate;