commit 828a4ab9315ba81da7e523d926e87c005eab7d11
author Wan-Teh Chang <wtc@google.com> Mon Feb 22 17:08:57 2021 +0000
committer Wan-Teh Chang <wtc@google.com> Mon Feb 22 18:35:49 2021 +0000
tree bf5133d3af7a80be86b09da4123b6570e4541e08
parent 0d6b23c939ae38bceba1e41e1951be353842ba33

Revert "Optimize bit stream buffer allocation size"

This reverts commit 140c945e14d296b150a154b398e1a041a8bdf92d.

Reason for revert: A compressed frame may be larger than the original uncompressed frame (e.g., if the frame contains random noise).

Change-Id: I0cb74194d444ebcd2e5a3d72c5fa4f91a4a31a76

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index d1b0fea..9c098b1 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -2151,22 +2151,8 @@
   if (img != NULL) {
     res = validate_img(ctx, img);
     if (res == AOM_CODEC_OK) {
-      // Worst case buffer size needed to hold bit stream corresponding
-      // to one frame.
-      const size_t frame_sz = ALIGN_POWER_OF_TWO(ctx->cfg.g_w, 5) *
-                              ALIGN_POWER_OF_TWO(ctx->cfg.g_h, 5) *
-                              get_image_bps(img) / 8;
-
-      // Due to the presence of no-show frames, bit stream buffer constitutes
-      // data corresponding to multiple frames. Hence bit stream buffer is
-      // allocated with a smaller size for all intra frame encoding with no
-      // forward key frames, as no-show frames are not possible in this case.
-      int max_num_frames = 8;
-      if (cpi->oxcf.kf_cfg.key_freq_max == 0 &&
-          !cpi->oxcf.kf_cfg.fwd_kf_enabled)
-        max_num_frames = 1;
-      size_t data_sz = frame_sz * max_num_frames;
-
+      size_t data_sz = ALIGN_POWER_OF_TWO(ctx->cfg.g_w, 5) *
+                       ALIGN_POWER_OF_TWO(ctx->cfg.g_h, 5) * get_image_bps(img);
       if (data_sz < kMinCompressedSize) data_sz = kMinCompressedSize;
       if (ctx->cx_data == NULL || ctx->cx_data_sz < data_sz) {
         ctx->cx_data_sz = data_sz;