Revert of Rename OpenH264 frame-type conversion function.

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 32 matching lines @@
 //  } else if (width * height > 1280 * 960 && number_of_cores >= 6) {
 //    return 3;  // 3 threads for 1080p.
 //  } else if (width * height > 640 * 480 && number_of_cores >= 3) {
 //    return 2;  // 2 threads for qHD/HD.
 //  } else {
 //    return 1;  // 1 thread for VGA or less.
 //  }
   return 1;
 }
 
-FrameType ConvertToVideoFrameType(EVideoFrameType type) {
+}  // namespace
+
+static FrameType EVideoFrameType_to_FrameType(EVideoFrameType type) {
   switch (type) {
+    case videoFrameTypeInvalid:
+      return kEmptyFrame;
     case videoFrameTypeIDR:
       return kVideoFrameKey;
     case videoFrameTypeSkip:
     case videoFrameTypeI:
     case videoFrameTypeP:
     case videoFrameTypeIPMixed:
       return kVideoFrameDelta;
-    case videoFrameTypeInvalid:
-      break;
+    default:
+      LOG(LS_WARNING) << "Unknown EVideoFrameType: " << type;
+      return kVideoFrameDelta;
   }
-  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
 // be deleted and reallocated if a bigger buffer is required.
 //
 // After OpenH264 encoding, the encoded bytes are stored in |info| spread out
 // over a number of layers and "NAL units". Each NAL unit is a fragment starting
 // with the four-byte start code {0,0,0,1}. All of this data (including the
 // start codes) is copied to the |encoded_image->_buffer| and the |frag_header|
 // is updated to point to each fragment, with offsets and lengths set as to
@@ skipping 297 matching lines @@
     ReportError();
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
   encoded_image_._encodedWidth = frame.width();
   encoded_image_._encodedHeight = frame.height();
   encoded_image_._timeStamp = frame.timestamp();
   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 = ConvertToVideoFrameType(info.eFrameType);
+  encoded_image_._frameType = EVideoFrameType_to_FrameType(info.eFrameType);
 
   // Split encoded image up into fragments. This also updates |encoded_image_|.
   RTPFragmentationHeader frag_header;
   RtpFragmentize(&encoded_image_, &encoded_image_buffer_, frame, &info,
                  &frag_header);
 
   // Encoder can skip frames to save bandwidth in which case
   // |encoded_image_._length| == 0.
   if (encoded_image_._length > 0) {
     // Deliver encoded image.
@@ skipping 34 matching lines @@
 }
 
 int32_t H264EncoderImpl::SetPeriodicKeyFrames(bool enable) {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 void H264EncoderImpl::OnDroppedFrame() {
 }
 
 }  // namespace webrtc