| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  * | 9  * | 
| 10  */ | 10  */ | 
| 11 | 11 | 
| 12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H | 12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H_ | 
| 13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H | 13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H_ | 
| 14 | 14 | 
| 15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" | 15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" | 
| 16 | 16 | 
| 17 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) | 17 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) | 
| 18 | 18 | 
| 19 #include <CoreMedia/CoreMedia.h> | 19 #include <CoreMedia/CoreMedia.h> | 
| 20 | 20 | 
| 21 #include "webrtc/base/buffer.h" | 21 #include "webrtc/base/buffer.h" | 
| 22 #include "webrtc/modules/include/module_common_types.h" | 22 #include "webrtc/modules/include/module_common_types.h" | 
| 23 | 23 | 
| 24 namespace webrtc { | 24 namespace webrtc { | 
| 25 | 25 | 
| 26 // Converts a sample buffer emitted from the VideoToolbox encoder into a buffer | 26 // Converts a sample buffer emitted from the VideoToolbox encoder into a buffer | 
| 27 // suitable for RTP. The sample buffer is in avcc format whereas the rtp buffer | 27 // suitable for RTP. The sample buffer is in avcc format whereas the rtp buffer | 
| 28 // needs to be in Annex B format. Data is written directly to |annexb_buffer| | 28 // needs to be in Annex B format. Data is written directly to |annexb_buffer| | 
| 29 // and a new RTPFragmentationHeader is returned in |out_header|. | 29 // and a new RTPFragmentationHeader is returned in |out_header|. | 
| 30 bool H264CMSampleBufferToAnnexBBuffer( | 30 bool H264CMSampleBufferToAnnexBBuffer( | 
| 31     CMSampleBufferRef avcc_sample_buffer, | 31     CMSampleBufferRef avcc_sample_buffer, | 
| 32     bool is_keyframe, | 32     bool is_keyframe, | 
| 33     rtc::Buffer* annexb_buffer, | 33     rtc::Buffer* annexb_buffer, | 
| 34     webrtc::RTPFragmentationHeader** out_header); | 34     webrtc::RTPFragmentationHeader** out_header); | 
| 35 | 35 | 
| 36 // Converts a buffer received from RTP into a sample buffer suitable for the | 36 // Converts a buffer received from RTP into a sample buffer suitable for the | 
| 37 // VideoToolbox decoder. The RTP buffer is in annex b format whereas the sample | 37 // VideoToolbox decoder. The RTP buffer is in annex b format whereas the sample | 
| 38 // buffer is in avcc format. | 38 // buffer is in avcc format. | 
| 39 // If |is_keyframe| is true then |video_format| is ignored since the format will | 39 // If |is_keyframe| is true then |video_format| is ignored since the format will | 
| 40 // be read from the buffer. Otherwise |video_format| must be provided. | 40 // be read from the buffer. Otherwise |video_format| must be provided. | 
| 41 // Caller is responsible for releasing the created sample buffer. | 41 // Caller is responsible for releasing the created sample buffer. | 
| 42 bool H264AnnexBBufferToCMSampleBuffer( | 42 bool H264AnnexBBufferToCMSampleBuffer(const uint8_t* annexb_buffer, | 
| 43     const uint8_t* annexb_buffer, | 43                                       size_t annexb_buffer_size, | 
| 44     size_t annexb_buffer_size, | 44                                       CMVideoFormatDescriptionRef video_format, | 
| 45     CMVideoFormatDescriptionRef video_format, | 45                                       CMSampleBufferRef* out_sample_buffer); | 
| 46     CMSampleBufferRef* out_sample_buffer); |  | 
| 47 | 46 | 
| 48 // Helper class for reading NALUs from an RTP Annex B buffer. | 47 // Helper class for reading NALUs from an RTP Annex B buffer. | 
| 49 class AnnexBBufferReader final { | 48 class AnnexBBufferReader final { | 
| 50  public: | 49  public: | 
| 51   AnnexBBufferReader(const uint8_t* annexb_buffer, size_t length); | 50   AnnexBBufferReader(const uint8_t* annexb_buffer, size_t length); | 
| 52   ~AnnexBBufferReader() {} | 51   ~AnnexBBufferReader() {} | 
| 53   AnnexBBufferReader(const AnnexBBufferReader& other) = delete; | 52   AnnexBBufferReader(const AnnexBBufferReader& other) = delete; | 
| 54   void operator=(const AnnexBBufferReader& other) = delete; | 53   void operator=(const AnnexBBufferReader& other) = delete; | 
| 55 | 54 | 
| 56   // Returns a pointer to the beginning of the next NALU slice without the | 55   // Returns a pointer to the beginning of the next NALU slice without the | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 90 | 89 | 
| 91  private: | 90  private: | 
| 92   uint8_t* const start_; | 91   uint8_t* const start_; | 
| 93   size_t offset_; | 92   size_t offset_; | 
| 94   const size_t length_; | 93   const size_t length_; | 
| 95 }; | 94 }; | 
| 96 | 95 | 
| 97 }  // namespace webrtc | 96 }  // namespace webrtc | 
| 98 | 97 | 
| 99 #endif  // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) | 98 #endif  // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) | 
| 100 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H | 99 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H_ | 
| OLD | NEW | 
|---|