2015-06-29 14:34:58 -07:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_
|
|
|
|
|
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_
|
2015-06-29 14:34:58 -07:00
|
|
|
|
|
|
|
|
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
|
|
|
|
|
|
|
|
|
#include <CoreMedia/CoreMedia.h>
|
2016-11-02 15:07:02 +01:00
|
|
|
#include <vector>
|
2015-06-29 14:34:58 -07:00
|
|
|
|
2016-11-02 15:07:02 +01:00
|
|
|
#include "webrtc/common_video/h264/h264_common.h"
|
2015-11-04 08:31:52 +01:00
|
|
|
#include "webrtc/modules/include/module_common_types.h"
|
2017-07-06 19:44:34 +02:00
|
|
|
#include "webrtc/rtc_base/buffer.h"
|
2015-06-29 14:34:58 -07:00
|
|
|
|
2016-11-02 15:07:02 +01:00
|
|
|
using webrtc::H264::NaluIndex;
|
|
|
|
|
|
2015-06-29 14:34:58 -07:00
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
// Converts a sample buffer emitted from the VideoToolbox encoder into a buffer
|
|
|
|
|
// suitable for RTP. The sample buffer is in avcc format whereas the rtp buffer
|
|
|
|
|
// needs to be in Annex B format. Data is written directly to |annexb_buffer|
|
|
|
|
|
// and a new RTPFragmentationHeader is returned in |out_header|.
|
|
|
|
|
bool H264CMSampleBufferToAnnexBBuffer(
|
|
|
|
|
CMSampleBufferRef avcc_sample_buffer,
|
|
|
|
|
bool is_keyframe,
|
|
|
|
|
rtc::Buffer* annexb_buffer,
|
2017-08-30 04:47:10 -07:00
|
|
|
std::unique_ptr<RTPFragmentationHeader> *out_header);
|
2015-06-29 14:34:58 -07:00
|
|
|
|
|
|
|
|
// Converts a buffer received from RTP into a sample buffer suitable for the
|
|
|
|
|
// VideoToolbox decoder. The RTP buffer is in annex b format whereas the sample
|
|
|
|
|
// buffer is in avcc format.
|
|
|
|
|
// If |is_keyframe| is true then |video_format| is ignored since the format will
|
|
|
|
|
// be read from the buffer. Otherwise |video_format| must be provided.
|
|
|
|
|
// Caller is responsible for releasing the created sample buffer.
|
2015-12-21 03:04:49 -08:00
|
|
|
bool H264AnnexBBufferToCMSampleBuffer(const uint8_t* annexb_buffer,
|
|
|
|
|
size_t annexb_buffer_size,
|
|
|
|
|
CMVideoFormatDescriptionRef video_format,
|
|
|
|
|
CMSampleBufferRef* out_sample_buffer);
|
2015-06-29 14:34:58 -07:00
|
|
|
|
2016-03-08 10:51:54 -08:00
|
|
|
// Returns true if the type of the first NALU in the supplied Annex B buffer is
|
|
|
|
|
// the SPS type.
|
|
|
|
|
bool H264AnnexBBufferHasVideoFormatDescription(const uint8_t* annexb_buffer,
|
|
|
|
|
size_t annexb_buffer_size);
|
|
|
|
|
|
|
|
|
|
// Returns a video format description created from the sps/pps information in
|
|
|
|
|
// the Annex B buffer. If there is no such information, nullptr is returned.
|
|
|
|
|
// The caller is responsible for releasing the description.
|
|
|
|
|
CMVideoFormatDescriptionRef CreateVideoFormatDescription(
|
|
|
|
|
const uint8_t* annexb_buffer,
|
|
|
|
|
size_t annexb_buffer_size);
|
|
|
|
|
|
2015-06-29 14:34:58 -07:00
|
|
|
// Helper class for reading NALUs from an RTP Annex B buffer.
|
|
|
|
|
class AnnexBBufferReader final {
|
|
|
|
|
public:
|
|
|
|
|
AnnexBBufferReader(const uint8_t* annexb_buffer, size_t length);
|
|
|
|
|
~AnnexBBufferReader() {}
|
|
|
|
|
AnnexBBufferReader(const AnnexBBufferReader& other) = delete;
|
|
|
|
|
void operator=(const AnnexBBufferReader& other) = delete;
|
|
|
|
|
|
|
|
|
|
// Returns a pointer to the beginning of the next NALU slice without the
|
|
|
|
|
// header bytes and its length. Returns false if no more slices remain.
|
|
|
|
|
bool ReadNalu(const uint8_t** out_nalu, size_t* out_length);
|
|
|
|
|
|
|
|
|
|
// Returns the number of unread NALU bytes, including the size of the header.
|
|
|
|
|
// If the buffer has no remaining NALUs this will return zero.
|
|
|
|
|
size_t BytesRemaining() const;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
// Returns the the next offset that contains NALU data.
|
|
|
|
|
size_t FindNextNaluHeader(const uint8_t* start,
|
|
|
|
|
size_t length,
|
|
|
|
|
size_t offset) const;
|
|
|
|
|
|
|
|
|
|
const uint8_t* const start_;
|
2016-11-02 15:07:02 +01:00
|
|
|
std::vector<NaluIndex> offsets_;
|
|
|
|
|
std::vector<NaluIndex>::iterator offset_;
|
2015-06-29 14:34:58 -07:00
|
|
|
const size_t length_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Helper class for writing NALUs using avcc format into a buffer.
|
|
|
|
|
class AvccBufferWriter final {
|
|
|
|
|
public:
|
|
|
|
|
AvccBufferWriter(uint8_t* const avcc_buffer, size_t length);
|
|
|
|
|
~AvccBufferWriter() {}
|
|
|
|
|
AvccBufferWriter(const AvccBufferWriter& other) = delete;
|
|
|
|
|
void operator=(const AvccBufferWriter& other) = delete;
|
|
|
|
|
|
|
|
|
|
// Writes the data slice into the buffer. Returns false if there isn't
|
|
|
|
|
// enough space left.
|
|
|
|
|
bool WriteNalu(const uint8_t* data, size_t data_size);
|
|
|
|
|
|
|
|
|
|
// Returns the unused bytes in the buffer.
|
|
|
|
|
size_t BytesRemaining() const;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
uint8_t* const start_;
|
|
|
|
|
size_t offset_;
|
|
|
|
|
const size_t length_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_
|