zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename OpenH264 frame-type conversion function.

Browse Source 
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}
This commit is contained in:
pbos
2016-05-05 08:09:10 -07:00
committed by Commit bot
parent 3f08dc656d
commit 39a36705ab
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
View File

@ -50,12 +50,8 @@ int NumberOfThreads(int width, int height, int number_of_cores) {
return 1; return 1;
} }
} // namespace FrameType ConvertToVideoFrameType(EVideoFrameType type) {
static FrameType EVideoFrameType_to_FrameType(EVideoFrameType type) {
switch (type) { switch (type) {
case videoFrameTypeInvalid:
return kEmptyFrame;
case videoFrameTypeIDR: case videoFrameTypeIDR:
return kVideoFrameKey; return kVideoFrameKey;
case videoFrameTypeSkip: case videoFrameTypeSkip:
@ -63,12 +59,15 @@ static FrameType EVideoFrameType_to_FrameType(EVideoFrameType type) {
case videoFrameTypeP: case videoFrameTypeP:
case videoFrameTypeIPMixed: case videoFrameTypeIPMixed:
return kVideoFrameDelta; return kVideoFrameDelta;
default: case videoFrameTypeInvalid:
LOG(LS_WARNING) << "Unknown EVideoFrameType: " << type; break;
return kVideoFrameDelta;
} }
RTC_NOTREACHED() << "Unexpected/invalid frame type: " << type;
return kEmptyFrame;
} }
} // namespace
// Helper method used by H264EncoderImpl::Encode. // Helper method used by H264EncoderImpl::Encode.
// Copies the encoded bytes from |info| to |encoded_image| and updates the // Copies the encoded bytes from |info| to |encoded_image| and updates the
// fragmentation information of |frag_header|. The |encoded_image->_buffer| may // 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_.ntp_time_ms_ = frame.ntp_time_ms();
encoded_image_.capture_time_ms_ = frame.render_time_ms(); encoded_image_.capture_time_ms_ = frame.render_time_ms();
encoded_image_.rotation_ = frame.rotation(); 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_|. // Split encoded image up into fragments. This also updates |encoded_image_|.
RTPFragmentationHeader frag_header; RTPFragmentationHeader frag_header;