Rename values in RefFrameType and FrameType

Replace golden and altref by past and future in RefFrameType. So that we don't get confused with FrameType and RefFrameType.

angiebird committed 6 years ago

Commit 04848491 parent bff7ecc2 files · +46 −28Browse files

Unified · Split

2 files

vp9/simple_encode.cc +32 −16
vp9/simple_encode.h +14 −12

vp9/simple_encode.cc+32−16

 static INLINE FrameType
 get_frame_type_from_update_type(FRAME_UPDATE_TYPE update_type) {
   switch (update_type) {
-    case KF_UPDATE: return kKeyFrame;
+    case KF_UPDATE: return kFrameTypeKey;
-    case ARF_UPDATE: return kAlternateReference;
+    case ARF_UPDATE: return kFrameTypeAltRef;
-    case GF_UPDATE: return kGoldenFrame;
+    case GF_UPDATE: return kFrameTypeGolden;
-    case OVERLAY_UPDATE: return kOverlayFrame;
+    case OVERLAY_UPDATE: return kFrameTypeOverlay;
-    case LF_UPDATE: return kInterFrame;
+    case LF_UPDATE: return kFrameTypeInter;
     default:
       fprintf(stderr, "Unsupported update_type %d\n", update_type);
       abort();
-      return kInterFrame;
+      return kFrameTypeInter;
   }
 }
   }
 }
+// translate MV_REFERENCE_FRAME to RefFrameType
+static RefFrameType mv_ref_frame_to_ref_frame_type(
+    MV_REFERENCE_FRAME mv_ref_frame) {
+  switch (mv_ref_frame) {
+    case LAST_FRAME: return kRefFrameTypeLast;
+    case GOLDEN_FRAME: return kRefFrameTypePast;
+    case ALTREF_FRAME: return kRefFrameTypeFuture;
+    default: return kRefFrameTypeNone;
+  }
+}
 static void update_motion_vector_info(
     const MOTION_VECTOR_INFO *input_motion_vector_info, const int num_rows_4x4,
     const int num_cols_4x4, MotionVectorInfo *output_motion_vector_info) {
   const int num_units_4x4 = num_rows_4x4 * num_cols_4x4;
   for (int i = 0; i < num_units_4x4; ++i) {
+    const MV_REFERENCE_FRAME *in_ref_frame =
+        input_motion_vector_info[i].ref_frame;
     output_motion_vector_info[i].mv_count =
-        (input_motion_vector_info[i].ref_frame[0] == INTRA_FRAME)
+        (in_ref_frame[0] == INTRA_FRAME) ? 0
-            ? 0
+                                         : ((in_ref_frame[1] == NONE) ? 1 : 2);
-            : ((input_motion_vector_info[i].ref_frame[1] == -1) ? 1 : 2);
+    if (in_ref_frame[0] == NONE) {
+      fprintf(stderr, "in_ref_frame[0] shouldn't be NONE\n");
+      abort();
+    }
     output_motion_vector_info[i].ref_frame[0] =
-        static_cast<RefFrameType>(input_motion_vector_info[i].ref_frame[0]);
+        mv_ref_frame_to_ref_frame_type(in_ref_frame[0]);
     output_motion_vector_info[i].ref_frame[1] =
-        static_cast<RefFrameType>(input_motion_vector_info[i].ref_frame[1]);
+        mv_ref_frame_to_ref_frame_type(in_ref_frame[1]);
     output_motion_vector_info[i].mv_row[0] =
         (double)input_motion_vector_info[i].mv[0].as_mv.row /
         kMotionVectorPrecision;
     // frame.
     EncodeFrameInfo encode_frame_info;
     if (first_is_key_frame) {
-      encode_frame_info.frame_type = kKeyFrame;
+      encode_frame_info.frame_type = kFrameTypeKey;
     } else {
       if (last_gop_use_alt_ref) {
-        encode_frame_info.frame_type = kOverlayFrame;
+        encode_frame_info.frame_type = kFrameTypeOverlay;
       } else {
-        encode_frame_info.frame_type = kGoldenFrame;
+        encode_frame_info.frame_type = kFrameTypeGolden;
       }
     }
     encode_frame_info.show_idx = first_show_idx;
     // If there is alternate reference, it is always coded at the second place.
     // Its show index (or timestamp) is at the last of this group
     EncodeFrameInfo encode_frame_info;
-    encode_frame_info.frame_type = kAlternateReference;
+    encode_frame_info.frame_type = kFrameTypeAltRef;
     encode_frame_info.show_idx = first_show_idx + show_frame_count;
     encode_frame_info.coding_index = start_coding_index + 1;
     group_of_picture->encode_frame_list.push_back(encode_frame_info);
   // Encode the rest show inter frames.
   for (int i = 1; i < show_frame_count; ++i) {
     EncodeFrameInfo encode_frame_info;
-    encode_frame_info.frame_type = kInterFrame;
+    encode_frame_info.frame_type = kFrameTypeInter;
     encode_frame_info.show_idx = first_show_idx + i;
     encode_frame_info.coding_index = start_coding_index + use_alt_ref + i;
     group_of_picture->encode_frame_list.push_back(encode_frame_info);

vp9/simple_encode.h+14−12

@@ -19,22 +19,24 @@ · 18 unmodified lines
19		19
20	namespace vp9 {	20	namespace vp9 {
21		21
		22	// TODO(angiebird): Add description for each frame type.
22	enum FrameType {	23	enum FrameType {
23	kKeyFrame = 0,	24	kFrameTypeKey = 0,
24	kInterFrame,	25	kFrameTypeInter,
25	kAlternateReference,	26	kFrameTypeAltRef,
26	kOverlayFrame,	27	kFrameTypeOverlay,
27	kGoldenFrame,	28	kFrameTypeGolden,
28	};	29	};
29		30
30	// The enum type is similar to vp9: \|MV_REFERENCE_FRAME\|.	31	// TODO(angiebird): Add description for each reference frame type.
31	// TODO(angiebird): Clarify the difference between FrameType and RefFrameType.	32	// This enum numbers have to be contiguous and start from zero except
		33	// kNoneRefFrame.
32	enum RefFrameType {	34	enum RefFrameType {
33	kIntraRefFrame = 0,	35	kRefFrameTypeLast = 0,
34	kLastRefFrame = 1,	36	kRefFrameTypePast = 1,
35	kGoldenRefFrame = 2,	37	kRefFrameTypeFuture = 2,
36	kAltRefFrame = 3,	38	kRefFrameTypeMax = 3,
37	kNoneRefRefFrame = -1,	39	kRefFrameTypeNone = -1,
38	};	40	};
39		41
40	// The frame is split to 4x4 blocks.	42	// The frame is split to 4x4 blocks.

Rename values in RefFrameType and FrameType

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code