
All RTP packets from sender side will carry the rotation info. (will file a bug to track this) On the receiving side, only packets with marker bit set will be examined. Tests completed: 1. android standalone to android standalone 2. android standalone to chrome (with and without this change) 3. android on chrome BUG=4145 R=glaznev@webrtc.org, mflodman@webrtc.org, perkj@webrtc.org, pthatcher@webrtc.org Committed: https://crrev.com/1b1c15cad16de57053bb6aa8a916079e0534bdae Cr-Commit-Position: refs/heads/master@{#8905} Review URL: https://webrtc-codereview.appspot.com/47399004 Cr-Commit-Position: refs/heads/master@{#8917}
164 lines
6.2 KiB
C++
164 lines
6.2 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef TALK_MEDIA_WEBRTCVIDEOFRAME_H_
|
|
#define TALK_MEDIA_WEBRTCVIDEOFRAME_H_
|
|
|
|
#include "talk/media/base/videoframe.h"
|
|
#include "webrtc/base/buffer.h"
|
|
#include "webrtc/base/refcount.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/common_video/interface/video_frame_buffer.h"
|
|
|
|
namespace cricket {
|
|
|
|
struct CapturedFrame;
|
|
|
|
class WebRtcVideoFrame : public VideoFrame {
|
|
public:
|
|
WebRtcVideoFrame();
|
|
WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
|
|
int64_t elapsed_time_ns,
|
|
int64_t time_stamp_ns,
|
|
webrtc::VideoRotation rotation);
|
|
|
|
// TODO(guoweis): Remove this when chrome code base is updated.
|
|
WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
|
|
int64_t elapsed_time_ns,
|
|
int64_t time_stamp_ns);
|
|
|
|
WebRtcVideoFrame(webrtc::NativeHandle* handle,
|
|
int width,
|
|
int height,
|
|
int64_t elapsed_time_ns,
|
|
int64_t time_stamp_ns,
|
|
webrtc::VideoRotation rotation);
|
|
~WebRtcVideoFrame();
|
|
|
|
// Creates a frame from a raw sample with FourCC "format" and size "w" x "h".
|
|
// "h" can be negative indicating a vertically flipped image.
|
|
// "dh" is destination height if cropping is desired and is always positive.
|
|
// Returns "true" if successful.
|
|
bool Init(uint32 format,
|
|
int w,
|
|
int h,
|
|
int dw,
|
|
int dh,
|
|
uint8* sample,
|
|
size_t sample_size,
|
|
size_t pixel_width,
|
|
size_t pixel_height,
|
|
int64_t elapsed_time_ns,
|
|
int64_t time_stamp_ns,
|
|
webrtc::VideoRotation rotation);
|
|
|
|
bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation);
|
|
|
|
void InitToEmptyBuffer(int w, int h, size_t pixel_width, size_t pixel_height,
|
|
int64_t elapsed_time_ns, int64_t time_stamp_ns);
|
|
|
|
bool InitToBlack(int w, int h, size_t pixel_width, size_t pixel_height,
|
|
int64_t elapsed_time_ns, int64_t time_stamp_ns);
|
|
|
|
// From base class VideoFrame.
|
|
virtual bool Reset(uint32 format,
|
|
int w,
|
|
int h,
|
|
int dw,
|
|
int dh,
|
|
uint8* sample,
|
|
size_t sample_size,
|
|
size_t pixel_width,
|
|
size_t pixel_height,
|
|
int64_t elapsed_time_ns,
|
|
int64_t time_stamp_ns,
|
|
webrtc::VideoRotation rotation,
|
|
bool apply_rotation);
|
|
|
|
virtual size_t GetWidth() const;
|
|
virtual size_t GetHeight() const;
|
|
virtual const uint8* GetYPlane() const;
|
|
virtual const uint8* GetUPlane() const;
|
|
virtual const uint8* GetVPlane() const;
|
|
virtual uint8* GetYPlane();
|
|
virtual uint8* GetUPlane();
|
|
virtual uint8* GetVPlane();
|
|
virtual int32 GetYPitch() const;
|
|
virtual int32 GetUPitch() const;
|
|
virtual int32 GetVPitch() const;
|
|
virtual void* GetNativeHandle() const;
|
|
virtual rtc::scoped_refptr<webrtc::VideoFrameBuffer> GetVideoFrameBuffer()
|
|
const;
|
|
|
|
virtual size_t GetPixelWidth() const { return pixel_width_; }
|
|
virtual size_t GetPixelHeight() const { return pixel_height_; }
|
|
virtual int64_t GetElapsedTime() const { return elapsed_time_ns_; }
|
|
virtual int64_t GetTimeStamp() const { return time_stamp_ns_; }
|
|
virtual void SetElapsedTime(int64_t elapsed_time_ns) {
|
|
elapsed_time_ns_ = elapsed_time_ns;
|
|
}
|
|
virtual void SetTimeStamp(int64_t time_stamp_ns) {
|
|
time_stamp_ns_ = time_stamp_ns;
|
|
}
|
|
|
|
virtual webrtc::VideoRotation GetVideoRotation() const { return rotation_; }
|
|
|
|
virtual VideoFrame* Copy() const;
|
|
virtual bool IsExclusive() const;
|
|
virtual bool MakeExclusive();
|
|
virtual size_t ConvertToRgbBuffer(uint32 to_fourcc, uint8* buffer,
|
|
size_t size, int stride_rgb) const;
|
|
|
|
const VideoFrame* GetCopyWithRotationApplied() const override;
|
|
|
|
protected:
|
|
void SetRotation(webrtc::VideoRotation rotation) { rotation_ = rotation; }
|
|
|
|
private:
|
|
virtual VideoFrame* CreateEmptyFrame(int w, int h, size_t pixel_width,
|
|
size_t pixel_height,
|
|
int64_t elapsed_time_ns,
|
|
int64_t time_stamp_ns) const;
|
|
|
|
// An opaque reference counted handle that stores the pixel data.
|
|
rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
|
|
size_t pixel_width_;
|
|
size_t pixel_height_;
|
|
int64_t elapsed_time_ns_;
|
|
int64_t time_stamp_ns_;
|
|
webrtc::VideoRotation rotation_;
|
|
|
|
// This is mutable as the calculation is expensive but once calculated, it
|
|
// remains const.
|
|
mutable rtc::scoped_ptr<VideoFrame> rotated_frame_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_
|