From 39a36705ab734914d500b8a0f214ea630d82ab70 Mon Sep 17 00:00:00 2001
From: pbos <pbos@webrtc.org>
Date: Thu, 5 May 2016 08:09:10 -0700
Subject: [PATCH] Rename OpenH264 frame-type conversion function.

Also removing default case, so if another frame is added to
EVideoFrameType we have to handle it.

This will now NOTREACHED on videoFrameTypeInvalid, but
videoFrameTypeInvalid shouldn't happen if encoding succeeds, so it
should be fine or we should become aware of it.

BUG=
R=hbos@webrtc.org

Review-Url: https://codereview.webrtc.org/1943193003
Cr-Commit-Position: refs/heads/master@{#12636}
---
 .../codecs/h264/h264_encoder_impl.cc            | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index 18eccb25a5..3eeb652554 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
@@ -50,12 +50,8 @@ int NumberOfThreads(int width, int height, int number_of_cores) {
   return 1;
 }
 
-}  // namespace
-
-static FrameType EVideoFrameType_to_FrameType(EVideoFrameType type) {
+FrameType ConvertToVideoFrameType(EVideoFrameType type) {
   switch (type) {
-    case videoFrameTypeInvalid:
-      return kEmptyFrame;
     case videoFrameTypeIDR:
       return kVideoFrameKey;
     case videoFrameTypeSkip:
@@ -63,12 +59,15 @@ static FrameType EVideoFrameType_to_FrameType(EVideoFrameType type) {
     case videoFrameTypeP:
     case videoFrameTypeIPMixed:
       return kVideoFrameDelta;
-    default:
-      LOG(LS_WARNING) << "Unknown EVideoFrameType: " << type;
-      return kVideoFrameDelta;
+    case videoFrameTypeInvalid:
+      break;
   }
+  RTC_NOTREACHED() << "Unexpected/invalid frame type: " << type;
+  return kEmptyFrame;
 }
 
+}  // namespace
+
 // Helper method used by H264EncoderImpl::Encode.
 // Copies the encoded bytes from |info| to |encoded_image| and updates the
 // fragmentation information of |frag_header|. The |encoded_image->_buffer| may
@@ -394,7 +393,7 @@ int32_t H264EncoderImpl::Encode(
   encoded_image_.ntp_time_ms_ = frame.ntp_time_ms();
   encoded_image_.capture_time_ms_ = frame.render_time_ms();
   encoded_image_.rotation_ = frame.rotation();
-  encoded_image_._frameType = EVideoFrameType_to_FrameType(info.eFrameType);
+  encoded_image_._frameType = ConvertToVideoFrameType(info.eFrameType);
 
   // Split encoded image up into fragments. This also updates |encoded_image_|.
   RTPFragmentationHeader frag_header;