commit eb101ec843ab34b9e534bf705086e83059baef34
author Wan-Teh Chang <wtc@google.com> Tue Feb 16 18:24:01 2021 -0800
committer Wan-Teh Chang <wtc@google.com> Wed Feb 17 19:36:16 2021 +0000
tree a13855fa3b1bcd9fb8f696f5c26e3e5923cb1ff9
parent 4dfcf808b71c438af93c0b6abbac22635b6ef87b

Remove ctx->pending_cx_data null pointer checks

Remove null pointer checks for ctx->pending_cx_data in encoder_encode()
because ctx->pending_cx_data cannot be null at those places.

Delete the local variables obu_header_offset and move_offset, which were
not useful.

Change-Id: I1794faaabdaedbc4e03f22657cc1fbf243ca7f1d

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index d4c155b..f830926 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -2334,7 +2334,7 @@
 
       cpi->seq_params_locked = 1;
       if (frame_size) {
-        if (ctx->pending_cx_data == 0) ctx->pending_cx_data = cx_data;
+        if (ctx->pending_cx_data == NULL) ctx->pending_cx_data = cx_data;
 
         const int write_temporal_delimiter =
             !cpi->common.spatial_layer_id && !ctx->pending_cx_data_sz;
@@ -2345,15 +2345,12 @@
           const size_t length_field_size =
               aom_uleb_size_in_bytes(obu_payload_size);
 
-          if (ctx->pending_cx_data) {
-            const size_t move_offset = length_field_size + 1;
-            memmove(ctx->pending_cx_data + move_offset, ctx->pending_cx_data,
-                    frame_size);
-          }
-          const uint32_t obu_header_offset = 0;
-          obu_header_size = av1_write_obu_header(
-              &cpi->level_params, OBU_TEMPORAL_DELIMITER, 0,
-              (uint8_t *)(ctx->pending_cx_data + obu_header_offset));
+          const size_t move_offset = obu_header_size + length_field_size;
+          memmove(ctx->pending_cx_data + move_offset, ctx->pending_cx_data,
+                  frame_size);
+          obu_header_size =
+              av1_write_obu_header(&cpi->level_params, OBU_TEMPORAL_DELIMITER,
+                                   0, ctx->pending_cx_data);
 
           // OBUs are preceded/succeeded by an unsigned leb128 coded integer.
           if (av1_write_uleb_obu_size(obu_header_size, obu_payload_size,
@@ -2374,10 +2371,7 @@
 
           // B_PRIME (add frame size)
           const size_t length_field_size = aom_uleb_size_in_bytes(frame_size);
-          if (ctx->pending_cx_data) {
-            const size_t move_offset = length_field_size;
-            memmove(cx_data + move_offset, cx_data, frame_size);
-          }
+          memmove(cx_data + length_field_size, cx_data, frame_size);
           if (av1_write_uleb_obu_size(0, (uint32_t)frame_size, cx_data) !=
               AOM_CODEC_OK) {
             aom_internal_error(&cpi->common.error, AOM_CODEC_ERROR, NULL);
@@ -2407,11 +2401,8 @@
         //  B_PRIME (add TU size)
         size_t tu_size = ctx->pending_cx_data_sz;
         const size_t length_field_size = aom_uleb_size_in_bytes(tu_size);
-        if (ctx->pending_cx_data) {
-          const size_t move_offset = length_field_size;
-          memmove(ctx->pending_cx_data + move_offset, ctx->pending_cx_data,
-                  tu_size);
-        }
+        memmove(ctx->pending_cx_data + length_field_size, ctx->pending_cx_data,
+                tu_size);
         if (av1_write_uleb_obu_size(0, (uint32_t)tu_size,
                                     ctx->pending_cx_data) != AOM_CODEC_OK) {
           aom_internal_error(&cpi->common.error, AOM_CODEC_ERROR, NULL);